From a6a6748c7b6c9a4f703c88a70bb3f08637ad80a0 Mon Sep 17 00:00:00 2001 From: Nawaz Hussain Khazielakha Date: Thu, 3 Oct 2024 13:46:02 -0700 Subject: [PATCH] manual updates --- .../azureasomanagedcluster_webhook.go | 6 ++--- .../azureasomanagedcontrolplane_webhook.go | 6 ++--- .../azureasomanagedmachinepool_webhook.go | 6 ++--- api/v1beta1/azurecluster_validation.go | 2 +- api/v1beta1/azurecluster_validation_test.go | 5 ---- api/v1beta1/azurecluster_webhook_test.go | 1 - api/v1beta1/azuremachine_validation.go | 2 +- api/v1beta1/azuremachine_webhook.go | 8 +++--- api/v1beta1/azuremachinetemplate_webhook.go | 6 ++--- .../azuremachinetemplate_webhook_test.go | 3 --- api/v1beta1/azuremanagedcluster_webhook.go | 2 +- .../azuremanagedcontrolplane_webhook.go | 8 +++--- .../azuremanagedcontrolplane_webhook_test.go | 4 --- ...zuremanagedcontrolplanetemplate_webhook.go | 8 +++--- .../azuremanagedmachinepool_webhook.go | 8 +++--- .../azuremanagedmachinepool_webhook_test.go | 1 - ...azuremanagedmachinepooltemplate_webhook.go | 8 +++--- api/v1beta1/tags_test.go | 1 - azure/converters/diagnostics_test.go | 1 - azure/converters/dns_test.go | 1 - azure/converters/futures_test.go | 2 -- azure/converters/identity_test.go | 3 --- azure/converters/image_test.go | 3 --- azure/converters/loadbalancers_test.go | 1 - azure/converters/managedagentpool_test.go | 1 - azure/converters/resourcehealth.go | 2 +- azure/converters/resourcehealth_test.go | 1 - azure/converters/spotinstances.go | 2 +- azure/converters/spotinstances_test.go | 1 - azure/converters/subnets_test.go | 1 - azure/converters/tags_test.go | 4 --- azure/converters/vm_test.go | 1 - azure/converters/vmss_test.go | 4 --- azure/defaults_test.go | 2 -- azure/errors_test.go | 1 - azure/regional_baseuri_test.go | 1 - azure/scope/cluster.go | 2 +- azure/scope/cluster_test.go | 12 --------- azure/scope/identity_test.go | 1 - azure/scope/machine_test.go | 2 -- azure/scope/machinepool.go | 7 +++-- azure/scope/machinepool_test.go | 1 - azure/scope/machinepoolmachine_test.go | 1 - azure/scope/managedcontrolplane_test.go | 8 ------ azure/scope/managedmachinepool_test.go | 1 - .../machinepool_deployment_strategy.go | 2 +- azure/services/agentpools/agentpools.go | 2 +- azure/services/agentpools/spec.go | 2 +- azure/services/aksextensions/spec.go | 4 +-- azure/services/aksextensions/spec_test.go | 1 - azure/services/async/async_test.go | 2 -- .../availabilitysets/availabilitysets.go | 2 +- .../availabilitysets/availabilitysets_test.go | 2 -- azure/services/availabilitysets/client.go | 4 +-- azure/services/availabilitysets/spec.go | 2 +- azure/services/availabilitysets/spec_test.go | 1 - azure/services/bastionhosts/spec.go | 4 +-- azure/services/bastionhosts/spec_test.go | 1 - azure/services/disks/disks.go | 2 +- azure/services/disks/disks_test.go | 1 - azure/services/disks/spec.go | 2 +- azure/services/fleetsmembers/spec.go | 4 +-- azure/services/fleetsmembers/spec_test.go | 1 - azure/services/groups/spec.go | 2 +- .../inboundnatrules/inboundnatrules.go | 2 +- .../inboundnatrules/inboundnatrules_test.go | 2 -- azure/services/inboundnatrules/spec.go | 2 +- azure/services/inboundnatrules/spec_test.go | 2 -- azure/services/loadbalancers/loadbalancers.go | 2 +- .../loadbalancers/loadbalancers_test.go | 2 -- azure/services/loadbalancers/spec.go | 2 +- azure/services/loadbalancers/spec_test.go | 1 - azure/services/managedclusters/spec.go | 2 +- azure/services/natgateways/spec.go | 4 +-- azure/services/natgateways/spec_test.go | 1 - azure/services/networkinterfaces/client.go | 2 +- .../networkinterfaces/networkinterfaces.go | 2 +- .../networkinterfaces_test.go | 2 -- azure/services/networkinterfaces/spec.go | 2 +- azure/services/networkinterfaces/spec_test.go | 1 - azure/services/privatedns/link_spec.go | 2 +- azure/services/privatedns/link_spec_test.go | 1 - azure/services/privatedns/privatedns_test.go | 2 -- azure/services/privatedns/record_client.go | 6 ++--- azure/services/privatedns/record_spec.go | 2 +- azure/services/privatedns/record_spec_test.go | 1 - azure/services/privatedns/zone_spec.go | 2 +- azure/services/privatedns/zone_spec_test.go | 1 - azure/services/privateendpoints/spec.go | 4 +-- azure/services/privateendpoints/spec_test.go | 1 - azure/services/publicips/publicips.go | 2 +- azure/services/publicips/publicips_test.go | 2 -- azure/services/publicips/spec.go | 2 +- azure/services/publicips/spec_test.go | 1 - .../services/resourcehealth/resourcehealth.go | 2 +- azure/services/resourceskus/cache_test.go | 3 --- azure/services/roleassignments/client.go | 2 +- .../roleassignments/roleassignments.go | 2 +- .../roleassignments/roleassignments_test.go | 2 -- azure/services/roleassignments/spec.go | 2 +- azure/services/roleassignments/spec_test.go | 1 - .../services/routetables/routetables_test.go | 2 -- azure/services/routetables/spec.go | 2 +- azure/services/routetables/spec_test.go | 1 - azure/services/scalesets/scalesets.go | 2 +- azure/services/scalesets/scalesets_test.go | 2 -- azure/services/scalesets/spec.go | 1 - azure/services/scalesets/spec_test.go | 1 - .../services/scalesets/vmssextension_spec.go | 2 +- .../scalesets/vmssextension_spec_test.go | 1 - azure/services/scalesetvms/client.go | 2 +- .../services/scalesetvms/scalesetvms_test.go | 2 -- azure/services/scalesetvms/spec.go | 4 +-- .../securitygroups/securitygroups_test.go | 2 -- azure/services/securitygroups/spec.go | 2 +- azure/services/securitygroups/spec_test.go | 2 -- azure/services/subnets/spec.go | 7 ++--- azure/services/tags/tags.go | 2 +- azure/services/tags/tags_test.go | 2 -- .../virtualmachineimages/cache_test.go | 1 - .../virtualmachineimages/images_test.go | 2 -- azure/services/virtualmachines/spec.go | 2 +- azure/services/virtualmachines/spec_test.go | 1 - .../virtualmachines/virtualmachines.go | 2 +- .../virtualmachines/virtualmachines_test.go | 3 --- azure/services/virtualnetworks/spec.go | 2 +- azure/services/vmextensions/spec.go | 2 +- azure/services/vmextensions/spec_test.go | 1 - azure/services/vmextensions/vmextensions.go | 2 +- .../vmextensions/vmextensions_test.go | 1 - azure/services/vnetpeerings/spec.go | 2 +- azure/services/vnetpeerings/spec_test.go | 1 - azure/services/vnetpeerings/vnetpeerings.go | 2 +- .../vnetpeerings/vnetpeerings_test.go | 2 -- azure/types_test.go | 1 - controllers/agentpooladopt_controller.go | 2 +- controllers/asosecret_controller.go | 6 ++--- controllers/asosecret_controller_test.go | 8 +++--- controllers/azurecluster_reconciler_test.go | 3 --- .../azurejson_machine_controller_test.go | 2 -- controllers/azuremachine_reconciler_test.go | 3 --- ...zuremanagedcontrolplane_reconciler_test.go | 1 - ...azuremanagedmachinepool_controller_test.go | 1 - .../azuremanagedmachinepool_reconciler.go | 1 - ...azuremanagedmachinepool_reconciler_test.go | 2 -- controllers/helpers.go | 20 +++++++------- controllers/helpers_test.go | 8 +++--- controllers/managedclusteradopt_controller.go | 2 +- controllers/resource_reconciler.go | 5 +++- exp/api/v1beta1/azuremachinepool_test.go | 1 - exp/api/v1beta1/azuremachinepool_webhook.go | 8 +++--- .../v1beta1/azuremachinepool_webhook_test.go | 6 ++--- .../azuremachinepool_reconciler_test.go | 3 --- ...azuremachinepoolmachine_controller_test.go | 1 - exp/controllers/helpers.go | 26 +++++++++---------- exp/controllers/helpers_test.go | 2 -- .../test/matchers/gomega/matchers_test.go | 1 - internal/test/record/logger.go | 6 ++--- pkg/coalescing/reconciler_test.go | 1 - pkg/mutators/azureasomanagedcontrolplane.go | 2 +- pkg/mutators/azureasomanagedmachinepool.go | 2 +- test/e2e/aks_public_ip_prefix.go | 2 +- test/e2e/azure_logcollector.go | 4 +-- test/e2e/cni.go | 2 +- test/e2e/helm.go | 2 +- test/e2e/helpers.go | 8 +++--- .../kubernetes/networkpolicy/networkpolicy.go | 2 +- test/e2e/kubernetes/windows/windows.go | 2 +- test/logger.go | 2 +- util/cache/ttllru/ttllru_test.go | 1 - util/reconciler/defaults_test.go | 4 --- util/system/namespace_test.go | 3 +-- util/tele/span_logger.go | 6 ++--- 173 files changed, 166 insertions(+), 328 deletions(-) diff --git a/api/v1alpha1/azureasomanagedcluster_webhook.go b/api/v1alpha1/azureasomanagedcluster_webhook.go index f25559609f4..44b170327f2 100644 --- a/api/v1alpha1/azureasomanagedcluster_webhook.go +++ b/api/v1alpha1/azureasomanagedcluster_webhook.go @@ -45,7 +45,7 @@ type azureASOManagedClusterWebhook struct { // +kubebuilder:webhook:verbs=create,path=/validate-infrastructure-cluster-x-k8s-io-v1alpha1-azureasomanagedcluster,mutating=false,failurePolicy=fail,groups=infrastructure.cluster.x-k8s.io,resources=azureasomanagedclusters,versions=v1alpha1,name=validation.azureasomanagedcluster.infrastructure.cluster.x-k8s.io,sideEffects=None,admissionReviewVersions=v1;v1beta1 // ValidateCreate implements webhook.Validator so a webhook will be registered for the type. -func (ampw *azureASOManagedClusterWebhook) ValidateCreate(ctx context.Context, obj runtime.Object) (admission.Warnings, error) { +func (ampw *azureASOManagedClusterWebhook) ValidateCreate(_ context.Context, obj runtime.Object) (admission.Warnings, error) { _, ok := obj.(*AzureASOManagedCluster) if !ok { return nil, apierrors.NewBadRequest("expected an AzureASOManagedCluster") @@ -60,11 +60,11 @@ func (ampw *azureASOManagedClusterWebhook) ValidateCreate(ctx context.Context, o } // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type. -func (ampw *azureASOManagedClusterWebhook) ValidateUpdate(ctx context.Context, oldObj, newObj runtime.Object) (admission.Warnings, error) { +func (ampw *azureASOManagedClusterWebhook) ValidateUpdate(_ context.Context, _, _ runtime.Object) (admission.Warnings, error) { return nil, nil } // ValidateDelete implements webhook.Validator so a webhook will be registered for the type. -func (ampw *azureASOManagedClusterWebhook) ValidateDelete(ctx context.Context, obj runtime.Object) (admission.Warnings, error) { +func (ampw *azureASOManagedClusterWebhook) ValidateDelete(_ context.Context, _ runtime.Object) (admission.Warnings, error) { return nil, nil } diff --git a/api/v1alpha1/azureasomanagedcontrolplane_webhook.go b/api/v1alpha1/azureasomanagedcontrolplane_webhook.go index 92473720484..05006549ee9 100644 --- a/api/v1alpha1/azureasomanagedcontrolplane_webhook.go +++ b/api/v1alpha1/azureasomanagedcontrolplane_webhook.go @@ -45,7 +45,7 @@ type azureASOManagedControlPlaneWebhook struct { // +kubebuilder:webhook:verbs=create,path=/validate-infrastructure-cluster-x-k8s-io-v1alpha1-azureasomanagedcontrolplane,mutating=false,failurePolicy=fail,groups=infrastructure.cluster.x-k8s.io,resources=azureasomanagedcontrolplanes,versions=v1alpha1,name=validation.azureasomanagedcontrolplane.infrastructure.cluster.x-k8s.io,sideEffects=None,admissionReviewVersions=v1;v1beta1 // ValidateCreate implements webhook.Validator so a webhook will be registered for the type. -func (ampw *azureASOManagedControlPlaneWebhook) ValidateCreate(ctx context.Context, obj runtime.Object) (admission.Warnings, error) { +func (ampw *azureASOManagedControlPlaneWebhook) ValidateCreate(_ context.Context, obj runtime.Object) (admission.Warnings, error) { _, ok := obj.(*AzureASOManagedControlPlane) if !ok { return nil, apierrors.NewBadRequest("expected an AzureASOManagedControlPlane") @@ -60,11 +60,11 @@ func (ampw *azureASOManagedControlPlaneWebhook) ValidateCreate(ctx context.Conte } // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type. -func (ampw *azureASOManagedControlPlaneWebhook) ValidateUpdate(ctx context.Context, oldObj, newObj runtime.Object) (admission.Warnings, error) { +func (ampw *azureASOManagedControlPlaneWebhook) ValidateUpdate(_ context.Context, _, _ runtime.Object) (admission.Warnings, error) { return nil, nil } // ValidateDelete implements webhook.Validator so a webhook will be registered for the type. -func (ampw *azureASOManagedControlPlaneWebhook) ValidateDelete(ctx context.Context, obj runtime.Object) (admission.Warnings, error) { +func (ampw *azureASOManagedControlPlaneWebhook) ValidateDelete(_ context.Context, _ runtime.Object) (admission.Warnings, error) { return nil, nil } diff --git a/api/v1alpha1/azureasomanagedmachinepool_webhook.go b/api/v1alpha1/azureasomanagedmachinepool_webhook.go index d6ce615fa0f..86b9ddead4a 100644 --- a/api/v1alpha1/azureasomanagedmachinepool_webhook.go +++ b/api/v1alpha1/azureasomanagedmachinepool_webhook.go @@ -45,7 +45,7 @@ type azureASOManagedMachinePoolWebhook struct { // +kubebuilder:webhook:verbs=create,path=/validate-infrastructure-cluster-x-k8s-io-v1alpha1-azureasomanagedmachinepool,mutating=false,failurePolicy=fail,groups=infrastructure.cluster.x-k8s.io,resources=azureasomanagedmachinepools,versions=v1alpha1,name=validation.azureasomanagedmachinepool.infrastructure.cluster.x-k8s.io,sideEffects=None,admissionReviewVersions=v1;v1beta1 // ValidateCreate implements webhook.Validator so a webhook will be registered for the type. -func (ampw *azureASOManagedMachinePoolWebhook) ValidateCreate(ctx context.Context, obj runtime.Object) (admission.Warnings, error) { +func (ampw *azureASOManagedMachinePoolWebhook) ValidateCreate(_ context.Context, obj runtime.Object) (admission.Warnings, error) { _, ok := obj.(*AzureASOManagedMachinePool) if !ok { return nil, apierrors.NewBadRequest("expected an AzureASOManagedMachinePool") @@ -60,11 +60,11 @@ func (ampw *azureASOManagedMachinePoolWebhook) ValidateCreate(ctx context.Contex } // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type. -func (ampw *azureASOManagedMachinePoolWebhook) ValidateUpdate(ctx context.Context, oldObj, newObj runtime.Object) (admission.Warnings, error) { +func (ampw *azureASOManagedMachinePoolWebhook) ValidateUpdate(_ context.Context, _, _ runtime.Object) (admission.Warnings, error) { return nil, nil } // ValidateDelete implements webhook.Validator so a webhook will be registered for the type. -func (ampw *azureASOManagedMachinePoolWebhook) ValidateDelete(ctx context.Context, obj runtime.Object) (admission.Warnings, error) { +func (ampw *azureASOManagedMachinePoolWebhook) ValidateDelete(_ context.Context, _ runtime.Object) (admission.Warnings, error) { return nil, nil } diff --git a/api/v1beta1/azurecluster_validation.go b/api/v1beta1/azurecluster_validation.go index e9cdbc9a7d1..51350662631 100644 --- a/api/v1beta1/azurecluster_validation.go +++ b/api/v1beta1/azurecluster_validation.go @@ -509,7 +509,7 @@ func validateControlPlaneOutboundLB(lb *LoadBalancerSpec, apiserverLB LoadBalanc func validatePrivateDNSZoneName(privateDNSZoneName string, apiserverLBType LBType, fldPath *field.Path) field.ErrorList { var allErrs field.ErrorList - if len(privateDNSZoneName) > 0 { + if privateDNSZoneName != "" { if apiserverLBType != Internal { allErrs = append(allErrs, field.Invalid(fldPath, apiserverLBType, "PrivateDNSZoneName is available only if APIServerLB.Type is Internal")) diff --git a/api/v1beta1/azurecluster_validation_test.go b/api/v1beta1/azurecluster_validation_test.go index 31b3fcbf668..e4052d49045 100644 --- a/api/v1beta1/azurecluster_validation_test.go +++ b/api/v1beta1/azurecluster_validation_test.go @@ -811,7 +811,6 @@ func TestValidateSecurityRule(t *testing.T) { }, } for _, testCase := range tests { - testCase := testCase t.Run(testCase.name, func(t *testing.T) { t.Parallel() g := NewWithT(t) @@ -1030,7 +1029,6 @@ func TestValidateAPIServerLB(t *testing.T) { } for _, test := range testcases { - test := test t.Run(test.name, func(t *testing.T) { t.Parallel() g := NewWithT(t) @@ -1110,7 +1108,6 @@ func TestPrivateDNSZoneName(t *testing.T) { } for _, test := range testcases { - test := test t.Run(test.name, func(t *testing.T) { t.Parallel() g := NewWithT(t) @@ -1267,7 +1264,6 @@ func TestValidateNodeOutboundLB(t *testing.T) { } for _, test := range testcases { - test := test t.Run(test.name, func(t *testing.T) { t.Parallel() g := NewWithT(t) @@ -1347,7 +1343,6 @@ func TestValidateControlPlaneNodeOutboundLB(t *testing.T) { } for _, test := range testcases { - test := test t.Run(test.name, func(t *testing.T) { t.Parallel() g := NewWithT(t) diff --git a/api/v1beta1/azurecluster_webhook_test.go b/api/v1beta1/azurecluster_webhook_test.go index 0096ddf79bf..97b52bb8f63 100644 --- a/api/v1beta1/azurecluster_webhook_test.go +++ b/api/v1beta1/azurecluster_webhook_test.go @@ -341,7 +341,6 @@ func TestAzureCluster_ValidateUpdate(t *testing.T) { }, } for _, tc := range tests { - tc := tc t.Run(tc.name, func(t *testing.T) { t.Parallel() g := NewWithT(t) diff --git a/api/v1beta1/azuremachine_validation.go b/api/v1beta1/azuremachine_validation.go index cc50d94093d..d370f3eb590 100644 --- a/api/v1beta1/azuremachine_validation.go +++ b/api/v1beta1/azuremachine_validation.go @@ -492,7 +492,7 @@ func ValidateCapacityReservationGroupID(capacityReservationGroupID *string, fldP } // ValidateVMExtensions validates the VMExtensions spec. -func ValidateVMExtensions(disableExtensionOperations *bool, vmExtensions []VMExtension, fldPath *field.Path) field.ErrorList { +func ValidateVMExtensions(disableExtensionOperations *bool, vmExtensions []VMExtension, _ *field.Path) field.ErrorList { allErrs := field.ErrorList{} if ptr.Deref(disableExtensionOperations, false) && len(vmExtensions) > 0 { diff --git a/api/v1beta1/azuremachine_webhook.go b/api/v1beta1/azuremachine_webhook.go index 973dcf9e3b6..d3f892da778 100644 --- a/api/v1beta1/azuremachine_webhook.go +++ b/api/v1beta1/azuremachine_webhook.go @@ -49,7 +49,7 @@ type azureMachineWebhook struct { } // ValidateCreate implements webhook.Validator so a webhook will be registered for the type. -func (mw *azureMachineWebhook) ValidateCreate(ctx context.Context, obj runtime.Object) (admission.Warnings, error) { +func (mw *azureMachineWebhook) ValidateCreate(_ context.Context, obj runtime.Object) (admission.Warnings, error) { m, ok := obj.(*AzureMachine) if !ok { return nil, apierrors.NewBadRequest("expected an AzureMachine resource") @@ -75,7 +75,7 @@ func (mw *azureMachineWebhook) ValidateCreate(ctx context.Context, obj runtime.O } // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type. -func (mw *azureMachineWebhook) ValidateUpdate(ctx context.Context, oldObj, newObj runtime.Object) (admission.Warnings, error) { +func (mw *azureMachineWebhook) ValidateUpdate(_ context.Context, oldObj, newObj runtime.Object) (admission.Warnings, error) { var allErrs field.ErrorList old, ok := oldObj.(*AzureMachine) if !ok { @@ -228,12 +228,12 @@ func (mw *azureMachineWebhook) ValidateUpdate(ctx context.Context, oldObj, newOb } // ValidateDelete implements webhook.Validator so a webhook will be registered for the type. -func (mw *azureMachineWebhook) ValidateDelete(ctx context.Context, obj runtime.Object) (admission.Warnings, error) { +func (mw *azureMachineWebhook) ValidateDelete(_ context.Context, _ runtime.Object) (admission.Warnings, error) { return nil, nil } // Default implements webhook.Defaulter so a webhook will be registered for the type. -func (mw *azureMachineWebhook) Default(ctx context.Context, obj runtime.Object) error { +func (mw *azureMachineWebhook) Default(_ context.Context, obj runtime.Object) error { m, ok := obj.(*AzureMachine) if !ok { return apierrors.NewBadRequest("expected an AzureMachine resource") diff --git a/api/v1beta1/azuremachinetemplate_webhook.go b/api/v1beta1/azuremachinetemplate_webhook.go index 9130f92ac19..a6e74bef25b 100644 --- a/api/v1beta1/azuremachinetemplate_webhook.go +++ b/api/v1beta1/azuremachinetemplate_webhook.go @@ -54,7 +54,7 @@ var _ webhook.CustomDefaulter = &AzureMachineTemplate{} var _ webhook.CustomValidator = &AzureMachineTemplate{} // ValidateCreate implements webhook.CustomValidator so a webhook will be registered for the type. -func (r *AzureMachineTemplate) ValidateCreate(ctx context.Context, obj runtime.Object) (admission.Warnings, error) { +func (r *AzureMachineTemplate) ValidateCreate(_ context.Context, obj runtime.Object) (admission.Warnings, error) { t := obj.(*AzureMachineTemplate) spec := t.Spec.Template.Spec @@ -142,12 +142,12 @@ func (r *AzureMachineTemplate) ValidateUpdate(ctx context.Context, oldRaw runtim } // ValidateDelete implements webhook.Validator so a webhook will be registered for the type. -func (r *AzureMachineTemplate) ValidateDelete(ctx context.Context, obj runtime.Object) (admission.Warnings, error) { +func (r *AzureMachineTemplate) ValidateDelete(_ context.Context, _ runtime.Object) (admission.Warnings, error) { return nil, nil } // Default implements webhookutil.defaulter so a webhook will be registered for the type. -func (r *AzureMachineTemplate) Default(ctx context.Context, obj runtime.Object) error { +func (r *AzureMachineTemplate) Default(_ context.Context, obj runtime.Object) error { t := obj.(*AzureMachineTemplate) if err := t.Spec.Template.Spec.SetDefaultSSHPublicKey(); err != nil { ctrl.Log.WithName("SetDefault").Error(err, "SetDefaultSSHPublicKey failed") diff --git a/api/v1beta1/azuremachinetemplate_webhook_test.go b/api/v1beta1/azuremachinetemplate_webhook_test.go index 210112533c8..cd5e1203257 100644 --- a/api/v1beta1/azuremachinetemplate_webhook_test.go +++ b/api/v1beta1/azuremachinetemplate_webhook_test.go @@ -245,7 +245,6 @@ func TestAzureMachineTemplate_ValidateCreate(t *testing.T) { } for _, test := range tests { - test := test t.Run(test.name, func(t *testing.T) { t.Parallel() g := NewWithT(t) @@ -593,7 +592,6 @@ func TestAzureMachineTemplate_ValidateUpdate(t *testing.T) { // dry-run=true for _, amt := range tests { - amt := amt t.Run(amt.name, func(t *testing.T) { g := NewWithT(t) ctx := admission.NewContextWithRequest(context.Background(), admission.Request{AdmissionRequest: admissionv1.AdmissionRequest{DryRun: ptr.To(true)}}) @@ -607,7 +605,6 @@ func TestAzureMachineTemplate_ValidateUpdate(t *testing.T) { } // dry-run=false for _, amt := range tests { - amt := amt t.Run(amt.name, func(t *testing.T) { t.Parallel() g := NewWithT(t) diff --git a/api/v1beta1/azuremanagedcluster_webhook.go b/api/v1beta1/azuremanagedcluster_webhook.go index 0dc277434b5..e0b0c66df6c 100644 --- a/api/v1beta1/azuremanagedcluster_webhook.go +++ b/api/v1beta1/azuremanagedcluster_webhook.go @@ -52,7 +52,7 @@ func (r *AzureManagedCluster) ValidateCreate() (admission.Warnings, error) { } // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type. -func (r *AzureManagedCluster) ValidateUpdate(oldRaw runtime.Object) (admission.Warnings, error) { +func (r *AzureManagedCluster) ValidateUpdate(_ runtime.Object) (admission.Warnings, error) { return nil, nil } diff --git a/api/v1beta1/azuremanagedcontrolplane_webhook.go b/api/v1beta1/azuremanagedcontrolplane_webhook.go index 7696ce3a59e..029945c29ad 100644 --- a/api/v1beta1/azuremanagedcontrolplane_webhook.go +++ b/api/v1beta1/azuremanagedcontrolplane_webhook.go @@ -67,7 +67,7 @@ type azureManagedControlPlaneWebhook struct { } // Default implements webhook.Defaulter so a webhook will be registered for the type. -func (mw *azureManagedControlPlaneWebhook) Default(ctx context.Context, obj runtime.Object) error { +func (mw *azureManagedControlPlaneWebhook) Default(_ context.Context, obj runtime.Object) error { m, ok := obj.(*AzureManagedControlPlane) if !ok { return apierrors.NewBadRequest("expected an AzureManagedControlPlane") @@ -106,7 +106,7 @@ func (mw *azureManagedControlPlaneWebhook) Default(ctx context.Context, obj runt // +kubebuilder:webhook:verbs=create;update,path=/validate-infrastructure-cluster-x-k8s-io-v1beta1-azuremanagedcontrolplane,mutating=false,failurePolicy=fail,groups=infrastructure.cluster.x-k8s.io,resources=azuremanagedcontrolplanes,versions=v1beta1,name=validation.azuremanagedcontrolplanes.infrastructure.cluster.x-k8s.io,sideEffects=None,admissionReviewVersions=v1;v1beta1 // ValidateCreate implements webhook.Validator so a webhook will be registered for the type. -func (mw *azureManagedControlPlaneWebhook) ValidateCreate(ctx context.Context, obj runtime.Object) (admission.Warnings, error) { +func (mw *azureManagedControlPlaneWebhook) ValidateCreate(_ context.Context, obj runtime.Object) (admission.Warnings, error) { m, ok := obj.(*AzureManagedControlPlane) if !ok { return nil, apierrors.NewBadRequest("expected an AzureManagedControlPlane") @@ -124,7 +124,7 @@ func (mw *azureManagedControlPlaneWebhook) ValidateCreate(ctx context.Context, o } // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type. -func (mw *azureManagedControlPlaneWebhook) ValidateUpdate(ctx context.Context, oldObj, newObj runtime.Object) (admission.Warnings, error) { +func (mw *azureManagedControlPlaneWebhook) ValidateUpdate(_ context.Context, oldObj, newObj runtime.Object) (admission.Warnings, error) { var allErrs field.ErrorList old, ok := oldObj.(*AzureManagedControlPlane) if !ok { @@ -241,7 +241,7 @@ func (mw *azureManagedControlPlaneWebhook) ValidateUpdate(ctx context.Context, o } // ValidateDelete implements webhook.Validator so a webhook will be registered for the type. -func (mw *azureManagedControlPlaneWebhook) ValidateDelete(ctx context.Context, obj runtime.Object) (admission.Warnings, error) { +func (mw *azureManagedControlPlaneWebhook) ValidateDelete(_ context.Context, _ runtime.Object) (admission.Warnings, error) { return nil, nil } diff --git a/api/v1beta1/azuremanagedcontrolplane_webhook_test.go b/api/v1beta1/azuremanagedcontrolplane_webhook_test.go index 16d975ceb6f..e24a9c24e7d 100644 --- a/api/v1beta1/azuremanagedcontrolplane_webhook_test.go +++ b/api/v1beta1/azuremanagedcontrolplane_webhook_test.go @@ -205,7 +205,6 @@ func TestValidateVersion(t *testing.T) { } for _, tt := range tests { - tt := tt t.Run(tt.name, func(t *testing.T) { g := NewWithT(t) allErrs := validateVersion(tt.version, field.NewPath("spec").Child("Version")) @@ -273,7 +272,6 @@ func TestValidateLoadBalancerProfile(t *testing.T) { }, } for _, tt := range tests { - tt := tt t.Run(tt.name, func(t *testing.T) { g := NewWithT(t) allErrs := validateLoadBalancerProfile(tt.profile, field.NewPath("spec").Child("loadBalancerProfile")) @@ -465,7 +463,6 @@ func TestValidateAutoScalerProfile(t *testing.T) { } for _, tt := range tests { - tt := tt t.Run(tt.name, func(t *testing.T) { g := NewWithT(t) allErrs := validateAutoScalerProfile(tt.profile, field.NewPath("spec").Child("autoScalerProfile")) @@ -1390,7 +1387,6 @@ func TestValidatingWebhook(t *testing.T) { } for _, tt := range tests { - tt := tt // client is used to fetch the AzureManagedControlPlane, we do not want to return an error on client.Get client := mockClient{ReturnError: false} t.Run(tt.name, func(t *testing.T) { diff --git a/api/v1beta1/azuremanagedcontrolplanetemplate_webhook.go b/api/v1beta1/azuremanagedcontrolplanetemplate_webhook.go index 6980ff436d7..18f73e91246 100644 --- a/api/v1beta1/azuremanagedcontrolplanetemplate_webhook.go +++ b/api/v1beta1/azuremanagedcontrolplanetemplate_webhook.go @@ -51,7 +51,7 @@ type azureManagedControlPlaneTemplateWebhook struct { } // Default implements webhook.Defaulter so a webhook will be registered for the type. -func (mcpw *azureManagedControlPlaneTemplateWebhook) Default(ctx context.Context, obj runtime.Object) error { +func (mcpw *azureManagedControlPlaneTemplateWebhook) Default(_ context.Context, obj runtime.Object) error { mcp, ok := obj.(*AzureManagedControlPlaneTemplate) if !ok { return apierrors.NewBadRequest("expected an AzureManagedControlPlaneTemplate") @@ -61,7 +61,7 @@ func (mcpw *azureManagedControlPlaneTemplateWebhook) Default(ctx context.Context } // ValidateCreate implements webhook.Validator so a webhook will be registered for the type. -func (mcpw *azureManagedControlPlaneTemplateWebhook) ValidateCreate(ctx context.Context, obj runtime.Object) (admission.Warnings, error) { +func (mcpw *azureManagedControlPlaneTemplateWebhook) ValidateCreate(_ context.Context, obj runtime.Object) (admission.Warnings, error) { mcp, ok := obj.(*AzureManagedControlPlaneTemplate) if !ok { return nil, apierrors.NewBadRequest("expected an AzureManagedControlPlaneTemplate") @@ -79,7 +79,7 @@ func (mcpw *azureManagedControlPlaneTemplateWebhook) ValidateCreate(ctx context. } // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type. -func (mcpw *azureManagedControlPlaneTemplateWebhook) ValidateUpdate(ctx context.Context, oldObj, newObj runtime.Object) (admission.Warnings, error) { +func (mcpw *azureManagedControlPlaneTemplateWebhook) ValidateUpdate(_ context.Context, oldObj, newObj runtime.Object) (admission.Warnings, error) { var allErrs field.ErrorList old, ok := oldObj.(*AzureManagedControlPlaneTemplate) if !ok { @@ -235,7 +235,7 @@ func (mcp *AzureManagedControlPlaneTemplate) validateManagedControlPlaneTemplate } // ValidateDelete implements webhook.Validator so a webhook will be registered for the type. -func (mcpw *azureManagedControlPlaneTemplateWebhook) ValidateDelete(ctx context.Context, _ runtime.Object) (admission.Warnings, error) { +func (mcpw *azureManagedControlPlaneTemplateWebhook) ValidateDelete(_ context.Context, _ runtime.Object) (admission.Warnings, error) { return nil, nil } diff --git a/api/v1beta1/azuremanagedmachinepool_webhook.go b/api/v1beta1/azuremanagedmachinepool_webhook.go index e333972f088..3c2cc657cc0 100644 --- a/api/v1beta1/azuremanagedmachinepool_webhook.go +++ b/api/v1beta1/azuremanagedmachinepool_webhook.go @@ -62,7 +62,7 @@ type azureManagedMachinePoolWebhook struct { } // Default implements webhook.Defaulter so a webhook will be registered for the type. -func (mw *azureManagedMachinePoolWebhook) Default(ctx context.Context, obj runtime.Object) error { +func (mw *azureManagedMachinePoolWebhook) Default(_ context.Context, obj runtime.Object) error { m, ok := obj.(*AzureManagedMachinePool) if !ok { return apierrors.NewBadRequest("expected an AzureManagedMachinePool") @@ -86,7 +86,7 @@ func (mw *azureManagedMachinePoolWebhook) Default(ctx context.Context, obj runti //+kubebuilder:webhook:verbs=create;update;delete,path=/validate-infrastructure-cluster-x-k8s-io-v1beta1-azuremanagedmachinepool,mutating=false,failurePolicy=fail,matchPolicy=Equivalent,groups=infrastructure.cluster.x-k8s.io,resources=azuremanagedmachinepools,versions=v1beta1,name=validation.azuremanagedmachinepools.infrastructure.cluster.x-k8s.io,sideEffects=None,admissionReviewVersions=v1;v1beta1 // ValidateCreate implements webhook.Validator so a webhook will be registered for the type. -func (mw *azureManagedMachinePoolWebhook) ValidateCreate(ctx context.Context, obj runtime.Object) (admission.Warnings, error) { +func (mw *azureManagedMachinePoolWebhook) ValidateCreate(_ context.Context, obj runtime.Object) (admission.Warnings, error) { m, ok := obj.(*AzureManagedMachinePool) if !ok { return nil, apierrors.NewBadRequest("expected an AzureManagedMachinePool") @@ -147,7 +147,7 @@ func (mw *azureManagedMachinePoolWebhook) ValidateCreate(ctx context.Context, ob } // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type. -func (mw *azureManagedMachinePoolWebhook) ValidateUpdate(ctx context.Context, oldObj, newObj runtime.Object) (admission.Warnings, error) { +func (mw *azureManagedMachinePoolWebhook) ValidateUpdate(_ context.Context, oldObj, newObj runtime.Object) (admission.Warnings, error) { old, ok := oldObj.(*AzureManagedMachinePool) if !ok { return nil, apierrors.NewBadRequest("expected an AzureManagedMachinePool") @@ -301,7 +301,7 @@ func (mw *azureManagedMachinePoolWebhook) ValidateUpdate(ctx context.Context, ol } // ValidateDelete implements webhook.Validator so a webhook will be registered for the type. -func (mw *azureManagedMachinePoolWebhook) ValidateDelete(ctx context.Context, obj runtime.Object) (admission.Warnings, error) { +func (mw *azureManagedMachinePoolWebhook) ValidateDelete(_ context.Context, obj runtime.Object) (admission.Warnings, error) { m, ok := obj.(*AzureManagedMachinePool) if !ok { return nil, apierrors.NewBadRequest("expected an AzureManagedMachinePool") diff --git a/api/v1beta1/azuremanagedmachinepool_webhook_test.go b/api/v1beta1/azuremanagedmachinepool_webhook_test.go index 2b954c76c8e..f3b0603fb02 100644 --- a/api/v1beta1/azuremanagedmachinepool_webhook_test.go +++ b/api/v1beta1/azuremanagedmachinepool_webhook_test.go @@ -637,7 +637,6 @@ func TestAzureManagedMachinePoolUpdatingWebhook(t *testing.T) { } var client client.Client for _, tc := range tests { - tc := tc t.Run(tc.name, func(t *testing.T) { t.Parallel() g := NewWithT(t) diff --git a/api/v1beta1/azuremanagedmachinepooltemplate_webhook.go b/api/v1beta1/azuremanagedmachinepooltemplate_webhook.go index acc98169c9e..1db56744687 100644 --- a/api/v1beta1/azuremanagedmachinepooltemplate_webhook.go +++ b/api/v1beta1/azuremanagedmachinepooltemplate_webhook.go @@ -51,7 +51,7 @@ type azureManagedMachinePoolTemplateWebhook struct { } // Default implements webhook.Defaulter so a webhook will be registered for the type. -func (mpw *azureManagedMachinePoolTemplateWebhook) Default(ctx context.Context, obj runtime.Object) error { +func (mpw *azureManagedMachinePoolTemplateWebhook) Default(_ context.Context, obj runtime.Object) error { mp, ok := obj.(*AzureManagedMachinePoolTemplate) if !ok { return apierrors.NewBadRequest("expected an AzureManagedMachinePoolTemplate") @@ -73,7 +73,7 @@ func (mpw *azureManagedMachinePoolTemplateWebhook) Default(ctx context.Context, //+kubebuilder:webhook:verbs=create;update;delete,path=/validate-infrastructure-cluster-x-k8s-io-v1beta1-azuremanagedmachinepooltemplate,mutating=false,failurePolicy=fail,groups=infrastructure.cluster.x-k8s.io,resources=azuremanagedmachinepooltemplates,versions=v1beta1,name=validation.azuremanagedmachinepooltemplates.infrastructure.cluster.x-k8s.io,sideEffects=None,admissionReviewVersions=v1;v1beta1 // ValidateCreate implements webhook.Validator so a webhook will be registered for the type. -func (mpw *azureManagedMachinePoolTemplateWebhook) ValidateCreate(ctx context.Context, obj runtime.Object) (admission.Warnings, error) { +func (mpw *azureManagedMachinePoolTemplateWebhook) ValidateCreate(_ context.Context, obj runtime.Object) (admission.Warnings, error) { mp, ok := obj.(*AzureManagedMachinePoolTemplate) if !ok { return nil, apierrors.NewBadRequest("expected an AzureManagedMachinePoolTemplate") @@ -129,7 +129,7 @@ func (mpw *azureManagedMachinePoolTemplateWebhook) ValidateCreate(ctx context.Co } // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type. -func (mpw *azureManagedMachinePoolTemplateWebhook) ValidateUpdate(ctx context.Context, oldObj, newObj runtime.Object) (admission.Warnings, error) { +func (mpw *azureManagedMachinePoolTemplateWebhook) ValidateUpdate(_ context.Context, oldObj, newObj runtime.Object) (admission.Warnings, error) { var allErrs field.ErrorList old, ok := oldObj.(*AzureManagedMachinePoolTemplate) if !ok { @@ -275,7 +275,7 @@ func (mpw *azureManagedMachinePoolTemplateWebhook) ValidateUpdate(ctx context.Co } // ValidateDelete implements webhook.Validator so a webhook will be registered for the type. -func (mpw *azureManagedMachinePoolTemplateWebhook) ValidateDelete(ctx context.Context, obj runtime.Object) (admission.Warnings, error) { +func (mpw *azureManagedMachinePoolTemplateWebhook) ValidateDelete(_ context.Context, obj runtime.Object) (admission.Warnings, error) { mp, ok := obj.(*AzureManagedMachinePoolTemplate) if !ok { return nil, apierrors.NewBadRequest("expected an AzureManagedMachinePoolTemplate") diff --git a/api/v1beta1/tags_test.go b/api/v1beta1/tags_test.go index 8cba88dba4c..5c2227235a5 100644 --- a/api/v1beta1/tags_test.go +++ b/api/v1beta1/tags_test.go @@ -73,7 +73,6 @@ func TestTags_Merge(t *testing.T) { }, } for _, tc := range tests { - tc := tc t.Run(tc.name, func(t *testing.T) { t.Parallel() g := NewWithT(t) diff --git a/azure/converters/diagnostics_test.go b/azure/converters/diagnostics_test.go index 6be824f2569..8d2b7d1c6fc 100644 --- a/azure/converters/diagnostics_test.go +++ b/azure/converters/diagnostics_test.go @@ -94,7 +94,6 @@ func TestGetDiagnosticsProfile(t *testing.T) { }, } for _, tt := range tests { - tt := tt t.Run(tt.name, func(t *testing.T) { t.Parallel() got := GetDiagnosticsProfile(tt.diagnostics) diff --git a/azure/converters/dns_test.go b/azure/converters/dns_test.go index 1f329156c09..ee548d903dc 100644 --- a/azure/converters/dns_test.go +++ b/azure/converters/dns_test.go @@ -47,7 +47,6 @@ func Test_GetRecordType(t *testing.T) { } for _, c := range cases { - c := c t.Run(c.name, func(t *testing.T) { t.Parallel() g := gomega.NewGomegaWithT(t) diff --git a/azure/converters/futures_test.go b/azure/converters/futures_test.go index 25efc1e3313..2c7ef3247f1 100644 --- a/azure/converters/futures_test.go +++ b/azure/converters/futures_test.go @@ -96,7 +96,6 @@ func TestPollerToFuture(t *testing.T) { } for _, c := range cases { - c := c t.Run(c.name, func(t *testing.T) { t.Parallel() g := NewGomegaWithT(t) @@ -164,7 +163,6 @@ func TestFutureToResumeToken(t *testing.T) { } for _, c := range cases { - c := c t.Run(c.name, func(t *testing.T) { t.Parallel() g := NewGomegaWithT(t) diff --git a/azure/converters/identity_test.go b/azure/converters/identity_test.go index b7bb59d2a91..6207812879a 100644 --- a/azure/converters/identity_test.go +++ b/azure/converters/identity_test.go @@ -101,7 +101,6 @@ func Test_VMIdentityToVMSDK(t *testing.T) { } for _, c := range cases { - c := c t.Run(c.Name, func(t *testing.T) { t.Parallel() g := NewGomegaWithT(t) @@ -136,7 +135,6 @@ func Test_UserAssignedIdentitiesToVMSDK(t *testing.T) { } for _, c := range cases { - c := c t.Run(c.Name, func(t *testing.T) { t.Parallel() g := NewGomegaWithT(t) @@ -171,7 +169,6 @@ func Test_UserAssignedIdentitiesToVMSSSDK(t *testing.T) { } for _, c := range cases { - c := c t.Run(c.Name, func(t *testing.T) { t.Parallel() g := NewGomegaWithT(t) diff --git a/azure/converters/image_test.go b/azure/converters/image_test.go index ee84d71ffcd..51249521045 100644 --- a/azure/converters/image_test.go +++ b/azure/converters/image_test.go @@ -138,7 +138,6 @@ func Test_ImageToPlan(t *testing.T) { } for _, c := range cases { - c := c t.Run(c.name, func(t *testing.T) { t.Parallel() g := NewGomegaWithT(t) @@ -219,7 +218,6 @@ func Test_ComputeImageToSDK(t *testing.T) { } for _, c := range cases { - c := c t.Run(c.name, func(t *testing.T) { t.Parallel() g := NewGomegaWithT(t) @@ -334,7 +332,6 @@ func Test_ImageToSDK(t *testing.T) { } for _, c := range cases { - c := c t.Run(c.name, func(t *testing.T) { t.Parallel() g := NewGomegaWithT(t) diff --git a/azure/converters/loadbalancers_test.go b/azure/converters/loadbalancers_test.go index f09eaf749bd..ce991150088 100644 --- a/azure/converters/loadbalancers_test.go +++ b/azure/converters/loadbalancers_test.go @@ -43,7 +43,6 @@ func TestSKUtoSDK(t *testing.T) { }, } for _, tt := range tests { - tt := tt t.Run(tt.name, func(t *testing.T) { t.Parallel() got := SKUtoSDK(tt.sku) diff --git a/azure/converters/managedagentpool_test.go b/azure/converters/managedagentpool_test.go index ab430459296..815542fb7f7 100644 --- a/azure/converters/managedagentpool_test.go +++ b/azure/converters/managedagentpool_test.go @@ -99,7 +99,6 @@ func Test_AgentPoolToManagedClusterAgentPoolProfile(t *testing.T) { } for _, c := range cases { - c := c t.Run(c.name, func(t *testing.T) { t.Parallel() g := NewGomegaWithT(t) diff --git a/azure/converters/resourcehealth.go b/azure/converters/resourcehealth.go index 172af583a3c..5497dd53043 100644 --- a/azure/converters/resourcehealth.go +++ b/azure/converters/resourcehealth.go @@ -45,7 +45,7 @@ func SDKAvailabilityStatusToCondition(availStatus armresourcehealth.Availability // response may include spaces (e.g. "Customer Initiated") words := strings.Split(*availStatus.Properties.ReasonType, " ") for _, word := range words { - if len(word) > 0 { + if word != "" { reason.WriteString(strings.ToTitle(word[:1])) } if len(word) > 1 { diff --git a/azure/converters/resourcehealth_test.go b/azure/converters/resourcehealth_test.go index 0c27768227e..b75ba1d0dcd 100644 --- a/azure/converters/resourcehealth_test.go +++ b/azure/converters/resourcehealth_test.go @@ -85,7 +85,6 @@ func TestAzureAvailabilityStatusToCondition(t *testing.T) { } for _, test := range tests { - test := test t.Run(test.name, func(t *testing.T) { g := NewWithT(t) t.Parallel() diff --git a/azure/converters/spotinstances.go b/azure/converters/spotinstances.go index d600fa481f9..183f84ec14f 100644 --- a/azure/converters/spotinstances.go +++ b/azure/converters/spotinstances.go @@ -27,7 +27,7 @@ import ( // GetSpotVMOptions takes the spot vm options // and returns the individual vm priority, eviction policy and billing profile. -func GetSpotVMOptions(spotVMOptions *infrav1.SpotVMOptions, diffDiskSettings *infrav1.DiffDiskSettings) (*armcompute.VirtualMachinePriorityTypes, *armcompute.VirtualMachineEvictionPolicyTypes, *armcompute.BillingProfile, error) { +func GetSpotVMOptions(spotVMOptions *infrav1.SpotVMOptions, _ *infrav1.DiffDiskSettings) (*armcompute.VirtualMachinePriorityTypes, *armcompute.VirtualMachineEvictionPolicyTypes, *armcompute.BillingProfile, error) { // Spot VM not requested, return zero values to apply defaults if spotVMOptions == nil { return nil, nil, nil, nil diff --git a/azure/converters/spotinstances_test.go b/azure/converters/spotinstances_test.go index 2975167ae40..015c191b73a 100644 --- a/azure/converters/spotinstances_test.go +++ b/azure/converters/spotinstances_test.go @@ -124,7 +124,6 @@ func TestGetSpotVMOptions(t *testing.T) { }, } for _, tt := range tests { - tt := tt t.Run(tt.name, func(t *testing.T) { t.Parallel() g := NewGomegaWithT(t) diff --git a/azure/converters/subnets_test.go b/azure/converters/subnets_test.go index 609d2ec0293..7935f3bdeb5 100644 --- a/azure/converters/subnets_test.go +++ b/azure/converters/subnets_test.go @@ -58,7 +58,6 @@ func TestGetSubnetAddresses(t *testing.T) { }, } for _, tt := range tests { - tt := tt t.Run(tt.name, func(t *testing.T) { t.Parallel() g := NewGomegaWithT(t) diff --git a/azure/converters/tags_test.go b/azure/converters/tags_test.go index 142d07b3cb2..cfffc2113aa 100644 --- a/azure/converters/tags_test.go +++ b/azure/converters/tags_test.go @@ -45,7 +45,6 @@ func Test_TagsToMap(t *testing.T) { } for _, c := range cases { - c := c t.Run("name", func(t *testing.T) { t.Parallel() g := gomega.NewGomegaWithT(t) @@ -75,7 +74,6 @@ func Test_MapToTags(t *testing.T) { } for _, c := range cases { - c := c t.Run("name", func(t *testing.T) { t.Parallel() g := gomega.NewGomegaWithT(t) @@ -108,7 +106,6 @@ func Test_TagsToMapRoundTrip(t *testing.T) { } for _, c := range cases { - c := c t.Run("name", func(t *testing.T) { t.Parallel() g := gomega.NewGomegaWithT(t) @@ -141,7 +138,6 @@ func Test_MapToTagsMapRoundTrip(t *testing.T) { } for _, c := range cases { - c := c t.Run("name", func(t *testing.T) { t.Parallel() g := gomega.NewGomegaWithT(t) diff --git a/azure/converters/vm_test.go b/azure/converters/vm_test.go index 7eea5f8d931..5ae623267e5 100644 --- a/azure/converters/vm_test.go +++ b/azure/converters/vm_test.go @@ -126,7 +126,6 @@ func TestSDKToVM(t *testing.T) { }, } for _, tt := range tests { - tt := tt t.Run(tt.name, func(t *testing.T) { t.Parallel() got := SDKToVM(tt.sdk) diff --git a/azure/converters/vmss_test.go b/azure/converters/vmss_test.go index 092a21ca5cd..3331f9f2ad6 100644 --- a/azure/converters/vmss_test.go +++ b/azure/converters/vmss_test.go @@ -114,7 +114,6 @@ func Test_SDKToVMSS(t *testing.T) { } for _, c := range cases { - c := c t.Run(c.Name, func(t *testing.T) { t.Parallel() g := gomega.NewGomegaWithT(t) @@ -206,7 +205,6 @@ func Test_SDKToVMSSVM(t *testing.T) { } for _, c := range cases { - c := c t.Run(c.Name, func(t *testing.T) { t.Parallel() g := gomega.NewGomegaWithT(t) @@ -315,7 +313,6 @@ func Test_SDKImageToImage(t *testing.T) { } for _, c := range cases { - c := c t.Run(c.Name, func(t *testing.T) { t.Parallel() g := gomega.NewGomegaWithT(t) @@ -401,7 +398,6 @@ func Test_SDKVMToVMSSVM(t *testing.T) { } for _, c := range cases { - c := c t.Run(c.Name, func(t *testing.T) { t.Parallel() g := gomega.NewGomegaWithT(t) diff --git a/azure/defaults_test.go b/azure/defaults_test.go index 8f12b904766..88708df72cf 100644 --- a/azure/defaults_test.go +++ b/azure/defaults_test.go @@ -68,7 +68,6 @@ func TestARMClientOptions(t *testing.T) { }, } for _, tc := range tests { - tc := tc t.Run(tc.name, func(t *testing.T) { t.Parallel() g := NewWithT(t) @@ -166,7 +165,6 @@ func TestCustomPutPatchHeaderPolicy(t *testing.T) { }, } for _, tc := range testcases { - tc := tc t.Run(tc.name, func(t *testing.T) { t.Parallel() g := NewWithT(t) diff --git a/azure/errors_test.go b/azure/errors_test.go index d8ea18b333b..bb0b5befcf0 100644 --- a/azure/errors_test.go +++ b/azure/errors_test.go @@ -93,7 +93,6 @@ func TestResourceNotFound(t *testing.T) { }, } for _, tc := range tests { - tc := tc t.Run(tc.name, func(t *testing.T) { t.Parallel() if got := ResourceNotFound(tc.err); got != tc.success { diff --git a/azure/regional_baseuri_test.go b/azure/regional_baseuri_test.go index a5fdb26dd32..4120f0f65e2 100644 --- a/azure/regional_baseuri_test.go +++ b/azure/regional_baseuri_test.go @@ -61,7 +61,6 @@ func TestWithRegionalBaseURI(t *testing.T) { } for _, c := range cases { - c := c t.Run(c.Name, func(t *testing.T) { g := NewWithT(t) mockCtrl := gomock.NewController(t) diff --git a/azure/scope/cluster.go b/azure/scope/cluster.go index b66c3a49084..8d67710b236 100644 --- a/azure/scope/cluster.go +++ b/azure/scope/cluster.go @@ -721,7 +721,7 @@ func (s *ClusterScope) APIServerPrivateIP() string { // GetPrivateDNSZoneName returns the Private DNS Zone from the spec or generate it from cluster name. func (s *ClusterScope) GetPrivateDNSZoneName() string { - if len(s.AzureCluster.Spec.NetworkSpec.PrivateDNSZoneName) > 0 { + if s.AzureCluster.Spec.NetworkSpec.PrivateDNSZoneName != "" { return s.AzureCluster.Spec.NetworkSpec.PrivateDNSZoneName } return azure.GeneratePrivateDNSZoneName(s.ClusterName()) diff --git a/azure/scope/cluster_test.go b/azure/scope/cluster_test.go index 917a1a946c6..f42d7270bd1 100644 --- a/azure/scope/cluster_test.go +++ b/azure/scope/cluster_test.go @@ -194,7 +194,6 @@ func TestAPIServerHost(t *testing.T) { } for _, tc := range tests { - tc := tc g := NewWithT(t) cluster := &clusterv1.Cluster{ @@ -795,7 +794,6 @@ func TestRouteTableSpecs(t *testing.T) { } for _, tt := range tests { - tt := tt t.Run(tt.name, func(t *testing.T) { t.Parallel() if got := tt.clusterScope.RouteTableSpecs(); !reflect.DeepEqual(got, tt.want) { @@ -1091,7 +1089,6 @@ func TestNatGatewaySpecs(t *testing.T) { } for _, tt := range tests { - tt := tt t.Run(tt.name, func(t *testing.T) { t.Parallel() fakeIdentity := &infrav1.AzureClusterIdentity{ @@ -1174,7 +1171,6 @@ func TestSetNatGatewayIDInSubnets(t *testing.T) { } for _, tt := range tests { - tt := tt t.Run(tt.name, func(t *testing.T) { g := NewWithT(t) t.Parallel() @@ -1264,7 +1260,6 @@ func TestNSGSpecs(t *testing.T) { } for _, tt := range tests { - tt := tt t.Run(tt.name, func(t *testing.T) { t.Parallel() if got := tt.clusterScope.NSGSpecs(); !reflect.DeepEqual(got, tt.want) { @@ -1501,7 +1496,6 @@ func TestSubnetSpecs(t *testing.T) { } for _, tt := range tests { - tt := tt t.Run(tt.name, func(t *testing.T) { t.Parallel() fakeIdentity := &infrav1.AzureClusterIdentity{ @@ -1629,7 +1623,6 @@ func TestIsVnetManaged(t *testing.T) { } for _, tt := range tests { - tt := tt t.Run(tt.name, func(t *testing.T) { t.Parallel() fakeIdentity := &infrav1.AzureClusterIdentity{ @@ -1782,7 +1775,6 @@ func TestAzureBastionSpec(t *testing.T) { } for _, tt := range tests { - tt := tt t.Run(tt.name, func(t *testing.T) { t.Parallel() if got := tt.clusterScope.AzureBastionSpec(); !reflect.DeepEqual(got, tt.want) { @@ -2794,7 +2786,6 @@ func TestClusterScope_LBSpecs(t *testing.T) { }, } for _, tc := range tests { - tc := tc t.Run(tc.name, func(t *testing.T) { t.Parallel() @@ -3374,7 +3365,6 @@ func TestPrivateEndpointSpecs(t *testing.T) { } for _, tt := range tests { - tt := tt t.Run(tt.name, func(t *testing.T) { t.Parallel() if got := tt.clusterScope.PrivateEndpointSpecs(); !reflect.DeepEqual(got, tt.want) { @@ -3423,7 +3413,6 @@ func TestSetFailureDomain(t *testing.T) { } for name, tc := range cases { - tc := tc t.Run(name, func(t *testing.T) { t.Parallel() g := NewWithT(t) @@ -3599,7 +3588,6 @@ func TestGroupSpecs(t *testing.T) { } for _, c := range cases { - c := c t.Run(c.name, func(t *testing.T) { s := &ClusterScope{ AzureCluster: c.input.AzureCluster, diff --git a/azure/scope/identity_test.go b/azure/scope/identity_test.go index 58a74b90871..384e5ae4a74 100644 --- a/azure/scope/identity_test.go +++ b/azure/scope/identity_test.go @@ -340,7 +340,6 @@ func TestGetTokenCredential(t *testing.T) { _ = infrav1.AddToScheme(scheme) _ = corev1.AddToScheme(scheme) for _, tt := range tests { - tt := tt t.Run(tt.name, func(t *testing.T) { t.Parallel() g := NewWithT(t) diff --git a/azure/scope/machine_test.go b/azure/scope/machine_test.go index 1a84db8b153..f9f5b59683e 100644 --- a/azure/scope/machine_test.go +++ b/azure/scope/machine_test.go @@ -412,7 +412,6 @@ func TestMachineScope_InboundNatSpecs(t *testing.T) { }, } for _, tt := range tests { - tt := tt t.Run(tt.name, func(t *testing.T) { t.Parallel() if got := tt.machineScope.InboundNatSpecs(); !reflect.DeepEqual(got, tt.want) { @@ -3154,7 +3153,6 @@ func TestDiskSpecs(t *testing.T) { } for _, tt := range testcases { - tt := tt t.Run(tt.name, func(t *testing.T) { g := NewWithT(t) diff --git a/azure/scope/machinepool.go b/azure/scope/machinepool.go index 1123282725c..e5cbdc7452e 100644 --- a/azure/scope/machinepool.go +++ b/azure/scope/machinepool.go @@ -453,7 +453,6 @@ func (m *MachinePoolScope) applyAzureMachinePoolMachines(ctx context.Context) er deleted := false // Delete MachinePool Machines for instances that no longer exist in Azure, i.e. deleted out-of-band for key, ampm := range existingMachinesByProviderID { - ampm := ampm if _, ok := azureMachinesByProviderID[key]; !ok { deleted = true log.V(4).Info("deleting AzureMachinePoolMachine because it no longer exists in the VMSS", "providerID", key) @@ -949,12 +948,12 @@ func (m *MachinePoolScope) PatchCAPIMachinePoolObject(ctx context.Context) error } // UpdateCAPIMachinePoolReplicas updates the associated MachinePool replica count. -func (m *MachinePoolScope) UpdateCAPIMachinePoolReplicas(ctx context.Context, replicas *int32) { +func (m *MachinePoolScope) UpdateCAPIMachinePoolReplicas(_ context.Context, replicas *int32) { m.MachinePool.Spec.Replicas = replicas } // HasReplicasExternallyManaged returns true if the externally managed annotation is set on the CAPI MachinePool resource. -func (m *MachinePoolScope) HasReplicasExternallyManaged(ctx context.Context) bool { +func (m *MachinePoolScope) HasReplicasExternallyManaged(_ context.Context) bool { return annotations.ReplicasManagedByExternalAutoscaler(m.MachinePool) } @@ -964,7 +963,7 @@ func (m *MachinePoolScope) ReconcileReplicas(ctx context.Context, vmss *azure.VM return nil } - var replicas int32 = 0 + var replicas int32 if m.MachinePool.Spec.Replicas != nil { replicas = *m.MachinePool.Spec.Replicas } diff --git a/azure/scope/machinepool_test.go b/azure/scope/machinepool_test.go index 7ab1e59ed80..895d5c668a8 100644 --- a/azure/scope/machinepool_test.go +++ b/azure/scope/machinepool_test.go @@ -1331,7 +1331,6 @@ func TestMachinePoolScope_SetInfrastructureMachineKind(t *testing.T) { } for _, tt := range testcases { - tt := tt t.Run(tt.name, func(t *testing.T) { g := NewWithT(t) diff --git a/azure/scope/machinepoolmachine_test.go b/azure/scope/machinepoolmachine_test.go index 4fe6f843faf..5d9186cd55c 100644 --- a/azure/scope/machinepoolmachine_test.go +++ b/azure/scope/machinepoolmachine_test.go @@ -307,7 +307,6 @@ func TestMachineScope_updateDeleteMachineAnnotation(t *testing.T) { } for _, c := range cases { - c := c t.Run(c.name, func(t *testing.T) { g := NewWithT(t) diff --git a/azure/scope/managedcontrolplane_test.go b/azure/scope/managedcontrolplane_test.go index fbcf3b3592d..10de5b2685a 100644 --- a/azure/scope/managedcontrolplane_test.go +++ b/azure/scope/managedcontrolplane_test.go @@ -136,7 +136,6 @@ func TestManagedControlPlaneScope_OutboundType(t *testing.T) { }, } for _, c := range cases { - c := c t.Run(c.Name, func(t *testing.T) { g := NewWithT(t) @@ -348,7 +347,6 @@ func TestManagedControlPlaneScope_AddonProfiles(t *testing.T) { } for _, c := range cases { - c := c t.Run(c.Name, func(t *testing.T) { g := NewWithT(t) managedCluster := c.Scope.ManagedClusterSpec() @@ -469,7 +467,6 @@ func TestManagedControlPlaneScope_OSType(t *testing.T) { } for _, c := range cases { - c := c t.Run(c.Name, func(t *testing.T) { g := NewWithT(t) agentPools, err := c.Scope.GetAllAgentPoolSpecs() @@ -622,7 +619,6 @@ func TestManagedControlPlaneScope_IsVnetManagedCache(t *testing.T) { } for _, c := range cases { - c := c t.Run(c.Name, func(t *testing.T) { g := NewWithT(t) initObjects := []runtime.Object{c.Scope.ControlPlane} @@ -1065,7 +1061,6 @@ func TestManagedControlPlaneScope_PrivateEndpointSpecs(t *testing.T) { }, } for _, c := range cases { - c := c t.Run(c.Name, func(t *testing.T) { s := &ManagedControlPlaneScope{ ControlPlane: c.Input.ControlPlane, @@ -1169,7 +1164,6 @@ func TestManagedControlPlaneScope_AKSExtensionSpecs(t *testing.T) { } for _, c := range cases { - c := c t.Run(c.Name, func(t *testing.T) { s := &ManagedControlPlaneScope{ ControlPlane: c.Input.ControlPlane, @@ -1253,7 +1247,6 @@ func TestManagedControlPlaneScope_AutoUpgradeProfile(t *testing.T) { }, } for _, c := range cases { - c := c t.Run(c.name, func(t *testing.T) { g := NewWithT(t) s := &ManagedControlPlaneScope{ @@ -1410,7 +1403,6 @@ func TestManagedControlPlaneScope_GroupSpecs(t *testing.T) { } for _, c := range cases { - c := c t.Run(c.name, func(t *testing.T) { s := &ManagedControlPlaneScope{ ControlPlane: c.input.ControlPlane, diff --git a/azure/scope/managedmachinepool_test.go b/azure/scope/managedmachinepool_test.go index d85cd900874..3648d0e5dab 100644 --- a/azure/scope/managedmachinepool_test.go +++ b/azure/scope/managedmachinepool_test.go @@ -743,7 +743,6 @@ func TestManagedMachinePoolScope_EnablePreviewFeatures(t *testing.T) { }, } for _, c := range cases { - c := c t.Run(c.Name, func(t *testing.T) { g := NewWithT(t) s := &ManagedMachinePoolScope{ diff --git a/azure/scope/strategies/machinepool_deployments/machinepool_deployment_strategy.go b/azure/scope/strategies/machinepool_deployments/machinepool_deployment_strategy.go index ff22e99c433..d213060388b 100644 --- a/azure/scope/strategies/machinepool_deployments/machinepool_deployment_strategy.go +++ b/azure/scope/strategies/machinepool_deployments/machinepool_deployment_strategy.go @@ -326,7 +326,7 @@ func orderRandom(machines []infrav1exp.AzureMachinePoolMachine) []infrav1exp.Azu // orderByDeleteMachineAnnotation will sort AzureMachinePoolMachines with the clusterv1.DeleteMachineAnnotation to the front of the list. // It will preserve the existing order of the list otherwise so that it respects the existing delete priority otherwise. func orderByDeleteMachineAnnotation(machines []infrav1exp.AzureMachinePoolMachine) []infrav1exp.AzureMachinePoolMachine { - sort.SliceStable(machines, func(i, j int) bool { + sort.SliceStable(machines, func(i, _ int) bool { _, iHasAnnotation := machines[i].Annotations[clusterv1.DeleteMachineAnnotation] return iHasAnnotation diff --git a/azure/services/agentpools/agentpools.go b/azure/services/agentpools/agentpools.go index e41ad3b5879..dbe155a1692 100644 --- a/azure/services/agentpools/agentpools.go +++ b/azure/services/agentpools/agentpools.go @@ -58,7 +58,7 @@ func New(scope AgentPoolScope) *aso.Service[genruntime.MetaObject, AgentPoolScop return svc } -func postCreateOrUpdateResourceHook(ctx context.Context, scope AgentPoolScope, obj genruntime.MetaObject, err error) error { +func postCreateOrUpdateResourceHook(_ context.Context, scope AgentPoolScope, obj genruntime.MetaObject, err error) error { if err != nil { return err } diff --git a/azure/services/agentpools/spec.go b/azure/services/agentpools/spec.go index 831a5795d84..4286ca38c9c 100644 --- a/azure/services/agentpools/spec.go +++ b/azure/services/agentpools/spec.go @@ -343,7 +343,7 @@ func (s *AgentPoolSpec) Parameters(ctx context.Context, existingObj genruntime.M } // WasManaged implements azure.ASOResourceSpecGetter. -func (s *AgentPoolSpec) WasManaged(resource genruntime.MetaObject) bool { +func (s *AgentPoolSpec) WasManaged(_ genruntime.MetaObject) bool { // CAPZ has never supported BYO agent pools. return true } diff --git a/azure/services/aksextensions/spec.go b/azure/services/aksextensions/spec.go index 5fb8c2710ca..c0c3bcbe526 100644 --- a/azure/services/aksextensions/spec.go +++ b/azure/services/aksextensions/spec.go @@ -56,7 +56,7 @@ func (s *AKSExtensionSpec) ResourceRef() *asokubernetesconfigurationv1.Extension } // Parameters implements azure.ASOResourceSpecGetter. -func (s *AKSExtensionSpec) Parameters(ctx context.Context, existingAKSExtension *asokubernetesconfigurationv1.Extension) (parameters *asokubernetesconfigurationv1.Extension, err error) { +func (s *AKSExtensionSpec) Parameters(_ context.Context, existingAKSExtension *asokubernetesconfigurationv1.Extension) (parameters *asokubernetesconfigurationv1.Extension, err error) { aksExtension := &asokubernetesconfigurationv1.Extension{} if existingAKSExtension != nil { aksExtension = existingAKSExtension @@ -109,7 +109,7 @@ func (s *AKSExtensionSpec) Parameters(ctx context.Context, existingAKSExtension } // WasManaged implements azure.ASOResourceSpecGetter. -func (s *AKSExtensionSpec) WasManaged(resource *asokubernetesconfigurationv1.Extension) bool { +func (s *AKSExtensionSpec) WasManaged(_ *asokubernetesconfigurationv1.Extension) bool { // returns always returns true as CAPZ does not support BYO extension. return true } diff --git a/azure/services/aksextensions/spec_test.go b/azure/services/aksextensions/spec_test.go index 067ebab0477..309e1d7e83e 100644 --- a/azure/services/aksextensions/spec_test.go +++ b/azure/services/aksextensions/spec_test.go @@ -138,7 +138,6 @@ func TestAzureAKSExtensionSpec_Parameters(t *testing.T) { }, } for _, tc := range testcases { - tc := tc t.Run(tc.name, func(t *testing.T) { g := NewWithT(t) t.Parallel() diff --git a/azure/services/async/async_test.go b/azure/services/async/async_test.go index ef2963457a9..b6f2cc1b4b3 100644 --- a/azure/services/async/async_test.go +++ b/azure/services/async/async_test.go @@ -169,7 +169,6 @@ func TestServiceCreateOrUpdateResource(t *testing.T) { } for _, tc := range testcases { - tc := tc t.Run(tc.name, func(t *testing.T) { g := NewWithT(t) @@ -266,7 +265,6 @@ func TestServiceDeleteResource(t *testing.T) { } for _, tc := range testcases { - tc := tc t.Run(tc.name, func(t *testing.T) { g := NewWithT(t) diff --git a/azure/services/availabilitysets/availabilitysets.go b/azure/services/availabilitysets/availabilitysets.go index 6882b27fadb..6277a29a1de 100644 --- a/azure/services/availabilitysets/availabilitysets.go +++ b/azure/services/availabilitysets/availabilitysets.go @@ -125,6 +125,6 @@ func (s *Service) Delete(ctx context.Context) error { } // IsManaged returns always returns true as CAPZ does not support BYO availability set. -func (s *Service) IsManaged(ctx context.Context) (bool, error) { +func (s *Service) IsManaged(_ context.Context) (bool, error) { return true, nil } diff --git a/azure/services/availabilitysets/availabilitysets_test.go b/azure/services/availabilitysets/availabilitysets_test.go index 3fec9559434..bd6dca658e5 100644 --- a/azure/services/availabilitysets/availabilitysets_test.go +++ b/azure/services/availabilitysets/availabilitysets_test.go @@ -131,7 +131,6 @@ func TestReconcileAvailabilitySets(t *testing.T) { }, } for _, tc := range testcases { - tc := tc t.Run(tc.name, func(t *testing.T) { g := NewWithT(t) @@ -262,7 +261,6 @@ func TestDeleteAvailabilitySets(t *testing.T) { }, } for _, tc := range testcases { - tc := tc t.Run(tc.name, func(t *testing.T) { g := NewWithT(t) diff --git a/azure/services/availabilitysets/client.go b/azure/services/availabilitysets/client.go index 29774027962..859789d3f37 100644 --- a/azure/services/availabilitysets/client.go +++ b/azure/services/availabilitysets/client.go @@ -60,7 +60,7 @@ func (ac *AzureClient) Get(ctx context.Context, spec azure.ResourceSpecGetter) ( // CreateOrUpdateAsync creates or updates an availability set asynchronously. // It sends a PUT request to Azure and if accepted without error, the func will return a Poller which can be used to track the ongoing // progress of the operation. -func (ac *AzureClient) CreateOrUpdateAsync(ctx context.Context, spec azure.ResourceSpecGetter, _resumeToken string, parameters interface{}) (result interface{}, poller *runtime.Poller[armcompute.AvailabilitySetsClientCreateOrUpdateResponse], err error) { +func (ac *AzureClient) CreateOrUpdateAsync(ctx context.Context, spec azure.ResourceSpecGetter, _resumeToken string, parameters interface{}) (result interface{}, poller *runtime.Poller[armcompute.AvailabilitySetsClientCreateOrUpdateResponse], err error) { //nolint:revive // keeping _resumeToken for understanding purposes ctx, _, done := tele.StartSpanWithLogger(ctx, "availabilitySets.AzureClient.CreateOrUpdateAsync") defer done() @@ -82,7 +82,7 @@ func (ac *AzureClient) CreateOrUpdateAsync(ctx context.Context, spec azure.Resou // DeleteAsync deletes a availability set asynchronously. DeleteAsync sends a DELETE // request to Azure and if accepted without error, the func will return a Poller which can be used to track the ongoing // progress of the operation. -func (ac *AzureClient) DeleteAsync(ctx context.Context, spec azure.ResourceSpecGetter, _resumeToken string) (poller *runtime.Poller[armcompute.AvailabilitySetsClientDeleteResponse], err error) { +func (ac *AzureClient) DeleteAsync(ctx context.Context, spec azure.ResourceSpecGetter, _resumeToken string) (poller *runtime.Poller[armcompute.AvailabilitySetsClientDeleteResponse], err error) { //nolint:revive // keeping _resumeToken for understanding purposes ctx, _, done := tele.StartSpanWithLogger(ctx, "availabilitysets.AzureClient.DeleteAsync") defer done() diff --git a/azure/services/availabilitysets/spec.go b/azure/services/availabilitysets/spec.go index 6d07fac0648..ea522da07ee 100644 --- a/azure/services/availabilitysets/spec.go +++ b/azure/services/availabilitysets/spec.go @@ -55,7 +55,7 @@ func (s *AvailabilitySetSpec) OwnerResourceName() string { } // Parameters returns the parameters for the availability set. -func (s *AvailabilitySetSpec) Parameters(ctx context.Context, existing interface{}) (params interface{}, err error) { +func (s *AvailabilitySetSpec) Parameters(_ context.Context, existing interface{}) (params interface{}, err error) { if existing != nil { if _, ok := existing.(armcompute.AvailabilitySet); !ok { return nil, errors.Errorf("%T is not an armcompute.AvailabilitySet", existing) diff --git a/azure/services/availabilitysets/spec_test.go b/azure/services/availabilitysets/spec_test.go index 30aeada6918..794b61a6c2b 100644 --- a/azure/services/availabilitysets/spec_test.go +++ b/azure/services/availabilitysets/spec_test.go @@ -76,7 +76,6 @@ func TestParameters(t *testing.T) { }, } for _, tc := range testcases { - tc := tc t.Run(tc.name, func(t *testing.T) { g := NewWithT(t) t.Parallel() diff --git a/azure/services/bastionhosts/spec.go b/azure/services/bastionhosts/spec.go index 7b3a574cc6e..288a99219a0 100644 --- a/azure/services/bastionhosts/spec.go +++ b/azure/services/bastionhosts/spec.go @@ -52,7 +52,7 @@ func (s *AzureBastionSpec) ResourceRef() *asonetworkv1.BastionHost { } // Parameters implements azure.ASOResourceSpecGetter. -func (s *AzureBastionSpec) Parameters(ctx context.Context, existingBastionHost *asonetworkv1.BastionHost) (parameters *asonetworkv1.BastionHost, err error) { +func (s *AzureBastionSpec) Parameters(_ context.Context, existingBastionHost *asonetworkv1.BastionHost) (parameters *asonetworkv1.BastionHost, err error) { bastionHost := &asonetworkv1.BastionHost{} if existingBastionHost != nil { bastionHost = existingBastionHost @@ -96,7 +96,7 @@ func (s *AzureBastionSpec) Parameters(ctx context.Context, existingBastionHost * } // WasManaged implements azure.ASOResourceSpecGetter. -func (s *AzureBastionSpec) WasManaged(resource *asonetworkv1.BastionHost) bool { +func (s *AzureBastionSpec) WasManaged(_ *asonetworkv1.BastionHost) bool { // returns always returns true as CAPZ does not support BYO bastion. return true } diff --git a/azure/services/bastionhosts/spec_test.go b/azure/services/bastionhosts/spec_test.go index 4f8dd63775b..f94d2cba6c9 100644 --- a/azure/services/bastionhosts/spec_test.go +++ b/azure/services/bastionhosts/spec_test.go @@ -183,7 +183,6 @@ func TestAzureBastionSpec_Parameters(t *testing.T) { } for _, tc := range testcases { - tc := tc t.Run(tc.name, func(t *testing.T) { g := NewWithT(t) t.Parallel() diff --git a/azure/services/disks/disks.go b/azure/services/disks/disks.go index d854d905c73..2fd0e99f37a 100644 --- a/azure/services/disks/disks.go +++ b/azure/services/disks/disks.go @@ -98,6 +98,6 @@ func (s *Service) Delete(ctx context.Context) error { } // IsManaged returns always returns true as CAPZ does not support BYO disk. -func (s *Service) IsManaged(ctx context.Context) (bool, error) { +func (s *Service) IsManaged(_ context.Context) (bool, error) { return true, nil } diff --git a/azure/services/disks/disks_test.go b/azure/services/disks/disks_test.go index 30ab0510762..e4da474af42 100644 --- a/azure/services/disks/disks_test.go +++ b/azure/services/disks/disks_test.go @@ -115,7 +115,6 @@ func TestDeleteDisk(t *testing.T) { } for _, tc := range testcases { - tc := tc t.Run(tc.name, func(t *testing.T) { g := NewWithT(t) diff --git a/azure/services/disks/spec.go b/azure/services/disks/spec.go index a05ac7ee87e..5d326ea4002 100644 --- a/azure/services/disks/spec.go +++ b/azure/services/disks/spec.go @@ -40,6 +40,6 @@ func (s *DiskSpec) OwnerResourceName() string { } // Parameters is a no-op for disks. -func (s *DiskSpec) Parameters(ctx context.Context, existing interface{}) (params interface{}, err error) { +func (s *DiskSpec) Parameters(_ context.Context, _ interface{}) (params interface{}, err error) { return nil, nil } diff --git a/azure/services/fleetsmembers/spec.go b/azure/services/fleetsmembers/spec.go index 22cb3c5544f..9c68d4e66cb 100644 --- a/azure/services/fleetsmembers/spec.go +++ b/azure/services/fleetsmembers/spec.go @@ -48,7 +48,7 @@ func (s *AzureFleetsMemberSpec) ResourceRef() *asocontainerservicev1.FleetsMembe } // Parameters implements azure.ASOResourceSpecGetter. -func (s *AzureFleetsMemberSpec) Parameters(ctx context.Context, existingFleetsMember *asocontainerservicev1.FleetsMember) (parameters *asocontainerservicev1.FleetsMember, err error) { +func (s *AzureFleetsMemberSpec) Parameters(_ context.Context, existingFleetsMember *asocontainerservicev1.FleetsMember) (parameters *asocontainerservicev1.FleetsMember, err error) { fleetsMember := &asocontainerservicev1.FleetsMember{} if existingFleetsMember != nil { fleetsMember = existingFleetsMember @@ -67,7 +67,7 @@ func (s *AzureFleetsMemberSpec) Parameters(ctx context.Context, existingFleetsMe } // WasManaged implements azure.ASOResourceSpecGetter. -func (s *AzureFleetsMemberSpec) WasManaged(resource *asocontainerservicev1.FleetsMember) bool { +func (s *AzureFleetsMemberSpec) WasManaged(_ *asocontainerservicev1.FleetsMember) bool { // returns false because previous versions of CAPZ did not support Fleets. return false } diff --git a/azure/services/fleetsmembers/spec_test.go b/azure/services/fleetsmembers/spec_test.go index 3ba66858266..800edf40130 100644 --- a/azure/services/fleetsmembers/spec_test.go +++ b/azure/services/fleetsmembers/spec_test.go @@ -116,7 +116,6 @@ func TestAzureFleetsMemberSpec_Parameters(t *testing.T) { }, } for _, tc := range testcases { - tc := tc t.Run(tc.name, func(t *testing.T) { g := NewWithT(t) t.Parallel() diff --git a/azure/services/groups/spec.go b/azure/services/groups/spec.go index 08e2fbc3eb7..79e1b3c4c87 100644 --- a/azure/services/groups/spec.go +++ b/azure/services/groups/spec.go @@ -47,7 +47,7 @@ func (s *GroupSpec) ResourceRef() *asoresourcesv1.ResourceGroup { } // Parameters implements aso.ResourceSpecGetter. -func (s *GroupSpec) Parameters(ctx context.Context, existing *asoresourcesv1.ResourceGroup) (*asoresourcesv1.ResourceGroup, error) { +func (s *GroupSpec) Parameters(_ context.Context, existing *asoresourcesv1.ResourceGroup) (*asoresourcesv1.ResourceGroup, error) { if existing != nil { return existing, nil } diff --git a/azure/services/inboundnatrules/inboundnatrules.go b/azure/services/inboundnatrules/inboundnatrules.go index 26508e06333..057732bad68 100644 --- a/azure/services/inboundnatrules/inboundnatrules.go +++ b/azure/services/inboundnatrules/inboundnatrules.go @@ -154,6 +154,6 @@ func (s *Service) Delete(ctx context.Context) error { } // IsManaged returns always returns true as CAPZ does not support BYO inbound NAT rules. -func (s *Service) IsManaged(ctx context.Context) (bool, error) { +func (s *Service) IsManaged(_ context.Context) (bool, error) { return true, nil } diff --git a/azure/services/inboundnatrules/inboundnatrules_test.go b/azure/services/inboundnatrules/inboundnatrules_test.go index d6867b3f651..8a71f574c40 100644 --- a/azure/services/inboundnatrules/inboundnatrules_test.go +++ b/azure/services/inboundnatrules/inboundnatrules_test.go @@ -190,7 +190,6 @@ func TestReconcileInboundNATRule(t *testing.T) { } for _, tc := range testcases { - tc := tc t.Run(tc.name, func(t *testing.T) { g := NewWithT(t) // TODO: investigate why t.Parallel() trips the race detector here. @@ -268,7 +267,6 @@ func TestDeleteNetworkInterface(t *testing.T) { } for _, tc := range testcases { - tc := tc t.Run(tc.name, func(t *testing.T) { g := NewWithT(t) t.Parallel() diff --git a/azure/services/inboundnatrules/spec.go b/azure/services/inboundnatrules/spec.go index 6ee5c98c510..b836e5efb52 100644 --- a/azure/services/inboundnatrules/spec.go +++ b/azure/services/inboundnatrules/spec.go @@ -49,7 +49,7 @@ func (s *InboundNatSpec) OwnerResourceName() string { } // Parameters returns the parameters for the inbound NAT rule. -func (s *InboundNatSpec) Parameters(ctx context.Context, existing interface{}) (parameters interface{}, err error) { +func (s *InboundNatSpec) Parameters(_ context.Context, existing interface{}) (parameters interface{}, err error) { if existing != nil { if _, ok := existing.(armnetwork.InboundNatRule); !ok { return nil, errors.Errorf("%T is not an armnetwork.InboundNatRule", existing) diff --git a/azure/services/inboundnatrules/spec_test.go b/azure/services/inboundnatrules/spec_test.go index ba677cb1cfb..1e9de0d28e1 100644 --- a/azure/services/inboundnatrules/spec_test.go +++ b/azure/services/inboundnatrules/spec_test.go @@ -61,7 +61,6 @@ func TestParameters(t *testing.T) { }, } for _, tc := range testcases { - tc := tc t.Run(tc.name, func(t *testing.T) { g := NewWithT(t) t.Parallel() @@ -148,7 +147,6 @@ func TestGetAvailablePort(t *testing.T) { }, } for _, tc := range testcases { - tc := tc t.Run(tc.name, func(t *testing.T) { g := NewWithT(t) t.Parallel() diff --git a/azure/services/loadbalancers/loadbalancers.go b/azure/services/loadbalancers/loadbalancers.go index 0b5041cd76f..a5ff22d65a6 100644 --- a/azure/services/loadbalancers/loadbalancers.go +++ b/azure/services/loadbalancers/loadbalancers.go @@ -125,6 +125,6 @@ func (s *Service) Delete(ctx context.Context) error { } // IsManaged returns always returns true as CAPZ does not support BYO load balancers. -func (s *Service) IsManaged(ctx context.Context) (bool, error) { +func (s *Service) IsManaged(_ context.Context) (bool, error) { return true, nil } diff --git a/azure/services/loadbalancers/loadbalancers_test.go b/azure/services/loadbalancers/loadbalancers_test.go index 3e75506f987..238bde7ed3a 100644 --- a/azure/services/loadbalancers/loadbalancers_test.go +++ b/azure/services/loadbalancers/loadbalancers_test.go @@ -182,7 +182,6 @@ func TestReconcileLoadBalancer(t *testing.T) { } for _, tc := range testcases { - tc := tc t.Run(tc.name, func(t *testing.T) { g := NewWithT(t) t.Parallel() @@ -259,7 +258,6 @@ func TestDeleteLoadBalancer(t *testing.T) { } for _, tc := range testcases { - tc := tc t.Run(tc.name, func(t *testing.T) { g := NewWithT(t) t.Parallel() diff --git a/azure/services/loadbalancers/spec.go b/azure/services/loadbalancers/spec.go index 9f092812353..c01c34c8d04 100644 --- a/azure/services/loadbalancers/spec.go +++ b/azure/services/loadbalancers/spec.go @@ -65,7 +65,7 @@ func (s *LBSpec) OwnerResourceName() string { } // Parameters returns the parameters for the load balancer. -func (s *LBSpec) Parameters(ctx context.Context, existing interface{}) (parameters interface{}, err error) { +func (s *LBSpec) Parameters(_ context.Context, existing interface{}) (parameters interface{}, err error) { var ( etag *string frontendIDs []*armnetwork.SubResource diff --git a/azure/services/loadbalancers/spec_test.go b/azure/services/loadbalancers/spec_test.go index 8ad143542f2..7b8fc339f13 100644 --- a/azure/services/loadbalancers/spec_test.go +++ b/azure/services/loadbalancers/spec_test.go @@ -149,7 +149,6 @@ func TestParameters(t *testing.T) { }, } for _, tc := range testcases { - tc := tc t.Run(tc.name, func(t *testing.T) { g := NewWithT(t) t.Parallel() diff --git a/azure/services/managedclusters/spec.go b/azure/services/managedclusters/spec.go index 825b8f4056e..e58a2827aab 100644 --- a/azure/services/managedclusters/spec.go +++ b/azure/services/managedclusters/spec.go @@ -815,7 +815,7 @@ func userKubeconfigSecretName(clusterName string) string { } // WasManaged implements azure.ASOResourceSpecGetter. -func (s *ManagedClusterSpec) WasManaged(resource genruntime.MetaObject) bool { +func (s *ManagedClusterSpec) WasManaged(_ genruntime.MetaObject) bool { // CAPZ has never supported BYO managed clusters. return true } diff --git a/azure/services/natgateways/spec.go b/azure/services/natgateways/spec.go index 9c9d80a78ff..0b17612e7ec 100644 --- a/azure/services/natgateways/spec.go +++ b/azure/services/natgateways/spec.go @@ -50,7 +50,7 @@ func (s *NatGatewaySpec) ResourceRef() *asonetworkv1.NatGateway { } // Parameters implements azure.ASOResourceSpecGetter. -func (s *NatGatewaySpec) Parameters(ctx context.Context, existingNatGateway *asonetworkv1.NatGateway) (params *asonetworkv1.NatGateway, err error) { +func (s *NatGatewaySpec) Parameters(_ context.Context, existingNatGateway *asonetworkv1.NatGateway) (params *asonetworkv1.NatGateway, err error) { natGateway := &asonetworkv1.NatGateway{} natGateway.Spec = asonetworkv1.NatGateway_Spec{} @@ -84,6 +84,6 @@ func (s *NatGatewaySpec) Parameters(ctx context.Context, existingNatGateway *aso } // WasManaged implements azure.ASOResourceSpecGetter. -func (s *NatGatewaySpec) WasManaged(resource *asonetworkv1.NatGateway) bool { +func (s *NatGatewaySpec) WasManaged(_ *asonetworkv1.NatGateway) bool { return s.IsVnetManaged } diff --git a/azure/services/natgateways/spec_test.go b/azure/services/natgateways/spec_test.go index 7b526db330b..8c502f7f641 100644 --- a/azure/services/natgateways/spec_test.go +++ b/azure/services/natgateways/spec_test.go @@ -134,7 +134,6 @@ func TestParameters(t *testing.T) { }, } for _, tc := range testcases { - tc := tc t.Run(tc.name, func(t *testing.T) { g := NewWithT(t) t.Parallel() diff --git a/azure/services/networkinterfaces/client.go b/azure/services/networkinterfaces/client.go index 2e74ec51223..62fefd8d304 100644 --- a/azure/services/networkinterfaces/client.go +++ b/azure/services/networkinterfaces/client.go @@ -36,7 +36,7 @@ type azureClient struct { } // NewClient creates a new network interfaces client from an authorizer. -func NewClient(auth azure.Authorizer, apiCallTimeout time.Duration) (*azureClient, error) { +func NewClient(auth azure.Authorizer, apiCallTimeout time.Duration) (*azureClient, error) { //nolint:revive // leave it as is opts, err := azure.ARMClientOptions(auth.CloudEnvironment()) if err != nil { return nil, errors.Wrap(err, "failed to create networkinterfaces client options") diff --git a/azure/services/networkinterfaces/networkinterfaces.go b/azure/services/networkinterfaces/networkinterfaces.go index f0ac455015c..b826d4446dc 100644 --- a/azure/services/networkinterfaces/networkinterfaces.go +++ b/azure/services/networkinterfaces/networkinterfaces.go @@ -122,6 +122,6 @@ func (s *Service) Delete(ctx context.Context) error { } // IsManaged returns always returns true as CAPZ does not support BYO network interfaces. -func (s *Service) IsManaged(ctx context.Context) (bool, error) { +func (s *Service) IsManaged(_ context.Context) (bool, error) { return true, nil } diff --git a/azure/services/networkinterfaces/networkinterfaces_test.go b/azure/services/networkinterfaces/networkinterfaces_test.go index 85d84476353..ed1e97595ff 100644 --- a/azure/services/networkinterfaces/networkinterfaces_test.go +++ b/azure/services/networkinterfaces/networkinterfaces_test.go @@ -141,7 +141,6 @@ func TestReconcileNetworkInterface(t *testing.T) { } for _, tc := range testcases { - tc := tc t.Run(tc.name, func(t *testing.T) { g := NewWithT(t) t.Parallel() @@ -219,7 +218,6 @@ func TestDeleteNetworkInterface(t *testing.T) { } for _, tc := range testcases { - tc := tc t.Run(tc.name, func(t *testing.T) { g := NewWithT(t) t.Parallel() diff --git a/azure/services/networkinterfaces/spec.go b/azure/services/networkinterfaces/spec.go index e21a501d67d..06187a59055 100644 --- a/azure/services/networkinterfaces/spec.go +++ b/azure/services/networkinterfaces/spec.go @@ -80,7 +80,7 @@ func (s *NICSpec) OwnerResourceName() string { } // Parameters returns the parameters for the network interface. -func (s *NICSpec) Parameters(ctx context.Context, existing interface{}) (parameters interface{}, err error) { +func (s *NICSpec) Parameters(_ context.Context, existing interface{}) (parameters interface{}, err error) { if existing != nil { if _, ok := existing.(armnetwork.Interface); !ok { return nil, errors.Errorf("%T is not an armnetwork.Interface", existing) diff --git a/azure/services/networkinterfaces/spec_test.go b/azure/services/networkinterfaces/spec_test.go index cc6a8158119..9708256f77d 100644 --- a/azure/services/networkinterfaces/spec_test.go +++ b/azure/services/networkinterfaces/spec_test.go @@ -672,7 +672,6 @@ func TestParameters(t *testing.T) { } format.MaxLength = 10000 for _, tc := range testcases { - tc := tc t.Run(tc.name, func(t *testing.T) { g := NewWithT(t) t.Parallel() diff --git a/azure/services/privatedns/link_spec.go b/azure/services/privatedns/link_spec.go index 5b2d6a11a18..9359c071338 100644 --- a/azure/services/privatedns/link_spec.go +++ b/azure/services/privatedns/link_spec.go @@ -56,7 +56,7 @@ func (s LinkSpec) ResourceGroupName() string { } // Parameters returns the parameters for the virtual network link. -func (s LinkSpec) Parameters(ctx context.Context, existing interface{}) (params interface{}, err error) { +func (s LinkSpec) Parameters(_ context.Context, existing interface{}) (params interface{}, err error) { if existing != nil { _, ok := existing.(armprivatedns.VirtualNetworkLink) if !ok { diff --git a/azure/services/privatedns/link_spec_test.go b/azure/services/privatedns/link_spec_test.go index 2dc755ef79d..626aef82e0e 100644 --- a/azure/services/privatedns/link_spec_test.go +++ b/azure/services/privatedns/link_spec_test.go @@ -111,7 +111,6 @@ func TestLinkSpec_Parameters(t *testing.T) { } for _, tc := range testcases { - tc := tc t.Run(tc.name, func(t *testing.T) { g := NewWithT(t) t.Parallel() diff --git a/azure/services/privatedns/privatedns_test.go b/azure/services/privatedns/privatedns_test.go index c7264d08d40..f975e6fc8a3 100644 --- a/azure/services/privatedns/privatedns_test.go +++ b/azure/services/privatedns/privatedns_test.go @@ -332,7 +332,6 @@ func TestReconcilePrivateDNS(t *testing.T) { } for _, tc := range testcases { - tc := tc t.Run(tc.name, func(t *testing.T) { g := NewWithT(t) @@ -560,7 +559,6 @@ func TestDeletePrivateDNS(t *testing.T) { } for _, tc := range testcases { - tc := tc t.Run(tc.name, func(t *testing.T) { g := NewWithT(t) diff --git a/azure/services/privatedns/record_client.go b/azure/services/privatedns/record_client.go index 0cece84beb1..01e6ce7ff8c 100644 --- a/azure/services/privatedns/record_client.go +++ b/azure/services/privatedns/record_client.go @@ -46,13 +46,13 @@ func newRecordSetsClient(auth azure.Authorizer) (*azureRecordsClient, error) { } // Get gets the specified record set. Noop for records. -func (arc *azureRecordsClient) Get(ctx context.Context, spec azure.ResourceSpecGetter) (result interface{}, err error) { +func (arc *azureRecordsClient) Get(_ context.Context, _ azure.ResourceSpecGetter) (result interface{}, err error) { return nil, nil } // CreateOrUpdateAsync creates or updates a record asynchronously. // Creating a record set is not a long-running operation, so we don't ever return a future. -func (arc *azureRecordsClient) CreateOrUpdateAsync(ctx context.Context, spec azure.ResourceSpecGetter, resumeToken string, parameters interface{}) (result interface{}, poller *runtime.Poller[armprivatedns.RecordSetsClientCreateOrUpdateResponse], err error) { +func (arc *azureRecordsClient) CreateOrUpdateAsync(ctx context.Context, spec azure.ResourceSpecGetter, _ string, parameters interface{}) (result interface{}, poller *runtime.Poller[armprivatedns.RecordSetsClientCreateOrUpdateResponse], err error) { ctx, _, done := tele.StartSpanWithLogger(ctx, "privatedns.azureRecordsClient.CreateOrUpdateAsync") defer done() @@ -81,6 +81,6 @@ func (arc *azureRecordsClient) CreateOrUpdateAsync(ctx context.Context, spec azu } // DeleteAsync deletes a record asynchronously. Noop for records. -func (arc *azureRecordsClient) DeleteAsync(ctx context.Context, spec azure.ResourceSpecGetter, resumeToken string) (poller *runtime.Poller[armprivatedns.RecordSetsClientDeleteResponse], err error) { +func (arc *azureRecordsClient) DeleteAsync(_ context.Context, _ azure.ResourceSpecGetter, _ string) (poller *runtime.Poller[armprivatedns.RecordSetsClientDeleteResponse], err error) { return nil, nil } diff --git a/azure/services/privatedns/record_spec.go b/azure/services/privatedns/record_spec.go index 103de119294..33bf74594ff 100644 --- a/azure/services/privatedns/record_spec.go +++ b/azure/services/privatedns/record_spec.go @@ -50,7 +50,7 @@ func (s RecordSpec) ResourceGroupName() string { } // Parameters returns the parameters for a record set. -func (s RecordSpec) Parameters(ctx context.Context, existing interface{}) (params interface{}, err error) { +func (s RecordSpec) Parameters(_ context.Context, existing interface{}) (params interface{}, err error) { if existing != nil { if _, ok := existing.(armprivatedns.RecordSet); !ok { return nil, errors.Errorf("%T is not an armprivatedns.RecordSet", existing) diff --git a/azure/services/privatedns/record_spec_test.go b/azure/services/privatedns/record_spec_test.go index b0c1d2736ba..4a07540bfa6 100644 --- a/azure/services/privatedns/record_spec_test.go +++ b/azure/services/privatedns/record_spec_test.go @@ -101,7 +101,6 @@ func TestRecordSpec_Parameters(t *testing.T) { } for _, tc := range testcases { - tc := tc t.Run(tc.name, func(t *testing.T) { g := NewWithT(t) t.Parallel() diff --git a/azure/services/privatedns/zone_spec.go b/azure/services/privatedns/zone_spec.go index 36a93f27c38..a2fc750195b 100644 --- a/azure/services/privatedns/zone_spec.go +++ b/azure/services/privatedns/zone_spec.go @@ -52,7 +52,7 @@ func (s ZoneSpec) ResourceGroupName() string { } // Parameters returns the parameters for the private dns zone. -func (s ZoneSpec) Parameters(ctx context.Context, existing interface{}) (params interface{}, err error) { +func (s ZoneSpec) Parameters(_ context.Context, existing interface{}) (params interface{}, err error) { if existing != nil { _, ok := existing.(armprivatedns.PrivateZone) if !ok { diff --git a/azure/services/privatedns/zone_spec_test.go b/azure/services/privatedns/zone_spec_test.go index b8c75ba939c..ebbe39abae9 100644 --- a/azure/services/privatedns/zone_spec_test.go +++ b/azure/services/privatedns/zone_spec_test.go @@ -101,7 +101,6 @@ func TestZoneSpec_Parameters(t *testing.T) { } for _, tc := range testcases { - tc := tc t.Run(tc.name, func(t *testing.T) { g := NewWithT(t) t.Parallel() diff --git a/azure/services/privateendpoints/spec.go b/azure/services/privateendpoints/spec.go index dc47636668e..c5656353e07 100644 --- a/azure/services/privateendpoints/spec.go +++ b/azure/services/privateendpoints/spec.go @@ -62,7 +62,7 @@ func (s *PrivateEndpointSpec) ResourceRef() *asonetworkv1.PrivateEndpoint { } // Parameters implements azure.ASOResourceSpecGetter. -func (s *PrivateEndpointSpec) Parameters(ctx context.Context, existingPrivateEndpoint *asonetworkv1.PrivateEndpoint) (*asonetworkv1.PrivateEndpoint, error) { +func (s *PrivateEndpointSpec) Parameters(_ context.Context, existingPrivateEndpoint *asonetworkv1.PrivateEndpoint) (*asonetworkv1.PrivateEndpoint, error) { privateEndpoint := &asonetworkv1.PrivateEndpoint{} if existingPrivateEndpoint != nil { privateEndpoint = existingPrivateEndpoint @@ -152,6 +152,6 @@ func (s *PrivateEndpointSpec) Parameters(ctx context.Context, existingPrivateEnd // WasManaged implements azure.ASOResourceSpecGetter. // It always returns true since CAPZ doesn't support BYO private endpoints. -func (s *PrivateEndpointSpec) WasManaged(privateEndpoint *asonetworkv1.PrivateEndpoint) bool { +func (s *PrivateEndpointSpec) WasManaged(_ *asonetworkv1.PrivateEndpoint) bool { return true } diff --git a/azure/services/privateendpoints/spec_test.go b/azure/services/privateendpoints/spec_test.go index 50c954fcd76..e98361957a7 100644 --- a/azure/services/privateendpoints/spec_test.go +++ b/azure/services/privateendpoints/spec_test.go @@ -223,7 +223,6 @@ func TestParameters(t *testing.T) { } for _, tc := range testcases { - tc := tc t.Run(tc.name, func(t *testing.T) { g := NewWithT(t) t.Parallel() diff --git a/azure/services/publicips/publicips.go b/azure/services/publicips/publicips.go index f6c6c27470f..0854f89f583 100644 --- a/azure/services/publicips/publicips.go +++ b/azure/services/publicips/publicips.go @@ -167,6 +167,6 @@ func (s *Service) isIPManaged(ctx context.Context, spec azure.ResourceSpecGetter } // IsManaged returns always returns true as public IPs are managed on a one-by-one basis. -func (s *Service) IsManaged(ctx context.Context) (bool, error) { +func (s *Service) IsManaged(_ context.Context) (bool, error) { return true, nil } diff --git a/azure/services/publicips/publicips_test.go b/azure/services/publicips/publicips_test.go index 8a1548bb6a6..706d6e60345 100644 --- a/azure/services/publicips/publicips_test.go +++ b/azure/services/publicips/publicips_test.go @@ -167,7 +167,6 @@ func TestReconcilePublicIP(t *testing.T) { } for _, tc := range testcases { - tc := tc t.Run(tc.name, func(t *testing.T) { g := NewWithT(t) @@ -298,7 +297,6 @@ func TestDeletePublicIP(t *testing.T) { } for _, tc := range testcases { - tc := tc t.Run(tc.name, func(t *testing.T) { g := NewWithT(t) diff --git a/azure/services/publicips/spec.go b/azure/services/publicips/spec.go index 97d5ebddea7..7fe506c0b87 100644 --- a/azure/services/publicips/spec.go +++ b/azure/services/publicips/spec.go @@ -58,7 +58,7 @@ func (s *PublicIPSpec) OwnerResourceName() string { } // Parameters returns the parameters for the public IP. -func (s *PublicIPSpec) Parameters(ctx context.Context, existing interface{}) (params interface{}, err error) { +func (s *PublicIPSpec) Parameters(_ context.Context, existing interface{}) (params interface{}, err error) { if existing != nil { if _, ok := existing.(armnetwork.PublicIPAddress); !ok { return nil, errors.Errorf("%T is not an armnetwork.PublicIPAddress", existing) diff --git a/azure/services/publicips/spec_test.go b/azure/services/publicips/spec_test.go index 97f94bb50dd..b3f86f1765f 100644 --- a/azure/services/publicips/spec_test.go +++ b/azure/services/publicips/spec_test.go @@ -147,7 +147,6 @@ func TestParameters(t *testing.T) { } for _, tc := range testCases { - tc := tc t.Run(tc.name, func(t *testing.T) { g := NewWithT(t) t.Parallel() diff --git a/azure/services/resourcehealth/resourcehealth.go b/azure/services/resourcehealth/resourcehealth.go index 391c5635aac..df4171b0f6b 100644 --- a/azure/services/resourcehealth/resourcehealth.go +++ b/azure/services/resourcehealth/resourcehealth.go @@ -110,6 +110,6 @@ func (s *Service) Delete(ctx context.Context) error { } // IsManaged always returns true. -func (s *Service) IsManaged(ctx context.Context) (bool, error) { +func (s *Service) IsManaged(_ context.Context) (bool, error) { return true, nil } diff --git a/azure/services/resourceskus/cache_test.go b/azure/services/resourceskus/cache_test.go index 864fc8dbe9c..4094f5c1aba 100644 --- a/azure/services/resourceskus/cache_test.go +++ b/azure/services/resourceskus/cache_test.go @@ -63,7 +63,6 @@ func TestCacheGet(t *testing.T) { } for name, tc := range cases { - tc := tc t.Run(name, func(t *testing.T) { t.Parallel() @@ -227,7 +226,6 @@ func TestCacheGetZones(t *testing.T) { } for name, tc := range cases { - tc := tc t.Run(name, func(t *testing.T) { t.Parallel() @@ -376,7 +374,6 @@ func TestCacheGetZonesWithVMSize(t *testing.T) { } for name, tc := range cases { - tc := tc t.Run(name, func(t *testing.T) { t.Parallel() diff --git a/azure/services/roleassignments/client.go b/azure/services/roleassignments/client.go index d45e8194c97..dd7643ec8d3 100644 --- a/azure/services/roleassignments/client.go +++ b/azure/services/roleassignments/client.go @@ -59,7 +59,7 @@ func (ac *azureClient) Get(ctx context.Context, spec azure.ResourceSpecGetter) ( // CreateOrUpdateAsync creates a roleassignment. // Creating a roleassignment is not a long running operation, so we don't ever return a poller. -func (ac *azureClient) CreateOrUpdateAsync(ctx context.Context, spec azure.ResourceSpecGetter, resumeToken string, parameters interface{}) (result interface{}, poller *runtime.Poller[armauthorization.RoleAssignmentsClientCreateResponse], err error) { +func (ac *azureClient) CreateOrUpdateAsync(ctx context.Context, spec azure.ResourceSpecGetter, resumeToken string, parameters interface{}) (result interface{}, poller *runtime.Poller[armauthorization.RoleAssignmentsClientCreateResponse], err error) { //nolint:revive // keeping resumeToken for readability ctx, _, done := tele.StartSpanWithLogger(ctx, "roleassignments.azureClient.CreateOrUpdateAsync") defer done() diff --git a/azure/services/roleassignments/roleassignments.go b/azure/services/roleassignments/roleassignments.go index 5db9557e9b7..c8cb16d5352 100644 --- a/azure/services/roleassignments/roleassignments.go +++ b/azure/services/roleassignments/roleassignments.go @@ -181,6 +181,6 @@ func (s *Service) Delete(ctx context.Context) error { } // IsManaged returns always returns true as CAPZ does not support BYO role assignments. -func (s *Service) IsManaged(ctx context.Context) (bool, error) { +func (s *Service) IsManaged(_ context.Context) (bool, error) { return true, nil } diff --git a/azure/services/roleassignments/roleassignments_test.go b/azure/services/roleassignments/roleassignments_test.go index 34ad3e83e51..9b203db3b45 100644 --- a/azure/services/roleassignments/roleassignments_test.go +++ b/azure/services/roleassignments/roleassignments_test.go @@ -142,7 +142,6 @@ func TestReconcileRoleAssignmentsVM(t *testing.T) { } for _, tc := range testcases { - tc := tc t.Run(tc.name, func(t *testing.T) { g := NewWithT(t) t.Parallel() @@ -237,7 +236,6 @@ func TestReconcileRoleAssignmentsVMSS(t *testing.T) { } for _, tc := range testcases { - tc := tc t.Run(tc.name, func(t *testing.T) { g := NewWithT(t) t.Parallel() diff --git a/azure/services/roleassignments/spec.go b/azure/services/roleassignments/spec.go index 42b86629146..78b91e7f227 100644 --- a/azure/services/roleassignments/spec.go +++ b/azure/services/roleassignments/spec.go @@ -53,7 +53,7 @@ func (s *RoleAssignmentSpec) OwnerResourceName() string { } // Parameters returns the parameters for the RoleAssignmentSpec. -func (s *RoleAssignmentSpec) Parameters(ctx context.Context, existing interface{}) (interface{}, error) { +func (s *RoleAssignmentSpec) Parameters(_ context.Context, existing interface{}) (interface{}, error) { if existing != nil { if _, ok := existing.(armauthorization.RoleAssignment); !ok { return nil, errors.Errorf("%T is not an armauthorization.RoleAssignment", existing) diff --git a/azure/services/roleassignments/spec_test.go b/azure/services/roleassignments/spec_test.go index 12806ca7921..95291af516a 100644 --- a/azure/services/roleassignments/spec_test.go +++ b/azure/services/roleassignments/spec_test.go @@ -85,7 +85,6 @@ func TestRoleAssignmentSpec_Parameters(t *testing.T) { }, } for _, tc := range testCases { - tc := tc t.Run(tc.name, func(t *testing.T) { g := NewWithT(t) t.Parallel() diff --git a/azure/services/routetables/routetables_test.go b/azure/services/routetables/routetables_test.go index 354ffd66fad..f4e4964eef4 100644 --- a/azure/services/routetables/routetables_test.go +++ b/azure/services/routetables/routetables_test.go @@ -115,7 +115,6 @@ func TestReconcileRouteTables(t *testing.T) { } for _, tc := range testcases { - tc := tc t.Run(tc.name, func(t *testing.T) { g := NewWithT(t) t.Parallel() @@ -205,7 +204,6 @@ func TestDeleteRouteTable(t *testing.T) { } for _, tc := range testcases { - tc := tc t.Run(tc.name, func(t *testing.T) { g := NewWithT(t) t.Parallel() diff --git a/azure/services/routetables/spec.go b/azure/services/routetables/spec.go index 7e565b496d2..091a25e4118 100644 --- a/azure/services/routetables/spec.go +++ b/azure/services/routetables/spec.go @@ -52,7 +52,7 @@ func (s *RouteTableSpec) OwnerResourceName() string { } // Parameters returns the parameters for the route table. -func (s *RouteTableSpec) Parameters(ctx context.Context, existing interface{}) (params interface{}, err error) { +func (s *RouteTableSpec) Parameters(_ context.Context, existing interface{}) (params interface{}, err error) { if existing != nil { if _, ok := existing.(armnetwork.RouteTable); !ok { return nil, errors.Errorf("%T is not an armnetwork.RouteTable", existing) diff --git a/azure/services/routetables/spec_test.go b/azure/services/routetables/spec_test.go index 2c4352e46a6..01abb65dffc 100644 --- a/azure/services/routetables/spec_test.go +++ b/azure/services/routetables/spec_test.go @@ -94,7 +94,6 @@ func TestRouteTableSpec_Parameters(t *testing.T) { }, } for _, tc := range testCases { - tc := tc t.Run(tc.name, func(t *testing.T) { g := NewWithT(t) t.Parallel() diff --git a/azure/services/scalesets/scalesets.go b/azure/services/scalesets/scalesets.go index 8cc74135e55..4311b43283e 100644 --- a/azure/services/scalesets/scalesets.go +++ b/azure/services/scalesets/scalesets.go @@ -298,6 +298,6 @@ func (s *Service) getVirtualMachineScaleSet(ctx context.Context, spec azure.Reso } // IsManaged returns always returns true as CAPZ does not support BYO scale set. -func (s *Service) IsManaged(ctx context.Context) (bool, error) { +func (s *Service) IsManaged(_ context.Context) (bool, error) { return true, nil } diff --git a/azure/services/scalesets/scalesets_test.go b/azure/services/scalesets/scalesets_test.go index 5ec9c03f014..36cc4657de4 100644 --- a/azure/services/scalesets/scalesets_test.go +++ b/azure/services/scalesets/scalesets_test.go @@ -311,7 +311,6 @@ func TestReconcileVMSS(t *testing.T) { } for _, tc := range testcases { - tc := tc t.Run(tc.name, func(t *testing.T) { g := NewWithT(t) t.Parallel() @@ -394,7 +393,6 @@ func TestDeleteVMSS(t *testing.T) { } for _, tc := range testcases { - tc := tc t.Run(tc.name, func(t *testing.T) { g := NewWithT(t) t.Parallel() diff --git a/azure/services/scalesets/spec.go b/azure/services/scalesets/spec.go index f4ccd982403..a86fd9bc69e 100644 --- a/azure/services/scalesets/spec.go +++ b/azure/services/scalesets/spec.go @@ -289,7 +289,6 @@ func hasModelModifyingDifferences(infraVMSS *azure.VMSS, vmss armcompute.Virtual func (s *ScaleSetSpec) generateExtensions(ctx context.Context) ([]armcompute.VirtualMachineScaleSetExtension, error) { extensions := make([]armcompute.VirtualMachineScaleSetExtension, len(s.VMSSExtensionSpecs)) for i, extensionSpec := range s.VMSSExtensionSpecs { - extensionSpec := extensionSpec parameters, err := extensionSpec.Parameters(ctx, nil) if err != nil { return nil, err diff --git a/azure/services/scalesets/spec_test.go b/azure/services/scalesets/spec_test.go index f69ef97c883..de28224c2f3 100644 --- a/azure/services/scalesets/spec_test.go +++ b/azure/services/scalesets/spec_test.go @@ -714,7 +714,6 @@ func TestScaleSetParameters(t *testing.T) { }, } for _, tc := range testcases { - tc := tc t.Run(tc.name, func(t *testing.T) { g := NewWithT(t) t.Parallel() diff --git a/azure/services/scalesets/vmssextension_spec.go b/azure/services/scalesets/vmssextension_spec.go index c157e8d906e..f8e45e6e49f 100644 --- a/azure/services/scalesets/vmssextension_spec.go +++ b/azure/services/scalesets/vmssextension_spec.go @@ -48,7 +48,7 @@ func (s *VMSSExtensionSpec) OwnerResourceName() string { } // Parameters returns the parameters for the VMSS extension. -func (s *VMSSExtensionSpec) Parameters(ctx context.Context, existing interface{}) (interface{}, error) { +func (s *VMSSExtensionSpec) Parameters(_ context.Context, existing interface{}) (interface{}, error) { if existing != nil { _, ok := existing.(armcompute.VirtualMachineScaleSetExtension) if !ok { diff --git a/azure/services/scalesets/vmssextension_spec_test.go b/azure/services/scalesets/vmssextension_spec_test.go index 5709798c38b..cc4c0db1ea8 100644 --- a/azure/services/scalesets/vmssextension_spec_test.go +++ b/azure/services/scalesets/vmssextension_spec_test.go @@ -80,7 +80,6 @@ func TestVMSSExtensionParameters(t *testing.T) { }, } for _, tc := range testcases { - tc := tc t.Run(tc.name, func(t *testing.T) { g := NewWithT(t) t.Parallel() diff --git a/azure/services/scalesetvms/client.go b/azure/services/scalesetvms/client.go index a3ce2cf50ac..b4aab4471e5 100644 --- a/azure/services/scalesetvms/client.go +++ b/azure/services/scalesetvms/client.go @@ -70,7 +70,7 @@ func (ac *azureClient) Get(ctx context.Context, spec azure.ResourceSpecGetter) ( } // CreateOrUpdateAsync is a dummy implementation to fulfill the async.Reconciler interface. -func (ac *azureClient) CreateOrUpdateAsync(ctx context.Context, spec azure.ResourceSpecGetter, resumeToken string, parameters interface{}) (result interface{}, poller *runtime.Poller[armcompute.VirtualMachineScaleSetVMsClientUpdateResponse], err error) { +func (ac *azureClient) CreateOrUpdateAsync(ctx context.Context, _ azure.ResourceSpecGetter, _ string, _ interface{}) (result interface{}, poller *runtime.Poller[armcompute.VirtualMachineScaleSetVMsClientUpdateResponse], err error) { _, _, done := tele.StartSpanWithLogger(ctx, "scalesets.AzureClient.CreateOrUpdateAsync") defer done() diff --git a/azure/services/scalesetvms/scalesetvms_test.go b/azure/services/scalesetvms/scalesetvms_test.go index f9c23911036..b01af229d22 100644 --- a/azure/services/scalesetvms/scalesetvms_test.go +++ b/azure/services/scalesetvms/scalesetvms_test.go @@ -135,7 +135,6 @@ func TestReconcileVMSS(t *testing.T) { } for _, tc := range testcases { - tc := tc t.Run(tc.name, func(t *testing.T) { g := NewWithT(t) t.Parallel() @@ -210,7 +209,6 @@ func TestDeleteVMSS(t *testing.T) { } for _, tc := range testcases { - tc := tc t.Run(tc.name, func(t *testing.T) { g := NewWithT(t) t.Parallel() diff --git a/azure/services/scalesetvms/spec.go b/azure/services/scalesetvms/spec.go index 2dbba5cbe1f..38960869730 100644 --- a/azure/services/scalesetvms/spec.go +++ b/azure/services/scalesetvms/spec.go @@ -47,7 +47,7 @@ func (s *ScaleSetVMSpec) OwnerResourceName() string { } // Parameters is a no-op for VMSS VMs as this spec is only used to Get(). -func (s *ScaleSetVMSpec) Parameters(ctx context.Context, existing interface{}) (params interface{}, err error) { +func (s *ScaleSetVMSpec) Parameters(_ context.Context, _ interface{}) (params interface{}, err error) { return nil, nil } @@ -73,6 +73,6 @@ func (s *VMSSFlexGetter) OwnerResourceName() string { } // Parameters is a no-op for flex VMs as this spec is only used to Get(). -func (s *VMSSFlexGetter) Parameters(ctx context.Context, existing interface{}) (params interface{}, err error) { +func (s *VMSSFlexGetter) Parameters(_ context.Context, _ interface{}) (params interface{}, err error) { return nil, nil } diff --git a/azure/services/securitygroups/securitygroups_test.go b/azure/services/securitygroups/securitygroups_test.go index 941c34c81e9..a98fcd53daf 100644 --- a/azure/services/securitygroups/securitygroups_test.go +++ b/azure/services/securitygroups/securitygroups_test.go @@ -181,7 +181,6 @@ func TestReconcileSecurityGroups(t *testing.T) { }, } for _, tc := range testcases { - tc := tc t.Run(tc.name, func(t *testing.T) { g := NewWithT(t) t.Parallel() @@ -272,7 +271,6 @@ func TestDeleteSecurityGroups(t *testing.T) { }, } for _, tc := range testcases { - tc := tc t.Run(tc.name, func(t *testing.T) { g := NewWithT(t) t.Parallel() diff --git a/azure/services/securitygroups/spec.go b/azure/services/securitygroups/spec.go index e83e431d653..c2a7d711f1e 100644 --- a/azure/services/securitygroups/spec.go +++ b/azure/services/securitygroups/spec.go @@ -55,7 +55,7 @@ func (s *NSGSpec) OwnerResourceName() string { } // Parameters returns the parameters for the security group. -func (s *NSGSpec) Parameters(ctx context.Context, existing interface{}) (interface{}, error) { +func (s *NSGSpec) Parameters(_ context.Context, existing interface{}) (interface{}, error) { securityRules := make([]*armnetwork.SecurityRule, 0) newAnnotation := map[string]string{} var etag *string diff --git a/azure/services/securitygroups/spec_test.go b/azure/services/securitygroups/spec_test.go index 1e9abbfacb1..c132e56bfdc 100644 --- a/azure/services/securitygroups/spec_test.go +++ b/azure/services/securitygroups/spec_test.go @@ -355,7 +355,6 @@ func TestParameters(t *testing.T) { } for _, tc := range testcases { - tc := tc t.Run(tc.name, func(t *testing.T) { g := NewWithT(t) t.Parallel() @@ -399,7 +398,6 @@ func TestRuleExists(t *testing.T) { }, } for _, tc := range testcases { - tc := tc t.Run(tc.name, func(t *testing.T) { g := NewWithT(t) t.Parallel() diff --git a/azure/services/subnets/spec.go b/azure/services/subnets/spec.go index 3a2fc0c6040..039d1213e2a 100644 --- a/azure/services/subnets/spec.go +++ b/azure/services/subnets/spec.go @@ -56,7 +56,7 @@ func (s *SubnetSpec) ResourceRef() *asonetworkv1.VirtualNetworksSubnet { } // Parameters implements azure.ASOResourceSpecGetter. -func (s *SubnetSpec) Parameters(ctx context.Context, existing *asonetworkv1.VirtualNetworksSubnet) (parameters *asonetworkv1.VirtualNetworksSubnet, err error) { +func (s *SubnetSpec) Parameters(_ context.Context, existing *asonetworkv1.VirtualNetworksSubnet) (parameters *asonetworkv1.VirtualNetworksSubnet, err error) { subnet := existing if subnet == nil { subnet = &asonetworkv1.VirtualNetworksSubnet{} @@ -98,7 +98,8 @@ func (s *SubnetSpec) Parameters(ctx context.Context, existing *asonetworkv1.Virt } } - var serviceEndpoints []asonetworkv1.ServiceEndpointPropertiesFormat + // TODO (nojnhuh) : do we want to initialize serviceEndpoints with an empty slice instead? + var serviceEndpoints []asonetworkv1.ServiceEndpointPropertiesFormat //nolint:prealloc // leaving it as is for now for _, se := range s.ServiceEndpoints { serviceEndpoints = append(serviceEndpoints, asonetworkv1.ServiceEndpointPropertiesFormat{Service: ptr.To(se.Service), Locations: se.Locations}) } @@ -108,6 +109,6 @@ func (s *SubnetSpec) Parameters(ctx context.Context, existing *asonetworkv1.Virt } // WasManaged implements azure.ASOResourceSpecGetter. -func (s *SubnetSpec) WasManaged(resource *asonetworkv1.VirtualNetworksSubnet) bool { +func (s *SubnetSpec) WasManaged(_ *asonetworkv1.VirtualNetworksSubnet) bool { return s.IsVNetManaged } diff --git a/azure/services/tags/tags.go b/azure/services/tags/tags.go index 804eef7fbd1..14adb0a629b 100644 --- a/azure/services/tags/tags.go +++ b/azure/services/tags/tags.go @@ -210,6 +210,6 @@ func TagsChanged(lastAppliedTags map[string]interface{}, desiredTags map[string] } // IsManaged returns always returns true as CAPZ does not support BYO tags. -func (s *Service) IsManaged(ctx context.Context) (bool, error) { +func (s *Service) IsManaged(_ context.Context) (bool, error) { return true, nil } diff --git a/azure/services/tags/tags_test.go b/azure/services/tags/tags_test.go index 67899bac549..e72cd240a2a 100644 --- a/azure/services/tags/tags_test.go +++ b/azure/services/tags/tags_test.go @@ -268,7 +268,6 @@ func TestReconcileTags(t *testing.T) { } for _, tc := range testcases { - tc := tc t.Run(tc.name, func(t *testing.T) { g := NewWithT(t) t.Parallel() @@ -443,7 +442,6 @@ func TestTagsChanged(t *testing.T) { }} for name, test := range tests { - test := test t.Run(name, func(t *testing.T) { t.Parallel() changed, createdOrUpdated, deleted, newAnnotation := TagsChanged(test.lastAppliedTags, test.desiredTags, test.currentTags) diff --git a/azure/services/virtualmachineimages/cache_test.go b/azure/services/virtualmachineimages/cache_test.go index 75b5a474265..7842975c6ef 100644 --- a/azure/services/virtualmachineimages/cache_test.go +++ b/azure/services/virtualmachineimages/cache_test.go @@ -57,7 +57,6 @@ func TestCacheGet(t *testing.T) { } for name, tc := range cases { - tc := tc t.Run(name, func(t *testing.T) { t.Parallel() diff --git a/azure/services/virtualmachineimages/images_test.go b/azure/services/virtualmachineimages/images_test.go index 5e4099a14c5..e46be00a67a 100644 --- a/azure/services/virtualmachineimages/images_test.go +++ b/azure/services/virtualmachineimages/images_test.go @@ -219,7 +219,6 @@ func TestGetDefaultUbuntuImage(t *testing.T) { location := "westus3" for _, test := range tests { - test := test t.Run(test.k8sVersion, func(t *testing.T) { t.Parallel() @@ -560,7 +559,6 @@ func TestGetDefaultImageSKUID(t *testing.T) { location := "francesouth" for _, test := range tests { - test := test t.Run(test.k8sVersion, func(t *testing.T) { t.Parallel() diff --git a/azure/services/virtualmachines/spec.go b/azure/services/virtualmachines/spec.go index b63f587bc96..7f626366edc 100644 --- a/azure/services/virtualmachines/spec.go +++ b/azure/services/virtualmachines/spec.go @@ -78,7 +78,7 @@ func (s *VMSpec) OwnerResourceName() string { } // Parameters returns the parameters for the virtual machine. -func (s *VMSpec) Parameters(ctx context.Context, existing interface{}) (params interface{}, err error) { +func (s *VMSpec) Parameters(_ context.Context, existing interface{}) (params interface{}, err error) { if existing != nil { if _, ok := existing.(armcompute.VirtualMachine); !ok { return nil, errors.Errorf("%T is not an armcompute.VirtualMachine", existing) diff --git a/azure/services/virtualmachines/spec_test.go b/azure/services/virtualmachines/spec_test.go index e13c0e73031..6f6523cc476 100644 --- a/azure/services/virtualmachines/spec_test.go +++ b/azure/services/virtualmachines/spec_test.go @@ -1419,7 +1419,6 @@ func TestParameters(t *testing.T) { }, } for _, tc := range testcases { - tc := tc t.Run(tc.name, func(t *testing.T) { g := NewWithT(t) t.Parallel() diff --git a/azure/services/virtualmachines/virtualmachines.go b/azure/services/virtualmachines/virtualmachines.go index 33b1fba27d6..64623d494a3 100644 --- a/azure/services/virtualmachines/virtualmachines.go +++ b/azure/services/virtualmachines/virtualmachines.go @@ -313,6 +313,6 @@ func getResourceNameByID(resourceID string) string { } // IsManaged returns always returns true as CAPZ does not support BYO VM. -func (s *Service) IsManaged(ctx context.Context) (bool, error) { +func (s *Service) IsManaged(_ context.Context) (bool, error) { return true, nil } diff --git a/azure/services/virtualmachines/virtualmachines_test.go b/azure/services/virtualmachines/virtualmachines_test.go index aeb10218fa4..4da42df90b2 100644 --- a/azure/services/virtualmachines/virtualmachines_test.go +++ b/azure/services/virtualmachines/virtualmachines_test.go @@ -205,7 +205,6 @@ func TestReconcileVM(t *testing.T) { } for _, tc := range testcases { - tc := tc t.Run(tc.name, func(t *testing.T) { g := NewWithT(t) t.Parallel() @@ -287,7 +286,6 @@ func TestDeleteVM(t *testing.T) { } for _, tc := range testcases { - tc := tc t.Run(tc.name, func(t *testing.T) { g := NewWithT(t) t.Parallel() @@ -396,7 +394,6 @@ func TestCheckUserAssignedIdentities(t *testing.T) { }, } for _, tc := range testcases { - tc := tc t.Run(tc.name, func(t *testing.T) { g := NewWithT(t) t.Parallel() diff --git a/azure/services/virtualnetworks/spec.go b/azure/services/virtualnetworks/spec.go index 533d7b41c30..1d3100b5ae9 100644 --- a/azure/services/virtualnetworks/spec.go +++ b/azure/services/virtualnetworks/spec.go @@ -50,7 +50,7 @@ func (s *VNetSpec) ResourceRef() *asonetworkv1.VirtualNetwork { } // Parameters implements azure.ASOResourceSpecGetter. -func (s *VNetSpec) Parameters(ctx context.Context, existing *asonetworkv1.VirtualNetwork) (*asonetworkv1.VirtualNetwork, error) { +func (s *VNetSpec) Parameters(_ context.Context, existing *asonetworkv1.VirtualNetwork) (*asonetworkv1.VirtualNetwork, error) { vnet := existing if existing == nil { vnet = &asonetworkv1.VirtualNetwork{ diff --git a/azure/services/vmextensions/spec.go b/azure/services/vmextensions/spec.go index 28ba2338e4b..88ad1eab83a 100644 --- a/azure/services/vmextensions/spec.go +++ b/azure/services/vmextensions/spec.go @@ -49,7 +49,7 @@ func (s *VMExtensionSpec) OwnerResourceName() string { } // Parameters returns the parameters for the VM extension. -func (s *VMExtensionSpec) Parameters(ctx context.Context, existing interface{}) (interface{}, error) { +func (s *VMExtensionSpec) Parameters(_ context.Context, existing interface{}) (interface{}, error) { if existing != nil { _, ok := existing.(armcompute.VirtualMachineExtension) if !ok { diff --git a/azure/services/vmextensions/spec_test.go b/azure/services/vmextensions/spec_test.go index a7e16af276d..aca5ab970af 100644 --- a/azure/services/vmextensions/spec_test.go +++ b/azure/services/vmextensions/spec_test.go @@ -81,7 +81,6 @@ func TestParameters(t *testing.T) { }, } for _, tc := range testcases { - tc := tc t.Run(tc.name, func(t *testing.T) { g := NewWithT(t) t.Parallel() diff --git a/azure/services/vmextensions/vmextensions.go b/azure/services/vmextensions/vmextensions.go index 4fa0ef20ecb..ef0d3d8aa8c 100644 --- a/azure/services/vmextensions/vmextensions.go +++ b/azure/services/vmextensions/vmextensions.go @@ -103,6 +103,6 @@ func (s *Service) Delete(_ context.Context) error { } // IsManaged returns always returns true as CAPZ does not support BYO VM extension. -func (s *Service) IsManaged(ctx context.Context) (bool, error) { +func (s *Service) IsManaged(_ context.Context) (bool, error) { return true, nil } diff --git a/azure/services/vmextensions/vmextensions_test.go b/azure/services/vmextensions/vmextensions_test.go index 19eb9f63b48..3e83ba1e40b 100644 --- a/azure/services/vmextensions/vmextensions_test.go +++ b/azure/services/vmextensions/vmextensions_test.go @@ -136,7 +136,6 @@ func TestReconcileVMExtension(t *testing.T) { }, } for _, tc := range testcases { - tc := tc t.Run(tc.name, func(t *testing.T) { g := NewWithT(t) diff --git a/azure/services/vnetpeerings/spec.go b/azure/services/vnetpeerings/spec.go index 887b4e1e495..3e414189db1 100644 --- a/azure/services/vnetpeerings/spec.go +++ b/azure/services/vnetpeerings/spec.go @@ -56,7 +56,7 @@ func (s *VnetPeeringSpec) OwnerResourceName() string { } // Parameters returns the parameters for the virtual network peering. -func (s *VnetPeeringSpec) Parameters(ctx context.Context, existing interface{}) (params interface{}, err error) { +func (s *VnetPeeringSpec) Parameters(_ context.Context, existing interface{}) (params interface{}, err error) { if existing != nil { if _, ok := existing.(armnetwork.VirtualNetworkPeering); !ok { return nil, errors.Errorf("%T is not an armnetwork.VnetPeering", existing) diff --git a/azure/services/vnetpeerings/spec_test.go b/azure/services/vnetpeerings/spec_test.go index 6f6eb84a8a6..0594a5f41d1 100644 --- a/azure/services/vnetpeerings/spec_test.go +++ b/azure/services/vnetpeerings/spec_test.go @@ -98,7 +98,6 @@ func TestVnetPeeringSpec_Parameters(t *testing.T) { }, } for _, tc := range testCases { - tc := tc t.Run(tc.name, func(t *testing.T) { g := NewWithT(t) t.Parallel() diff --git a/azure/services/vnetpeerings/vnetpeerings.go b/azure/services/vnetpeerings/vnetpeerings.go index ce1283bf07a..2da81551b58 100644 --- a/azure/services/vnetpeerings/vnetpeerings.go +++ b/azure/services/vnetpeerings/vnetpeerings.go @@ -119,6 +119,6 @@ func (s *Service) Delete(ctx context.Context) error { } // IsManaged returns always returns true as CAPZ does not support BYO VNet peering. -func (s *Service) IsManaged(ctx context.Context) (bool, error) { +func (s *Service) IsManaged(_ context.Context) (bool, error) { return true, nil } diff --git a/azure/services/vnetpeerings/vnetpeerings_test.go b/azure/services/vnetpeerings/vnetpeerings_test.go index 92d1603d705..442b6ffdd23 100644 --- a/azure/services/vnetpeerings/vnetpeerings_test.go +++ b/azure/services/vnetpeerings/vnetpeerings_test.go @@ -241,7 +241,6 @@ func TestReconcileVnetPeerings(t *testing.T) { } for _, tc := range testcases { - tc := tc t.Run(tc.name, func(t *testing.T) { g := NewWithT(t) @@ -394,7 +393,6 @@ func TestDeleteVnetPeerings(t *testing.T) { } for _, tc := range testcases { - tc := tc t.Run(tc.name, func(t *testing.T) { g := NewWithT(t) diff --git a/azure/types_test.go b/azure/types_test.go index 28eb18b167f..fb19bb18824 100644 --- a/azure/types_test.go +++ b/azure/types_test.go @@ -128,7 +128,6 @@ func TestVMSS_HasModelChanges(t *testing.T) { } for _, c := range cases { - c := c t.Run(c.Name, func(t *testing.T) { l, r := c.Factory() g := NewWithT(t) diff --git a/controllers/agentpooladopt_controller.go b/controllers/agentpooladopt_controller.go index 258b18c7cf3..23726491d10 100644 --- a/controllers/agentpooladopt_controller.go +++ b/controllers/agentpooladopt_controller.go @@ -43,7 +43,7 @@ type AgentPoolAdoptReconciler struct { } // SetupWithManager sets up the controller with the Manager. -func (r *AgentPoolAdoptReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, options controller.Options) error { +func (r *AgentPoolAdoptReconciler) SetupWithManager(_ context.Context, mgr ctrl.Manager, options controller.Options) error { _, err := ctrl.NewControllerManagedBy(mgr). WithOptions(options). For(&asocontainerservicev1.ManagedClustersAgentPool{}). diff --git a/controllers/asosecret_controller.go b/controllers/asosecret_controller.go index a3cb01ff8dd..143b0bc9e78 100644 --- a/controllers/asosecret_controller.go +++ b/controllers/asosecret_controller.go @@ -140,12 +140,10 @@ func (asos *ASOSecretReconciler) Reconcile(ctx context.Context, req ctrl.Request fmt.Sprintf("AzureManagedControlPlane object %s/%s not found", req.Namespace, req.Name)) log.Info("object was not found") return reconcile.Result{}, nil - } else { - return reconcile.Result{}, err } - } else { - log = log.WithValues("AzureManagedControlPlane", req.Name) + return reconcile.Result{}, err } + log = log.WithValues("AzureManagedControlPlane", req.Name) } var clusterIdentity *corev1.ObjectReference diff --git a/controllers/asosecret_controller_test.go b/controllers/asosecret_controller_test.go index 2d22fa44779..bea1a9f7aba 100644 --- a/controllers/asosecret_controller_test.go +++ b/controllers/asosecret_controller_test.go @@ -38,10 +38,10 @@ import ( ) func TestASOSecretReconcile(t *testing.T) { - os.Setenv("AZURE_CLIENT_ID", "fooClient") - os.Setenv("AZURE_CLIENT_SECRET", "fooSecret") - os.Setenv("AZURE_TENANT_ID", "fooTenant") - os.Setenv("AZURE_SUBSCRIPTION_ID", "fooSubscription") + os.Setenv("AZURE_CLIENT_ID", "fooClient") //nolint:tenv // we want to use os.Setenv here instead of t.Setenv + os.Setenv("AZURE_CLIENT_SECRET", "fooSecret") //nolint:tenv // we want to use os.Setenv here instead of t.Setenv + os.Setenv("AZURE_TENANT_ID", "fooTenant") //nolint:tenv // we want to use os.Setenv here instead of t.Setenv + os.Setenv("AZURE_SUBSCRIPTION_ID", "fooSubscription") //nolint:tenv // we want to use os.Setenv here instead of t.Setenv scheme := runtime.NewScheme() _ = clusterv1.AddToScheme(scheme) diff --git a/controllers/azurecluster_reconciler_test.go b/controllers/azurecluster_reconciler_test.go index dbafeecd9b9..2c0e31e6082 100644 --- a/controllers/azurecluster_reconciler_test.go +++ b/controllers/azurecluster_reconciler_test.go @@ -70,7 +70,6 @@ func TestAzureClusterServiceReconcile(t *testing.T) { } for name, tc := range cases { - tc := tc t.Run(name, func(t *testing.T) { g := NewWithT(t) @@ -138,7 +137,6 @@ func TestAzureClusterServicePause(t *testing.T) { } for name, tc := range cases { - tc := tc t.Run(name, func(t *testing.T) { g := NewWithT(t) @@ -329,7 +327,6 @@ func TestAzureClusterServiceDelete(t *testing.T) { } for name, tc := range cases { - tc := tc t.Run(name, func(t *testing.T) { g := NewWithT(t) diff --git a/controllers/azurejson_machine_controller_test.go b/controllers/azurejson_machine_controller_test.go index 46f7600c3ca..5a1e32e8faa 100644 --- a/controllers/azurejson_machine_controller_test.go +++ b/controllers/azurejson_machine_controller_test.go @@ -65,7 +65,6 @@ func TestUnclonedMachinesPredicate(t *testing.T) { } for name, tc := range cases { - tc := tc t.Run(name, func(t *testing.T) { t.Parallel() machine := &infrav1.AzureMachine{ @@ -265,7 +264,6 @@ func newScheme() (*runtime.Scheme, error) { corev1.AddToScheme, } for _, fn := range schemeFn { - fn := fn if err := fn(scheme); err != nil { return nil, err } diff --git a/controllers/azuremachine_reconciler_test.go b/controllers/azuremachine_reconciler_test.go index 576f4183871..bd4abb8de3e 100644 --- a/controllers/azuremachine_reconciler_test.go +++ b/controllers/azuremachine_reconciler_test.go @@ -60,7 +60,6 @@ func TestAzureMachineServiceReconcile(t *testing.T) { } for name, tc := range cases { - tc := tc t.Run(name, func(t *testing.T) { g := NewWithT(t) @@ -136,7 +135,6 @@ func TestAzureMachineServicePause(t *testing.T) { } for name, tc := range cases { - tc := tc t.Run(name, func(t *testing.T) { g := NewWithT(t) @@ -201,7 +199,6 @@ func TestAzureMachineServiceDelete(t *testing.T) { } for name, tc := range cases { - tc := tc t.Run(name, func(t *testing.T) { g := NewWithT(t) diff --git a/controllers/azuremanagedcontrolplane_reconciler_test.go b/controllers/azuremanagedcontrolplane_reconciler_test.go index 22b878754fc..0a551eab721 100644 --- a/controllers/azuremanagedcontrolplane_reconciler_test.go +++ b/controllers/azuremanagedcontrolplane_reconciler_test.go @@ -60,7 +60,6 @@ func TestAzureManagedControlPlaneServicePause(t *testing.T) { } for name, tc := range cases { - tc := tc t.Run(name, func(t *testing.T) { g := NewWithT(t) diff --git a/controllers/azuremanagedmachinepool_controller_test.go b/controllers/azuremanagedmachinepool_controller_test.go index df9303bedca..dfcfc7a5236 100644 --- a/controllers/azuremanagedmachinepool_controller_test.go +++ b/controllers/azuremanagedmachinepool_controller_test.go @@ -131,7 +131,6 @@ func TestAzureManagedMachinePoolReconcile(t *testing.T) { } for _, c := range cases { - c := c t.Run(c.name, func(t *testing.T) { var ( g = NewWithT(t) diff --git a/controllers/azuremanagedmachinepool_reconciler.go b/controllers/azuremanagedmachinepool_reconciler.go index fa75a72199f..da71c578a8c 100644 --- a/controllers/azuremanagedmachinepool_reconciler.go +++ b/controllers/azuremanagedmachinepool_reconciler.go @@ -134,7 +134,6 @@ func (s *azureManagedMachinePoolService) Reconcile(ctx context.Context) error { var match *armcompute.VirtualMachineScaleSet for _, ss := range vmss { - ss := ss if ss.Tags["poolName"] != nil && *ss.Tags["poolName"] == agentPoolName { match = &ss break diff --git a/controllers/azuremanagedmachinepool_reconciler_test.go b/controllers/azuremanagedmachinepool_reconciler_test.go index 4533fba3947..60e000d6a42 100644 --- a/controllers/azuremanagedmachinepool_reconciler_test.go +++ b/controllers/azuremanagedmachinepool_reconciler_test.go @@ -60,7 +60,6 @@ func TestIsAgentPoolVMSSNotFoundError(t *testing.T) { } for _, c := range cases { - c := c t.Run(c.Name, func(t *testing.T) { t.Parallel() g := gomega.NewWithT(t) @@ -98,7 +97,6 @@ func TestAzureManagedMachinePoolServicePause(t *testing.T) { } for name, tc := range cases { - tc := tc t.Run(name, func(t *testing.T) { g := gomega.NewWithT(t) diff --git a/controllers/helpers.go b/controllers/helpers.go index a0b37455c75..9ecd9c3301f 100644 --- a/controllers/helpers.go +++ b/controllers/helpers.go @@ -89,7 +89,7 @@ type ( // AzureClusterToAzureMachinesMapper creates a mapping handler to transform AzureClusters into AzureMachines. The transform // requires AzureCluster to map to the owning Cluster, then from the Cluster, collect the Machines belonging to the cluster, // then finally projecting the infrastructure reference to the AzureMachine. -func AzureClusterToAzureMachinesMapper(ctx context.Context, c client.Client, obj runtime.Object, scheme *runtime.Scheme, log logr.Logger) (handler.MapFunc, error) { +func AzureClusterToAzureMachinesMapper(_ context.Context, c client.Client, obj runtime.Object, scheme *runtime.Scheme, log logr.Logger) (handler.MapFunc, error) { gvk, err := apiutil.GVKForObject(obj, scheme) if err != nil { return nil, errors.Wrap(err, "failed to find GVK for AzureMachine") @@ -705,7 +705,7 @@ func RemoveClusterIdentityFinalizer(ctx context.Context, c client.Client, object // MachinePoolToInfrastructureMapFunc returns a handler.MapFunc that watches for // MachinePool events and returns reconciliation requests for an infrastructure provider object. func MachinePoolToInfrastructureMapFunc(gvk schema.GroupVersionKind, log logr.Logger) handler.MapFunc { - return func(ctx context.Context, o client.Object) []reconcile.Request { + return func(_ context.Context, o client.Object) []reconcile.Request { m, ok := o.(*expv1.MachinePool) if !ok { log.V(4).Info("attempt to map incorrect type", "type", fmt.Sprintf("%T", o)) @@ -736,7 +736,7 @@ func MachinePoolToInfrastructureMapFunc(gvk schema.GroupVersionKind, log logr.Lo // AzureManagedMachinePools. The transform requires AzureManagedCluster to map to the owning Cluster, then from the // Cluster, collect the MachinePools belonging to the cluster, then finally projecting the infrastructure reference // to the AzureManagedMachinePools. -func AzureManagedClusterToAzureManagedMachinePoolsMapper(ctx context.Context, c client.Client, scheme *runtime.Scheme, log logr.Logger) (handler.MapFunc, error) { +func AzureManagedClusterToAzureManagedMachinePoolsMapper(_ context.Context, c client.Client, scheme *runtime.Scheme, log logr.Logger) (handler.MapFunc, error) { gvk, err := apiutil.GVKForObject(new(infrav1.AzureManagedMachinePool), scheme) if err != nil { return nil, errors.Wrap(err, "failed to find GVK for AzureManagedMachinePool") @@ -789,7 +789,7 @@ func AzureManagedClusterToAzureManagedMachinePoolsMapper(ctx context.Context, c // AzureManagedMachinePools. The transform requires AzureManagedControlPlane to map to the owning Cluster, then from the // Cluster, collect the MachinePools belonging to the cluster, then finally projecting the infrastructure reference // to the AzureManagedMachinePools. -func AzureManagedControlPlaneToAzureManagedMachinePoolsMapper(ctx context.Context, c client.Client, scheme *runtime.Scheme, log logr.Logger) (handler.MapFunc, error) { +func AzureManagedControlPlaneToAzureManagedMachinePoolsMapper(_ context.Context, c client.Client, scheme *runtime.Scheme, log logr.Logger) (handler.MapFunc, error) { gvk, err := apiutil.GVKForObject(new(infrav1.AzureManagedMachinePool), scheme) if err != nil { return nil, errors.Wrap(err, "failed to find GVK for AzureManagedMachinePool") @@ -841,7 +841,7 @@ func AzureManagedControlPlaneToAzureManagedMachinePoolsMapper(ctx context.Contex // AzureManagedClusterToAzureManagedControlPlaneMapper creates a mapping handler to transform AzureManagedClusters into // AzureManagedControlPlane. The transform requires AzureManagedCluster to map to the owning Cluster, then from the // Cluster, collect the control plane infrastructure reference. -func AzureManagedClusterToAzureManagedControlPlaneMapper(ctx context.Context, c client.Client, log logr.Logger) (handler.MapFunc, error) { +func AzureManagedClusterToAzureManagedControlPlaneMapper(_ context.Context, c client.Client, log logr.Logger) (handler.MapFunc, error) { return func(ctx context.Context, o client.Object) []ctrl.Request { ctx, cancel := context.WithTimeout(ctx, reconciler.DefaultMappingTimeout) defer cancel() @@ -890,7 +890,7 @@ func AzureManagedClusterToAzureManagedControlPlaneMapper(ctx context.Context, c // AzureManagedControlPlaneToAzureManagedClusterMapper creates a mapping handler to transform AzureManagedClusters into // AzureManagedControlPlane. The transform requires AzureManagedCluster to map to the owning Cluster, then from the // Cluster, collect the control plane infrastructure reference. -func AzureManagedControlPlaneToAzureManagedClusterMapper(ctx context.Context, c client.Client, log logr.Logger) (handler.MapFunc, error) { +func AzureManagedControlPlaneToAzureManagedClusterMapper(_ context.Context, c client.Client, log logr.Logger) (handler.MapFunc, error) { return func(ctx context.Context, o client.Object) []ctrl.Request { ctx, cancel := context.WithTimeout(ctx, reconciler.DefaultMappingTimeout) defer cancel() @@ -938,7 +938,7 @@ func AzureManagedControlPlaneToAzureManagedClusterMapper(ctx context.Context, c // MachinePoolToAzureManagedControlPlaneMapFunc returns a handler.MapFunc that watches for // MachinePool events and returns reconciliation requests for a control plane object. -func MachinePoolToAzureManagedControlPlaneMapFunc(ctx context.Context, c client.Client, gvk schema.GroupVersionKind, log logr.Logger) handler.MapFunc { +func MachinePoolToAzureManagedControlPlaneMapFunc(_ context.Context, c client.Client, gvk schema.GroupVersionKind, log logr.Logger) handler.MapFunc { return func(ctx context.Context, o client.Object) []reconcile.Request { ctx, cancel := context.WithTimeout(ctx, reconciler.DefaultMappingTimeout) defer cancel() @@ -1065,9 +1065,9 @@ func ClusterUpdatePauseChange(logger logr.Logger) predicate.Funcs { log.V(6).Info("Cluster paused status remained the same, blocking further processing") return false }, - CreateFunc: func(e event.CreateEvent) bool { return false }, - DeleteFunc: func(e event.DeleteEvent) bool { return false }, - GenericFunc: func(e event.GenericEvent) bool { return false }, + CreateFunc: func(_ event.CreateEvent) bool { return false }, + DeleteFunc: func(_ event.DeleteEvent) bool { return false }, + GenericFunc: func(_ event.GenericEvent) bool { return false }, } } diff --git a/controllers/helpers_test.go b/controllers/helpers_test.go index 2be26f5a7a6..b3ec56acca9 100644 --- a/controllers/helpers_test.go +++ b/controllers/helpers_test.go @@ -164,9 +164,9 @@ func TestGetCloudProviderConfig(t *testing.T) { }, } - os.Setenv("AZURE_CLIENT_ID", "fooClient") - os.Setenv("AZURE_CLIENT_SECRET", "fooSecret") - os.Setenv("AZURE_TENANT_ID", "fooTenant") + os.Setenv("AZURE_CLIENT_ID", "fooClient") //nolint:tenv // we want to use os.Setenv here instead of t.Setenv + os.Setenv("AZURE_CLIENT_SECRET", "fooSecret") //nolint:tenv // we want to use os.Setenv here instead of t.Setenv + os.Setenv("AZURE_TENANT_ID", "fooTenant") //nolint:tenv // we want to use os.Setenv here instead of t.Setenv for name, tc := range cases { t.Run(name, func(t *testing.T) { @@ -1345,7 +1345,6 @@ func Test_ManagedMachinePoolToInfrastructureMapFunc(t *testing.T) { } for _, c := range cases { - c := c t.Run(c.Name, func(t *testing.T) { g := NewWithT(t) @@ -1556,7 +1555,6 @@ func TestClusterPauseChangeAndInfrastructureReady(t *testing.T) { } for _, test := range tests { - test := test t.Run(test.name, func(t *testing.T) { t.Parallel() p := ClusterPauseChangeAndInfrastructureReady(logr.New(nil)) diff --git a/controllers/managedclusteradopt_controller.go b/controllers/managedclusteradopt_controller.go index 29f3ef1b23e..e6cb2782e32 100644 --- a/controllers/managedclusteradopt_controller.go +++ b/controllers/managedclusteradopt_controller.go @@ -47,7 +47,7 @@ type ManagedClusterAdoptReconciler struct { } // SetupWithManager sets up the controller with the Manager. -func (r *ManagedClusterAdoptReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, options controller.Options) error { +func (r *ManagedClusterAdoptReconciler) SetupWithManager(_ context.Context, mgr ctrl.Manager, options controller.Options) error { _, err := ctrl.NewControllerManagedBy(mgr). WithOptions(options). For(&asocontainerservicev1.ManagedCluster{}). diff --git a/controllers/resource_reconciler.go b/controllers/resource_reconciler.go index 36a29952e0c..cabfbe7a8b7 100644 --- a/controllers/resource_reconciler.go +++ b/controllers/resource_reconciler.go @@ -63,7 +63,10 @@ func (r *ResourceReconciler) Reconcile(ctx context.Context) error { defer done() log.V(4).Info("reconciling resources") - var newResourceStatuses []infrav1alpha.ResourceStatus + // TODO (nojnhuh) : is there a functional diff between + // var newResourceStatuses []infrav1alpha.ResourceStatus and newResourceStatuses := make([]infrav1alpha.ResourceStatus,0) + // in the scenario below? + var newResourceStatuses []infrav1alpha.ResourceStatus //nolint:prealloc // leaving it as is for now for _, spec := range r.resources { gvk := spec.GroupVersionKind() diff --git a/exp/api/v1beta1/azuremachinepool_test.go b/exp/api/v1beta1/azuremachinepool_test.go index 05cd2a16498..12bed0d3018 100644 --- a/exp/api/v1beta1/azuremachinepool_test.go +++ b/exp/api/v1beta1/azuremachinepool_test.go @@ -245,7 +245,6 @@ func TestAzureMachinePool_Validate(t *testing.T) { } for _, c := range cases { - c := c t.Run(c.Name, func(t *testing.T) { // Don't add t.Parallel() here or the test will fail. g := gomega.NewGomegaWithT(t) diff --git a/exp/api/v1beta1/azuremachinepool_webhook.go b/exp/api/v1beta1/azuremachinepool_webhook.go index 335080b9996..886bfa839c1 100644 --- a/exp/api/v1beta1/azuremachinepool_webhook.go +++ b/exp/api/v1beta1/azuremachinepool_webhook.go @@ -57,7 +57,7 @@ type azureMachinePoolWebhook struct { } // Default implements webhook.Defaulter so a webhook will be registered for the type. -func (ampw *azureMachinePoolWebhook) Default(ctx context.Context, obj runtime.Object) error { +func (ampw *azureMachinePoolWebhook) Default(_ context.Context, obj runtime.Object) error { amp, ok := obj.(*AzureMachinePool) if !ok { return apierrors.NewBadRequest("expected an AzureMachinePool") @@ -68,7 +68,7 @@ func (ampw *azureMachinePoolWebhook) Default(ctx context.Context, obj runtime.Ob // +kubebuilder:webhook:verbs=create;update,path=/validate-infrastructure-cluster-x-k8s-io-v1beta1-azuremachinepool,mutating=false,failurePolicy=fail,groups=infrastructure.cluster.x-k8s.io,resources=azuremachinepools,versions=v1beta1,name=validation.azuremachinepool.infrastructure.cluster.x-k8s.io,sideEffects=None,admissionReviewVersions=v1;v1beta1 // ValidateCreate implements webhook.Validator so a webhook will be registered for the type. -func (ampw *azureMachinePoolWebhook) ValidateCreate(ctx context.Context, obj runtime.Object) (admission.Warnings, error) { +func (ampw *azureMachinePoolWebhook) ValidateCreate(_ context.Context, obj runtime.Object) (admission.Warnings, error) { amp, ok := obj.(*AzureMachinePool) if !ok { return nil, apierrors.NewBadRequest("expected an AzureMachinePool") @@ -85,7 +85,7 @@ func (ampw *azureMachinePoolWebhook) ValidateCreate(ctx context.Context, obj run } // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type. -func (ampw *azureMachinePoolWebhook) ValidateUpdate(ctx context.Context, oldObj, newObj runtime.Object) (admission.Warnings, error) { +func (ampw *azureMachinePoolWebhook) ValidateUpdate(_ context.Context, oldObj, newObj runtime.Object) (admission.Warnings, error) { amp, ok := newObj.(*AzureMachinePool) if !ok { return nil, apierrors.NewBadRequest("expected an AzureMachinePool") @@ -94,7 +94,7 @@ func (ampw *azureMachinePoolWebhook) ValidateUpdate(ctx context.Context, oldObj, } // ValidateDelete implements webhook.Validator so a webhook will be registered for the type. -func (ampw *azureMachinePoolWebhook) ValidateDelete(ctx context.Context, obj runtime.Object) (admission.Warnings, error) { +func (ampw *azureMachinePoolWebhook) ValidateDelete(_ context.Context, _ runtime.Object) (admission.Warnings, error) { return nil, nil } diff --git a/exp/api/v1beta1/azuremachinepool_webhook_test.go b/exp/api/v1beta1/azuremachinepool_webhook_test.go index fcde1984388..e1324deee98 100644 --- a/exp/api/v1beta1/azuremachinepool_webhook_test.go +++ b/exp/api/v1beta1/azuremachinepool_webhook_test.go @@ -625,10 +625,10 @@ func createMachinePoolWithDiagnostics(diagnosticsType infrav1.BootDiagnosticsSto } } -func createMachinePoolWithUserAssignedIdentity(providerIds []string) *AzureMachinePool { - userAssignedIdentities := make([]infrav1.UserAssignedIdentity, len(providerIds)) +func createMachinePoolWithUserAssignedIdentity(providerIDs []string) *AzureMachinePool { + userAssignedIdentities := make([]infrav1.UserAssignedIdentity, len(providerIDs)) - for _, providerID := range providerIds { + for _, providerID := range providerIDs { userAssignedIdentities = append(userAssignedIdentities, infrav1.UserAssignedIdentity{ ProviderID: providerID, }) diff --git a/exp/controllers/azuremachinepool_reconciler_test.go b/exp/controllers/azuremachinepool_reconciler_test.go index 47a35099d3f..ccd2fdceb21 100644 --- a/exp/controllers/azuremachinepool_reconciler_test.go +++ b/exp/controllers/azuremachinepool_reconciler_test.go @@ -62,7 +62,6 @@ func TestAzureMachinePoolServiceReconcile(t *testing.T) { } for name, tc := range cases { - tc := tc t.Run(name, func(t *testing.T) { g := NewWithT(t) @@ -140,7 +139,6 @@ func TestAzureMachinePoolServicePause(t *testing.T) { } for name, tc := range cases { - tc := tc t.Run(name, func(t *testing.T) { g := NewWithT(t) @@ -205,7 +203,6 @@ func TestAzureMachinePoolServiceDelete(t *testing.T) { } for name, tc := range cases { - tc := tc t.Run(name, func(t *testing.T) { g := NewWithT(t) diff --git a/exp/controllers/azuremachinepoolmachine_controller_test.go b/exp/controllers/azuremachinepoolmachine_controller_test.go index 77c7c9e8b2d..96239ef405e 100644 --- a/exp/controllers/azuremachinepoolmachine_controller_test.go +++ b/exp/controllers/azuremachinepoolmachine_controller_test.go @@ -111,7 +111,6 @@ func TestAzureMachinePoolMachineReconciler_Reconcile(t *testing.T) { } for _, c := range cases { - c := c t.Run(c.Name, func(t *testing.T) { var ( g = NewWithT(t) diff --git a/exp/controllers/helpers.go b/exp/controllers/helpers.go index 93665f33032..d95652c94b4 100644 --- a/exp/controllers/helpers.go +++ b/exp/controllers/helpers.go @@ -47,7 +47,7 @@ import ( // AzureClusterToAzureMachinePoolsMapper creates a mapping handler to transform AzureClusters into AzureMachinePools. The transform // requires AzureCluster to map to the owning Cluster, then from the Cluster, collect the MachinePools belonging to the cluster, // then finally projecting the infrastructure reference to the AzureMachinePool. -func AzureClusterToAzureMachinePoolsMapper(ctx context.Context, c client.Client, scheme *runtime.Scheme, log logr.Logger) (handler.MapFunc, error) { +func AzureClusterToAzureMachinePoolsMapper(_ context.Context, c client.Client, scheme *runtime.Scheme, log logr.Logger) (handler.MapFunc, error) { gvk, err := apiutil.GVKForObject(new(infrav1exp.AzureMachinePool), scheme) if err != nil { return nil, errors.Wrap(err, "failed to find GVK for AzureMachinePool") @@ -100,7 +100,7 @@ func AzureClusterToAzureMachinePoolsMapper(ctx context.Context, c client.Client, // AzureManagedControlPlaneToAzureMachinePoolsMapper creates a mapping handler to transform AzureManagedControlPlanes into AzureMachinePools. The transform // requires AzureManagedControlPlane to map to the owning Cluster, then from the Cluster, collect the MachinePools belonging to the cluster, // then finally projecting the infrastructure reference to the AzureMachinePool. -func AzureManagedControlPlaneToAzureMachinePoolsMapper(ctx context.Context, c client.Client, scheme *runtime.Scheme, log logr.Logger) (handler.MapFunc, error) { +func AzureManagedControlPlaneToAzureMachinePoolsMapper(_ context.Context, c client.Client, scheme *runtime.Scheme, log logr.Logger) (handler.MapFunc, error) { gvk, err := apiutil.GVKForObject(new(infrav1exp.AzureMachinePool), scheme) if err != nil { return nil, errors.Wrap(err, "failed to find GVK for AzureMachinePool") @@ -152,7 +152,7 @@ func AzureManagedControlPlaneToAzureMachinePoolsMapper(ctx context.Context, c cl // AzureMachinePoolMachineMapper creates a mapping handler to transform AzureMachinePoolMachine to AzureMachinePools. func AzureMachinePoolMachineMapper(scheme *runtime.Scheme, log logr.Logger) handler.MapFunc { - return func(ctx context.Context, o client.Object) []ctrl.Request { + return func(_ context.Context, o client.Object) []ctrl.Request { gvk, err := apiutil.GVKForObject(new(infrav1exp.AzureMachinePool), scheme) if err != nil { log.Error(errors.WithStack(err), "failed to find GVK for AzureMachinePool") @@ -196,7 +196,7 @@ func AzureMachinePoolMachineMapper(scheme *runtime.Scheme, log logr.Logger) hand // MachinePoolToInfrastructureMapFunc returns a handler.MapFunc that watches for // MachinePool events and returns reconciliation requests for an infrastructure provider object. func MachinePoolToInfrastructureMapFunc(gvk schema.GroupVersionKind, log logr.Logger) handler.MapFunc { - return func(ctx context.Context, o client.Object) []reconcile.Request { + return func(_ context.Context, o client.Object) []reconcile.Request { m, ok := o.(*expv1.MachinePool) if !ok { log.V(4).Info("attempt to map incorrect type", "type", fmt.Sprintf("%T", o)) @@ -225,7 +225,7 @@ func MachinePoolToInfrastructureMapFunc(gvk schema.GroupVersionKind, log logr.Lo // AzureClusterToAzureMachinePoolsFunc is a handler.MapFunc to be used to enqueue // requests for reconciliation of AzureMachinePools. -func AzureClusterToAzureMachinePoolsFunc(ctx context.Context, c client.Client, log logr.Logger) handler.MapFunc { +func AzureClusterToAzureMachinePoolsFunc(_ context.Context, c client.Client, log logr.Logger) handler.MapFunc { return func(ctx context.Context, o client.Object) []reconcile.Request { ctx, cancel := context.WithTimeout(ctx, reconciler.DefaultMappingTimeout) defer cancel() @@ -270,7 +270,7 @@ func AzureClusterToAzureMachinePoolsFunc(ctx context.Context, c client.Client, l // AzureMachinePoolToAzureMachinePoolMachines maps an AzureMachinePool to its child AzureMachinePoolMachines through // Cluster and MachinePool labels. -func AzureMachinePoolToAzureMachinePoolMachines(ctx context.Context, c client.Client, log logr.Logger) handler.MapFunc { +func AzureMachinePoolToAzureMachinePoolMachines(_ context.Context, c client.Client, log logr.Logger) handler.MapFunc { return func(ctx context.Context, o client.Object) []reconcile.Request { ctx, cancel := context.WithTimeout(ctx, reconciler.DefaultMappingTimeout) defer cancel() @@ -333,9 +333,9 @@ func MachinePoolModelHasChanged(logger logr.Logger) predicate.Funcs { //} return shouldUpdate }, - CreateFunc: func(e event.CreateEvent) bool { return false }, - DeleteFunc: func(e event.DeleteEvent) bool { return false }, - GenericFunc: func(e event.GenericEvent) bool { return false }, + CreateFunc: func(_ event.CreateEvent) bool { return false }, + DeleteFunc: func(_ event.DeleteEvent) bool { return false }, + GenericFunc: func(_ event.GenericEvent) bool { return false }, } } @@ -366,14 +366,14 @@ func MachinePoolMachineHasStateOrVersionChange(logger logr.Logger) predicate.Fun } return shouldUpdate }, - CreateFunc: func(e event.CreateEvent) bool { return false }, - DeleteFunc: func(e event.DeleteEvent) bool { return false }, - GenericFunc: func(e event.GenericEvent) bool { return false }, + CreateFunc: func(_ event.CreateEvent) bool { return false }, + DeleteFunc: func(_ event.DeleteEvent) bool { return false }, + GenericFunc: func(_ event.GenericEvent) bool { return false }, } } // BootstrapConfigToInfrastructureMapFunc returns a handler.ToRequestsFunc that watches for Config events and returns. -func BootstrapConfigToInfrastructureMapFunc(ctx context.Context, c client.Client, log logr.Logger) handler.MapFunc { +func BootstrapConfigToInfrastructureMapFunc(_ context.Context, c client.Client, log logr.Logger) handler.MapFunc { return func(ctx context.Context, o client.Object) []reconcile.Request { ctx, cancel := context.WithTimeout(ctx, reconciler.DefaultMappingTimeout) defer cancel() diff --git a/exp/controllers/helpers_test.go b/exp/controllers/helpers_test.go index 49822f09779..92f7d5c7e73 100644 --- a/exp/controllers/helpers_test.go +++ b/exp/controllers/helpers_test.go @@ -134,7 +134,6 @@ func Test_MachinePoolToInfrastructureMapFunc(t *testing.T) { } for _, c := range cases { - c := c t.Run(c.Name, func(t *testing.T) { g := NewWithT(t) @@ -284,7 +283,6 @@ func Test_azureClusterToAzureMachinePoolsFunc(t *testing.T) { } for _, c := range cases { - c := c t.Run(c.Name, func(t *testing.T) { t.Parallel() g := NewGomegaWithT(t) diff --git a/internal/test/matchers/gomega/matchers_test.go b/internal/test/matchers/gomega/matchers_test.go index 469e8f01053..981b601bcbc 100644 --- a/internal/test/matchers/gomega/matchers_test.go +++ b/internal/test/matchers/gomega/matchers_test.go @@ -79,7 +79,6 @@ func TestLogContains(t *testing.T) { } for _, c := range cases { - c := c t.Run(c.Name, func(t *testing.T) { t.Parallel() g := gomega.NewWithT(t) diff --git a/internal/test/record/logger.go b/internal/test/record/logger.go index 7b7a2b4a3f0..186370be7dc 100644 --- a/internal/test/record/logger.go +++ b/internal/test/record/logger.go @@ -153,12 +153,12 @@ func (l *Logger) Init(info logr.RuntimeInfo) { } // Enabled is always enabled. -func (l *Logger) Enabled(v int) bool { +func (l *Logger) Enabled(_ int) bool { return true } // Info logs a non-error message with the given key/value pairs as context. -func (l *Logger) Info(level int, msg string, kvs ...interface{}) { +func (l *Logger) Info(_ int, msg string, kvs ...interface{}) { values := copySlice(l.values) values = append(values, kvs...) values = append(values, "msg", msg) @@ -183,7 +183,7 @@ func (l *Logger) V(level int) logr.LogSink { // WithName adds a new element to the logger's name. func (l *Logger) WithName(name string) logr.LogSink { nl := l.clone() - if len(l.prefix) > 0 { + if l.prefix != "" { nl.prefix = l.prefix + "/" } nl.prefix += name diff --git a/pkg/coalescing/reconciler_test.go b/pkg/coalescing/reconciler_test.go index cc58dfc642b..eb29be77024 100644 --- a/pkg/coalescing/reconciler_test.go +++ b/pkg/coalescing/reconciler_test.go @@ -86,7 +86,6 @@ func TestCoalescingReconciler_Reconcile(t *testing.T) { } for _, c := range cases { - c := c t.Run(c.Name, func(t *testing.T) { g := NewWithT(t) mockCtrl := gomock.NewController(t) diff --git a/pkg/mutators/azureasomanagedcontrolplane.go b/pkg/mutators/azureasomanagedcontrolplane.go index 129cb1d75ee..8471341820a 100644 --- a/pkg/mutators/azureasomanagedcontrolplane.go +++ b/pkg/mutators/azureasomanagedcontrolplane.go @@ -81,7 +81,7 @@ func SetManagedClusterDefaults(ctrlClient client.Client, asoManagedControlPlane return err } - if err := setManagedClusterCredentials(ctx, cluster, managedClusterPath, managedCluster); err != nil { + if err := setManagedClusterCredentials(ctx, cluster, managedClusterPath, managedCluster); err != nil { //nolint:nolintlint // leave it as is return err } diff --git a/pkg/mutators/azureasomanagedmachinepool.go b/pkg/mutators/azureasomanagedmachinepool.go index 195f77f674b..d4b89ba040f 100644 --- a/pkg/mutators/azureasomanagedmachinepool.go +++ b/pkg/mutators/azureasomanagedmachinepool.go @@ -63,7 +63,7 @@ func SetAgentPoolDefaults(ctrlClient client.Client, machinePool *expv1.MachinePo return err } - if err := setAgentPoolCount(ctx, ctrlClient, machinePool, agentPoolPath, agentPool); err != nil { + if err := setAgentPoolCount(ctx, ctrlClient, machinePool, agentPoolPath, agentPool); err != nil { //nolint:nolintlint // leave it as is return err } diff --git a/test/e2e/aks_public_ip_prefix.go b/test/e2e/aks_public_ip_prefix.go index 9acb7ba0397..606008246d7 100644 --- a/test/e2e/aks_public_ip_prefix.go +++ b/test/e2e/aks_public_ip_prefix.go @@ -78,7 +78,7 @@ func AKSPublicIPPrefixSpec(ctx context.Context, inputGetter func() AKSPublicIPPr }, nil) Expect(err).NotTo(HaveOccurred()) var publicIPPrefix armnetwork.PublicIPPrefix - Eventually(func(g Gomega) { + Eventually(func(_ Gomega) { resp, err := poller.PollUntilDone(ctx, nil) Expect(err).NotTo(HaveOccurred()) publicIPPrefix = resp.PublicIPPrefix diff --git a/test/e2e/azure_logcollector.go b/test/e2e/azure_logcollector.go index 0227712504a..9f0fb5ad681 100644 --- a/test/e2e/azure_logcollector.go +++ b/test/e2e/azure_logcollector.go @@ -133,7 +133,7 @@ func (k AzureLogCollector) CollectMachinePoolLog(ctx context.Context, management // CollectInfrastructureLogs collects log from the infrastructure. // This is currently a no-op implementation to satisfy the LogCollector interface. -func (k AzureLogCollector) CollectInfrastructureLogs(ctx context.Context, managementClusterClient client.Client, c *clusterv1.Cluster, outputPath string) error { +func (k AzureLogCollector) CollectInfrastructureLogs(_ context.Context, _ client.Client, _ *clusterv1.Cluster, _ string) error { return nil } @@ -508,7 +508,7 @@ func writeBootLog(bootDiagnostics armcompute.RetrieveBootDiagnosticsDataResult, return errors.Wrap(err, "failed to create HTTP request") } resp, err := http.DefaultClient.Do(req) - if err != nil || resp.StatusCode != 200 { + if err != nil || resp.StatusCode != http.StatusOK { return errors.Wrap(err, "failed to get logs from serial console uri") } defer resp.Body.Close() diff --git a/test/e2e/cni.go b/test/e2e/cni.go index a0d236256af..e1d64e569ab 100644 --- a/test/e2e/cni.go +++ b/test/e2e/cni.go @@ -52,7 +52,7 @@ func EnsureCNI(ctx context.Context, input clusterctl.ApplyCustomClusterTemplateA } // InstallCNIManifest installs the CNI manifest provided by the user -func InstallCNIManifest(ctx context.Context, input clusterctl.ApplyCustomClusterTemplateAndWaitInput, cidrBlocks []string, hasWindows bool) { +func InstallCNIManifest(ctx context.Context, input clusterctl.ApplyCustomClusterTemplateAndWaitInput, cidrBlocks []string, hasWindows bool) { //nolint:revive // leaving unused cidrBlocks and hasWindows for understanding By("Installing a CNI plugin to the workload cluster") workloadCluster := input.ClusterProxy.GetWorkloadCluster(ctx, input.Namespace, input.ClusterName) diff --git a/test/e2e/helm.go b/test/e2e/helm.go index 15a0149eed2..bf38a138cf7 100644 --- a/test/e2e/helm.go +++ b/test/e2e/helm.go @@ -35,7 +35,7 @@ type HelmOptions struct { } // InstallHelmChart takes a Helm repo URL, a chart name, and release name, and creates a Helm release on the E2E workload cluster. -func InstallHelmChart(ctx context.Context, clusterProxy framework.ClusterProxy, namespace, repoURL, chartName, releaseName string, options *HelmOptions, version string) { +func InstallHelmChart(_ context.Context, clusterProxy framework.ClusterProxy, namespace, repoURL, chartName, releaseName string, options *HelmOptions, version string) { // Check that Helm v3 is installed helm, err := exec.LookPath("helm") Expect(err).NotTo(HaveOccurred(), "No helm binary found in PATH") diff --git a/test/e2e/helpers.go b/test/e2e/helpers.go index f91a432148d..c10105f682a 100644 --- a/test/e2e/helpers.go +++ b/test/e2e/helpers.go @@ -79,7 +79,7 @@ type deploymentsClientAdapter struct { } // Get fetches the deployment named by the key and updates the provided object. -func (c deploymentsClientAdapter) Get(ctx context.Context, key client.ObjectKey, obj client.Object, opts ...client.GetOption) error { +func (c deploymentsClientAdapter) Get(ctx context.Context, key client.ObjectKey, obj client.Object, _ ...client.GetOption) error { deployment, err := c.client.Get(ctx, key.Name, metav1.GetOptions{}) if deployObj, ok := obj.(*appsv1.Deployment); ok { deployment.DeepCopyInto(deployObj) @@ -149,7 +149,7 @@ type jobsClientAdapter struct { } // Get fetches the job named by the key and updates the provided object. -func (c jobsClientAdapter) Get(ctx context.Context, key client.ObjectKey, obj client.Object, opts ...client.GetOption) error { +func (c jobsClientAdapter) Get(ctx context.Context, key client.ObjectKey, obj client.Object, _ ...client.GetOption) error { job, err := c.client.Get(ctx, key.Name, metav1.GetOptions{}) if jobObj, ok := obj.(*batchv1.Job); ok { job.DeepCopyInto(jobObj) @@ -244,7 +244,7 @@ type servicesClientAdapter struct { } // Get fetches the service named by the key and updates the provided object. -func (c servicesClientAdapter) Get(ctx context.Context, key client.ObjectKey, obj client.Object, opts ...client.GetOption) error { +func (c servicesClientAdapter) Get(ctx context.Context, key client.ObjectKey, obj client.Object, _ ...client.GetOption) error { service, err := c.client.Get(ctx, key.Name, metav1.GetOptions{}) if serviceObj, ok := obj.(*corev1.Service); ok { service.DeepCopyInto(serviceObj) @@ -282,7 +282,7 @@ func WaitForDaemonset(ctx context.Context, input WaitForDaemonsetInput, interval } // WaitForDaemonsets retries during E2E until all daemonsets pods are all Running. -func WaitForDaemonsets(ctx context.Context, clusterProxy framework.ClusterProxy, specName string, intervals ...interface{}) { +func WaitForDaemonsets(ctx context.Context, clusterProxy framework.ClusterProxy, _ string, intervals ...interface{}) { Expect(clusterProxy).NotTo(BeNil()) cl := clusterProxy.GetClient() var dsList = &appsv1.DaemonSetList{} diff --git a/test/e2e/kubernetes/networkpolicy/networkpolicy.go b/test/e2e/kubernetes/networkpolicy/networkpolicy.go index 7a05cac61c8..2299e28d9b0 100644 --- a/test/e2e/kubernetes/networkpolicy/networkpolicy.go +++ b/test/e2e/kubernetes/networkpolicy/networkpolicy.go @@ -110,7 +110,7 @@ func CheckOutboundConnection(clientset *kubernetes.Clientset, config *restclient Expect(err).NotTo(HaveOccurred()) } -func ApplyNetworkPolicy(ctx context.Context, clientset *kubernetes.Clientset, nwpolicyName string, namespace string, nwpolicyFileName string, policyDir string) { +func ApplyNetworkPolicy(ctx context.Context, clientset *kubernetes.Clientset, _ string, namespace string, nwpolicyFileName string, policyDir string) { err := CreateNetworkPolicyFromFile(ctx, clientset, filepath.Join(policyDir, nwpolicyFileName), namespace) Expect(err).NotTo(HaveOccurred()) } diff --git a/test/e2e/kubernetes/windows/windows.go b/test/e2e/kubernetes/windows/windows.go index 0d0ee46aa3a..620d3e736cf 100644 --- a/test/e2e/kubernetes/windows/windows.go +++ b/test/e2e/kubernetes/windows/windows.go @@ -50,7 +50,7 @@ func (i *WindowsImage) GetImage(version OSVersion) string { return fmt.Sprintf("%s:%s", i.BaseImage, tag) } -func GetWindowsImage(testImage WindowsTestImages, version OSVersion) string { +func GetWindowsImage(_ WindowsTestImages, version OSVersion) string { httpd := WindowsImage{ BaseImage: "registry.k8s.io/e2e-test-images/httpd", Tags: map[OSVersion]string{ diff --git a/test/logger.go b/test/logger.go index aaccde8e902..6075e760a73 100644 --- a/test/logger.go +++ b/test/logger.go @@ -35,7 +35,7 @@ import ( "sigs.k8s.io/cluster-api-provider-azure/test/e2e" ) -func Fail(message string, callerSkip ...int) { +func Fail(message string, _ ...int) { panic(message) } diff --git a/util/cache/ttllru/ttllru_test.go b/util/cache/ttllru/ttllru_test.go index 3addb556b4b..dd7a7b52dc8 100644 --- a/util/cache/ttllru/ttllru_test.go +++ b/util/cache/ttllru/ttllru_test.go @@ -149,7 +149,6 @@ func TestCache_Get(t *testing.T) { } for _, c := range cases { - c := c t.Run(c.Name, func(t *testing.T) { g := NewWithT(t) mockCtrl := gomock.NewController(t) diff --git a/util/reconciler/defaults_test.go b/util/reconciler/defaults_test.go index 888f1f630aa..8d3c4b41922 100644 --- a/util/reconciler/defaults_test.go +++ b/util/reconciler/defaults_test.go @@ -49,7 +49,6 @@ func TestDefaultedLoopTimeout(t *testing.T) { } for _, c := range cases { - c := c t.Run(c.Name, func(t *testing.T) { t.Parallel() g := gomega.NewWithT(t) @@ -85,7 +84,6 @@ func TestDefaultedReconcilerRequeue(t *testing.T) { } for _, c := range cases { - c := c t.Run(c.Name, func(t *testing.T) { t.Parallel() g := gomega.NewWithT(t) @@ -121,7 +119,6 @@ func TestDefaultedAzureCallTimeout(t *testing.T) { } for _, c := range cases { - c := c t.Run(c.Name, func(t *testing.T) { t.Parallel() g := gomega.NewWithT(t) @@ -157,7 +154,6 @@ func TestDefaultedAzureServiceReconcileTimeout(t *testing.T) { } for _, c := range cases { - c := c t.Run(c.Name, func(t *testing.T) { t.Parallel() g := gomega.NewWithT(t) diff --git a/util/system/namespace_test.go b/util/system/namespace_test.go index d8b84bd2130..45618d2fd16 100644 --- a/util/system/namespace_test.go +++ b/util/system/namespace_test.go @@ -42,10 +42,9 @@ func TestGetNamespace(t *testing.T) { } for _, c := range cases { - c := c t.Run(c.Name, func(t *testing.T) { g := gomega.NewWithT(t) - os.Setenv(NamespaceEnvVarName, c.PodNamespace) + os.Setenv(NamespaceEnvVarName, c.PodNamespace) //nolint:tenv // leave it as is defer os.Unsetenv(NamespaceEnvVarName) g.Expect(GetManagerNamespace()).To(gomega.Equal(c.Expected)) }) diff --git a/util/tele/span_logger.go b/util/tele/span_logger.go index b65af5abffc..5cf7b72ba56 100644 --- a/util/tele/span_logger.go +++ b/util/tele/span_logger.go @@ -35,14 +35,14 @@ type spanLogSink struct { vals []interface{} } -func (*spanLogSink) Init(info logr.RuntimeInfo) { +func (*spanLogSink) Init(_ logr.RuntimeInfo) { } func (s *spanLogSink) End(opts ...trace.SpanEndOption) { s.Span.End(opts...) } -func (*spanLogSink) Enabled(v int) bool { +func (*spanLogSink) Enabled(_ int) bool { return true } @@ -70,7 +70,7 @@ func (s *spanLogSink) evtStr(evtType, msg string) string { ) } -func (s *spanLogSink) Info(level int, msg string, keysAndValues ...interface{}) { +func (s *spanLogSink) Info(_ int, msg string, keysAndValues ...interface{}) { attrs := s.kvsToAttrs(keysAndValues...) s.AddEvent( s.evtStr("INFO", msg),