From c0fea01d101d8e7a15610e0c9f1f492141ffea0f Mon Sep 17 00:00:00 2001 From: Vladimir Andjelkoski Date: Tue, 10 Dec 2024 15:24:27 +0100 Subject: [PATCH] chore(AzureVpcPeering): improve log messages --- pkg/kcp/provider/azure/vpcpeering/deleteVpcPeering.go | 10 +++++----- .../provider/azure/vpcpeering/peeringLocalCreate.go | 6 +++--- pkg/kcp/provider/azure/vpcpeering/peeringLocalLoad.go | 10 +++++----- .../provider/azure/vpcpeering/peeringRemoteCreate.go | 8 ++++---- .../provider/azure/vpcpeering/peeringRemoteDelete.go | 8 ++++---- pkg/kcp/provider/azure/vpcpeering/peeringRemoteLoad.go | 8 ++++---- .../provider/azure/vpcpeering/remoteClientCreate.go | 2 +- pkg/kcp/provider/azure/vpcpeering/vpcRemoteLoad.go | 4 ++-- pkg/kcp/provider/azure/vpcpeering/waitNetworkTag.go | 6 +++--- 9 files changed, 31 insertions(+), 31 deletions(-) diff --git a/pkg/kcp/provider/azure/vpcpeering/deleteVpcPeering.go b/pkg/kcp/provider/azure/vpcpeering/deleteVpcPeering.go index affc1fca9..b50a93c2d 100644 --- a/pkg/kcp/provider/azure/vpcpeering/deleteVpcPeering.go +++ b/pkg/kcp/provider/azure/vpcpeering/deleteVpcPeering.go @@ -14,17 +14,17 @@ func deleteVpcPeering(ctx context.Context, st composed.State) (error, context.Co obj := state.ObjAsVpcPeering() if state.localPeering == nil { - logger.Info("VpcPeering deleted before Azure peering is created") + logger.Info("VpcPeering deleted before local VPC peering is created") return nil, nil } resourceId, err := util.ParseResourceID(ptr.Deref(state.localPeering.ID, "")) if err != nil { - return azuremeta.LogErrorAndReturn(err, "Failed parsing localPeering.ID while deleting local peering", ctx) + return azuremeta.LogErrorAndReturn(err, "Failed parsing localPeering.ID while deleting local VPC peering", ctx) } - logger.Info("Deleting VpcPeering") + logger.Info("Deleting local VPC peering") err = state.localClient.DeletePeering( ctx, @@ -34,10 +34,10 @@ func deleteVpcPeering(ctx context.Context, st composed.State) (error, context.Co ) if err != nil { - return azuremeta.LogErrorAndReturn(err, "Error deleting local vpc peering", ctx) + return azuremeta.LogErrorAndReturn(err, "Error deleting local VPC peering", ctx) } - logger.Info("Local VpcPeering deleted") + logger.Info("Local VPC peering deleted") return nil, nil } diff --git a/pkg/kcp/provider/azure/vpcpeering/peeringLocalCreate.go b/pkg/kcp/provider/azure/vpcpeering/peeringLocalCreate.go index 8f264e858..6f5d9a54f 100644 --- a/pkg/kcp/provider/azure/vpcpeering/peeringLocalCreate.go +++ b/pkg/kcp/provider/azure/vpcpeering/peeringLocalCreate.go @@ -31,7 +31,7 @@ func peeringLocalCreate(ctx context.Context, st composed.State) (error, context. if azuremeta.IsTooManyRequests(err) { return composed.LogErrorAndReturn(err, - "Azure vpc peering too many requests on peering local create", + "Too many requests on creating local VPC peering", composed.StopWithRequeueDelay(util.Timing.T60000ms()), ctx, ) @@ -70,12 +70,12 @@ func peeringLocalCreate(ctx context.Context, st composed.State) (error, context. return composed.PatchStatus(state.ObjAsVpcPeering()). SetExclusiveConditions(condition). - ErrorLogMessage("Error updating KCP VpcPeering status on failed creation of local vpc peering"). + ErrorLogMessage("Error updating KCP VpcPeering status on failed creation of local VPC peering"). FailedError(composed.StopWithRequeueDelay(util.Timing.T10000ms())). SuccessError(composed.StopWithRequeueDelay(util.Timing.T60000ms())). Run(ctx, state) } - logger.Info("Azure local Peering is created") + logger.Info("Local VPC peering created") return nil, nil } diff --git a/pkg/kcp/provider/azure/vpcpeering/peeringLocalLoad.go b/pkg/kcp/provider/azure/vpcpeering/peeringLocalLoad.go index 638f01cf1..bd112179b 100644 --- a/pkg/kcp/provider/azure/vpcpeering/peeringLocalLoad.go +++ b/pkg/kcp/provider/azure/vpcpeering/peeringLocalLoad.go @@ -33,7 +33,7 @@ func peeringLocalLoad(ctx context.Context, st composed.State) (error, context.Co } if !ok { - logger.Info("Local Azure Peering not loaded") + logger.Info("Local VPC peering not loaded") return nil, nil } @@ -48,18 +48,18 @@ func peeringLocalLoad(ctx context.Context, st composed.State) (error, context.Co if err != nil { if azuremeta.IsTooManyRequests(err) { return composed.LogErrorAndReturn(err, - "Azure vpc peering too many requests on peering local load", + "Too many requests on loading local VPC peering", composed.StopWithRequeueDelay(util.Timing.T10000ms()), ctx, ) } if azuremeta.IsNotFound(err) { - logger.Info("Local Azure Peering not found for KCP VpcPeering") + logger.Info("Local VPC peering not found") return nil, nil } - return azuremeta.LogErrorAndReturn(err, "Error loading VPC Peering", ctx) + return azuremeta.LogErrorAndReturn(err, "Error loading local VPC peering", ctx) } logger = logger.WithValues("localPeeringId", ptr.Deref(peering.ID, "")) @@ -67,7 +67,7 @@ func peeringLocalLoad(ctx context.Context, st composed.State) (error, context.Co state.localPeering = peering - logger.Info("Azure local Peering loaded for KCP VpcPeering") + logger.Info("Local VPC peering loaded") return nil, ctx } diff --git a/pkg/kcp/provider/azure/vpcpeering/peeringRemoteCreate.go b/pkg/kcp/provider/azure/vpcpeering/peeringRemoteCreate.go index d97eca371..999a2ff19 100644 --- a/pkg/kcp/provider/azure/vpcpeering/peeringRemoteCreate.go +++ b/pkg/kcp/provider/azure/vpcpeering/peeringRemoteCreate.go @@ -28,11 +28,11 @@ func peeringRemoteCreate(ctx context.Context, st composed.State) (error, context ) if err != nil { - logger.Error(err, "Error creating remote VPC Peering") + logger.Error(err, "Error creating remote VPC peering") if azuremeta.IsTooManyRequests(err) { return composed.LogErrorAndReturn(err, - "Azure vpc peering too many requests on peering remote create", + "Too many requests on creating remote VPC peering", composed.StopWithRequeueDelay(util.Timing.T60000ms()), ctx, ) @@ -53,13 +53,13 @@ func peeringRemoteCreate(ctx context.Context, st composed.State) (error, context Reason: cloudcontrolv1beta1.ReasonFailedCreatingVpcPeeringConnection, Message: message, }). - ErrorLogMessage("Error updating KCP VpcPeering status on failed creation of remote vpc peering"). + ErrorLogMessage("Error updating KCP VpcPeering status on failed creation of remote VPC peering"). FailedError(composed.StopWithRequeueDelay(util.Timing.T10000ms())). SuccessError(composed.StopWithRequeueDelay(util.Timing.T60000ms())). Run(ctx, state) } - logger.Info("Azure remote VPC Peering created") + logger.Info("Remote VPC peering created") return nil, nil } diff --git a/pkg/kcp/provider/azure/vpcpeering/peeringRemoteDelete.go b/pkg/kcp/provider/azure/vpcpeering/peeringRemoteDelete.go index 32bb91342..550493fd8 100644 --- a/pkg/kcp/provider/azure/vpcpeering/peeringRemoteDelete.go +++ b/pkg/kcp/provider/azure/vpcpeering/peeringRemoteDelete.go @@ -16,7 +16,7 @@ func peeringRemoteDelete(ctx context.Context, st composed.State) (error, context } if state.remotePeering == nil { - logger.Info("Azure remote peering not loaded, continuing") + logger.Info("Remote VPC peering not loaded, continuing") return nil, nil } @@ -39,13 +39,13 @@ func peeringRemoteDelete(ctx context.Context, st composed.State) (error, context state.ObjAsVpcPeering().Spec.Details.PeeringName, ) - logger.Info("Deleting remote VpcPeering") + logger.Info("Deleting remote VPC peering") if err != nil { - return composed.LogErrorAndReturn(err, "Error deleting vpc peering", nil, ctx) + return composed.LogErrorAndReturn(err, "Error deleting VPC peering", nil, ctx) } - logger.Info("Remote VpcPeering deleted") + logger.Info("Remote VPC peering deleted") return nil, nil } diff --git a/pkg/kcp/provider/azure/vpcpeering/peeringRemoteLoad.go b/pkg/kcp/provider/azure/vpcpeering/peeringRemoteLoad.go index c974ac117..439b328b7 100644 --- a/pkg/kcp/provider/azure/vpcpeering/peeringRemoteLoad.go +++ b/pkg/kcp/provider/azure/vpcpeering/peeringRemoteLoad.go @@ -63,13 +63,13 @@ func peeringRemoteLoad(ctx context.Context, st composed.State) (error, context.C if azuremeta.IsTooManyRequests(err) { return composed.LogErrorAndReturn(err, - "Azure vpc peering too many requests on peering remote load", + "Too many requests on loading remote VPC peering", composed.StopWithRequeueDelay(util.Timing.T60000ms()), ctx, ) } - logger.Error(err, "Error loading remote VPC Peering") + logger.Error(err, "Error loading Azure remote VPC peering") message, isWarning := azuremeta.GetErrorMessage(err) @@ -98,7 +98,7 @@ func peeringRemoteLoad(ctx context.Context, st composed.State) (error, context.C return composed.PatchStatus(state.ObjAsVpcPeering()). SetExclusiveConditions(condition). - ErrorLogMessage("Error updating KCP VpcPeering status on failed loading of remote vpc peering"). + ErrorLogMessage("Error updating KCP VpcPeering status on failed loading of remote VPC peering"). FailedError(composed.StopWithRequeueDelay(util.Timing.T10000ms())). SuccessErrorNil(). Run(ctx, state) @@ -109,7 +109,7 @@ func peeringRemoteLoad(ctx context.Context, st composed.State) (error, context.C state.remotePeering = peering - logger.Info("Azure remote VPC peering loaded") + logger.Info("Remote VPC peering loaded") return nil, ctx } diff --git a/pkg/kcp/provider/azure/vpcpeering/remoteClientCreate.go b/pkg/kcp/provider/azure/vpcpeering/remoteClientCreate.go index 3784817bb..949cc783e 100644 --- a/pkg/kcp/provider/azure/vpcpeering/remoteClientCreate.go +++ b/pkg/kcp/provider/azure/vpcpeering/remoteClientCreate.go @@ -46,7 +46,7 @@ func remoteClientCreate(ctx context.Context, st composed.State) (error, context. Type: cloudcontrolv1beta1.ConditionTypeError, Status: metav1.ConditionTrue, Reason: cloudcontrolv1beta1.ReasonCloudProviderError, - Message: fmt.Sprintf("Faile creating Azure client for tenant %s subscription %s", state.remoteNetworkId.Subscription, tenantId), + Message: fmt.Sprintf("Failed creating Azure client for tenant %s subscription %s", state.remoteNetworkId.Subscription, tenantId), }). ErrorLogMessage("Error patching KCP VpcPeering with error state after remote client creation failed"). SuccessError(composed.StopWithRequeueDelay(util.Timing.T300000ms())). // try again in 5mins diff --git a/pkg/kcp/provider/azure/vpcpeering/vpcRemoteLoad.go b/pkg/kcp/provider/azure/vpcpeering/vpcRemoteLoad.go index d3425e840..c4eda303d 100644 --- a/pkg/kcp/provider/azure/vpcpeering/vpcRemoteLoad.go +++ b/pkg/kcp/provider/azure/vpcpeering/vpcRemoteLoad.go @@ -30,7 +30,7 @@ func vpcRemoteLoad(ctx context.Context, st composed.State) (error, context.Conte // stop and forget. if azuremeta.IsNotFound(err) { successError = composed.StopAndForget - message = "Remote VPC Network not found" + message = "Remote VPC network not found" logger.Info(message) } @@ -59,7 +59,7 @@ func vpcRemoteLoad(ctx context.Context, st composed.State) (error, context.Conte return composed.UpdateStatus(state.ObjAsVpcPeering()). SetCondition(condition). - ErrorLogMessage("Error updating VpcPeering status due to failed loading of remote vpc network"). + ErrorLogMessage("Error updating VpcPeering status due to failed loading of remote VPC network"). FailedError(composed.StopWithRequeue). SuccessError(successError). Run(ctx, state) diff --git a/pkg/kcp/provider/azure/vpcpeering/waitNetworkTag.go b/pkg/kcp/provider/azure/vpcpeering/waitNetworkTag.go index ff4af788b..b49a6ad40 100644 --- a/pkg/kcp/provider/azure/vpcpeering/waitNetworkTag.go +++ b/pkg/kcp/provider/azure/vpcpeering/waitNetworkTag.go @@ -34,16 +34,16 @@ func waitNetworkTag(ctx context.Context, st composed.State) (error, context.Cont kv = append(kv, k, v) } - logger.Info("Loaded remote VPC Network have no matching tags", kv...) + logger.Info("Loaded remote VPC network have no matching tags", kv...) return composed.UpdateStatus(obj). SetCondition(metav1.Condition{ Type: cloudcontrolv1beta1.ConditionTypeError, Status: "True", Reason: cloudcontrolv1beta1.ReasonFailedLoadingRemoteVpcNetwork, - Message: "Loaded remote Vpc network has no matching tags", + Message: "Loaded remote VPC network has no matching tags", }). - ErrorLogMessage("Error updating VpcPeering status due to remote vpc network tag mismatch"). + ErrorLogMessage("Error updating VpcPeering status due to remote VPC network tag mismatch"). FailedError(composed.StopWithRequeue). SuccessError(composed.StopWithRequeueDelay(util.Timing.T60000ms())). Run(ctx, state)