lint fixes

Author: gargipanatula

go.mod

@@ -1,6 +1,6 @@
 module k8s.io/cloud-provider-aws
 
-go 1.23.0
+go 1.22.7
 
 toolchain go1.24.3
 

pkg/controllers/tagging/tagging_controller_test.go

@@ -271,4 +271,4 @@ func syncNodeStore(nodeinformer coreinformers.NodeInformer, f *fake.Clientset) e
 		newElems = append(newElems, &nodes.Items[i])
 	}
 	return nodeinformer.Informer().GetStore().Replace(newElems, "newRV")
-}
+}

pkg/providers/v1/aws.go

@@ -30,18 +30,18 @@ import (
 	"time"
 
 	"github.com/aws/aws-sdk-go-v2/aws"
-	awsConfig "github.com/aws/aws-sdk-go-v2/config"
 	"github.com/aws/aws-sdk-go-v2/aws/retry"
+	awsConfig "github.com/aws/aws-sdk-go-v2/config"
 	"github.com/aws/aws-sdk-go-v2/credentials/stscreds"
+	stscredsv2 "github.com/aws/aws-sdk-go-v2/credentials/stscreds"
 	"github.com/aws/aws-sdk-go-v2/feature/ec2/imds"
-	"github.com/aws/aws-sdk-go-v2/service/ec2"
 	"github.com/aws/aws-sdk-go-v2/service/autoscaling"
+	"github.com/aws/aws-sdk-go-v2/service/ec2"
 	ec2types "github.com/aws/aws-sdk-go-v2/service/ec2/types"
 	elb "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing"
 	elbtypes "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing/types"
 	elbv2 "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2"
 	elbv2types "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2/types"
-	stscredsv2 "github.com/aws/aws-sdk-go-v2/credentials/stscreds"
 	"github.com/aws/aws-sdk-go-v2/service/kms"
 	"github.com/aws/smithy-go"
 	"gopkg.in/gcfg.v1"
@@ -60,14 +60,14 @@ import (
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/client-go/tools/record"
 	cloudprovider "k8s.io/cloud-provider"
+	"k8s.io/cloud-provider-aws/pkg/services"
 	nodehelpers "k8s.io/cloud-provider/node/helpers"
 	servicehelpers "k8s.io/cloud-provider/service/helpers"
 	cloudvolume "k8s.io/cloud-provider/volume"
 	volerr "k8s.io/cloud-provider/volume/errors"
 	volumehelpers "k8s.io/cloud-provider/volume/helpers"
 	"k8s.io/klog/v2"
 	netutils "k8s.io/utils/net"
-	"k8s.io/cloud-provider-aws/pkg/services"
 )
 
 // NLBHealthCheckRuleDescription is the comment used on a security group rule to
@@ -796,7 +796,6 @@ func newAWSSDKProvider(creds aws.CredentialsProvider, cfg *CloudConfig) *awsSDKP
 	}
 }
 
-
 // Get a CrossRequestRetryDelay, scoped to the region, not to the request.
 // This means that when we hit a limit on a call, we will delay _all_ calls to the API.
 // We do this to protect the AWS account from becoming overloaded and effectively locked.
@@ -1374,15 +1373,15 @@ func newAWSCloud(cfg CloudConfig, awsServices Services, credentials *stscreds.As
 	}
 
 	awsCloud := &Cloud{
-		ec2:               ec2,
-		elb:               elb,
-		elbv2:             elbv2,
-		asg:			   asg,
-		metadata:          metadata,
-		kms:               kms,
-		cfg:               &cfg,
-		region:            regionName,
-		
+		ec2:      ec2,
+		elb:      elb,
+		elbv2:    elbv2,
+		asg:      asg,
+		metadata: metadata,
+		kms:      kms,
+		cfg:      &cfg,
+		region:   regionName,
+
 		attaching:        make(map[types.NodeName]map[mountDevice]EBSVolumeID),
 		deviceAllocators: make(map[types.NodeName]DeviceAllocator),
 	}

pkg/providers/v1/aws_sdk_client_middleware.go

@@ -8,8 +8,8 @@ import (
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/aws/middleware"
 	"github.com/aws/aws-sdk-go-v2/feature/ec2/imds"
-	"github.com/aws/aws-sdk-go-v2/service/ec2"
 	"github.com/aws/aws-sdk-go-v2/service/autoscaling"
+	"github.com/aws/aws-sdk-go-v2/service/ec2"
 	elb "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing"
 	elbv2 "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2"
 	"github.com/aws/aws-sdk-go-v2/service/kms"
@@ -19,7 +19,6 @@ import (
 	"k8s.io/client-go/pkg/version"
 )
 
-
 // Adds middleware to AWS SDK Go V2 clients.
 func (p *awsSDKProvider) AddMiddleware(ctx context.Context, regionName string, cfg *aws.Config) {
 	cfg.APIOptions = append(cfg.APIOptions,
@@ -320,4 +319,4 @@ func (r *AutoscalingResolver) ResolveEndpoint(
 		}
 	}
 	return r.Resolver.ResolveEndpoint(ctx, params)
-}
+}

pkg/providers/v1/aws_sdk_client_test.go

@@ -738,4 +738,4 @@ func TestClientsWithRetry(t *testing.T) {
 	}
 	_, err = autoscalingClient.DescribeAutoScalingGroups(context.TODO(), &autoscaling.DescribeAutoScalingGroupsInput{})
 	assert.True(t, attemptCount > 1, fmt.Sprintf("expected an attempt count of >1 for Autoscaling client, got %d", attemptCount))
-}
+}

pkg/providers/v1/aws_test.go

@@ -1614,7 +1614,7 @@ func TestGetVolumeLabels(t *testing.T) {
 		},
 	})
 
-	labels, err := c.GetVolumeLabels(context.TODO(), KubernetesVolumeID("aws:///" + string(volumeID)))
+	labels, err := c.GetVolumeLabels(context.TODO(), KubernetesVolumeID("aws:///"+string(volumeID)))
 
 	assert.Nil(t, err, "Error creating Volume %v", err)
 	assert.Equal(t, map[string]string{
@@ -2453,7 +2453,7 @@ func TestCreateDisk(t *testing.T) {
 	describeVolumesRequest := &ec2.DescribeVolumesInput{
 		VolumeIds: []string{"vol-volumeId0"},
 	}
-	awsServices.ec2.(*MockedFakeEC2).On("DescribeVolumes", context.TODO(), describeVolumesRequest).Return([]ec2types.Volume{ec2types.Volume{
+	awsServices.ec2.(*MockedFakeEC2).On("DescribeVolumes", context.TODO(), describeVolumesRequest).Return([]ec2types.Volume{{
 		AvailabilityZone: aws.String("us-east-1a"),
 		VolumeId:         aws.String("vol-volumeId0"),
 		State:            ec2types.VolumeStateAvailable,
@@ -3868,7 +3868,7 @@ func TestDescribeInstances(t *testing.T) {
 					},
 					nil,
 				)
-				m.On("DescribeInstances", 
+				m.On("DescribeInstances",
 					&ec2.DescribeInstancesInput{
 						MaxResults: aws.Int32(1000),
 						NextToken:  aws.String("asdf"),

pkg/services/aws_sts.go

@@ -94,4 +94,4 @@ func NewStsClient(ctx context.Context, region, roleARN, sourceARN string) (*sts.
 
 	klog.V(4).Infof("configuring STS client with extra headers, %v", reqHeaders)
 	return stsClient, nil
-}
+}