linting fixes

Author: gdavison

internal/service/ec2/service_package.go

@@ -6,7 +6,6 @@ package ec2
 import (
 	"context"
 
-	"github.com/aws/aws-sdk-go-v2/aws"
 	aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws"
 	retry_sdkv2 "github.com/aws/aws-sdk-go-v2/aws/retry"
 	ec2_sdkv2 "github.com/aws/aws-sdk-go-v2/service/ec2"
@@ -67,11 +66,11 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (
 			tflog.Debug(ctx, "setting endpoint", map[string]any{
 				"tf_aws.endpoint": endpoint,
 			})
-			o.BaseEndpoint = aws.String(endpoint)
+			o.BaseEndpoint = aws_sdkv2.String(endpoint)
 
-			if o.EndpointOptions.UseFIPSEndpoint == aws.FIPSEndpointStateEnabled {
+			if o.EndpointOptions.UseFIPSEndpoint == aws_sdkv2.FIPSEndpointStateEnabled {
 				tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting")
-				o.EndpointOptions.UseFIPSEndpoint = aws.FIPSEndpointStateDisabled
+				o.EndpointOptions.UseFIPSEndpoint = aws_sdkv2.FIPSEndpointStateDisabled
 			}
 		}
 

internal/service/lightsail/service_package.go

@@ -8,7 +8,6 @@ import (
 	"strings"
 
 	"github.com/aws/aws-sdk-go-v2/aws"
-	aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws"
 	retry_sdkv2 "github.com/aws/aws-sdk-go-v2/aws/retry"
 	lightsail_sdkv2 "github.com/aws/aws-sdk-go-v2/service/lightsail"
 	"github.com/aws/aws-sdk-go-v2/service/lightsail/types"
@@ -20,7 +19,7 @@ import (
 
 // NewClient returns a new AWS SDK for Go v2 client for this service package's AWS API.
 func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*lightsail_sdkv2.Client, error) {
-	cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config))
+	cfg := *(config["aws_sdkv2_config"].(*aws.Config))
 
 	return lightsail_sdkv2.NewFromConfig(cfg, func(o *lightsail_sdkv2.Options) {
 		if endpoint := config[names.AttrEndpoint].(string); endpoint != "" {
@@ -35,12 +34,12 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (
 			}
 		}
 
-		o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws_sdkv2.RetryerV2), retry_sdkv2.IsErrorRetryableFunc(func(err error) aws_sdkv2.Ternary {
+		o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry_sdkv2.IsErrorRetryableFunc(func(err error) aws.Ternary {
 			if errs.IsAErrorMessageContains[*types.InvalidInputException](err, "Please try again in a few minutes") ||
 				strings.Contains(err.Error(), "Please wait for it to complete before trying again") {
-				return aws_sdkv2.TrueTernary
+				return aws.TrueTernary
 			}
-			return aws_sdkv2.UnknownTernary
+			return aws.UnknownTernary
 		}))
 	}), nil
 }