diff --git a/.ci/.semgrep.yml b/.ci/.semgrep.yml index 0a02114b994..5aab376a7cc 100644 --- a/.ci/.semgrep.yml +++ b/.ci/.semgrep.yml @@ -337,17 +337,17 @@ rules: patterns: - pattern-either: - pattern: | - aws.TimeValue($X) == $Y + aws.ToTime($X) == $Y - pattern: | - aws.TimeValue($X) != $Y + aws.ToTime($X) != $Y - pattern: | ($X : time.Time) == $Y - pattern: | ($X : time.Time) != $Y - pattern: | - $X == aws.TimeValue($Y) + $X == aws.ToTime($Y) - pattern: | - $X != aws.TimeValue($Y) + $X != aws.ToTime($Y) - pattern: | $X == ($Y : time.Time) - pattern: | diff --git a/.ci/semgrep/aws/awserr.yml b/.ci/semgrep/aws/awserr.yml deleted file mode 100644 index dacb12f8164..00000000000 --- a/.ci/semgrep/aws/awserr.yml +++ /dev/null @@ -1,9 +0,0 @@ -rules: - - id: aws-go-sdk-error-code-helper - languages: [go] - message: 'Use `tfawserr` helpers for checking AWS Go SDK v1 errors (e.g. `tfawserr.ErrMessageContains(err, CODE, MESSAGE)`)' - paths: - include: - - internal/ - pattern: $AWSERR, $OK := $ORIGINALERR.(awserr.Error) - severity: WARNING diff --git a/.ci/semgrep/aws/go-sdk-v1.yml b/.ci/semgrep/aws/go-sdk-v1.yml new file mode 100644 index 00000000000..211ff4e9ba0 --- /dev/null +++ b/.ci/semgrep/aws/go-sdk-v1.yml @@ -0,0 +1,34 @@ +rules: + - id: aws-sdk-go-imports + languages: [go] + message: Do not use AWS SDK for Go v1 + paths: + include: + - internal/ + exclude: + - "internal/service/simpledb/*.go" + - "internal/conns/awsclient.go" + patterns: + - pattern: | + import ("$X") + - metavariable-regex: + metavariable: "$X" + regex: '^github.com/aws/aws-sdk-go/.+$' + severity: WARNING + + - id: aws-sdk-go-base-awsv1shim-imports + languages: [go] + message: Do not use aws-sdk-go-base AWS SDK for Go v1 shims + paths: + include: + - internal/ + exclude: + - "internal/service/simpledb/*.go" + - "internal/conns/config.go" + patterns: + - pattern: | + import ("$X") + - metavariable-regex: + metavariable: "$X" + regex: '^github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/?.*$' + severity: WARNING diff --git a/.ci/semgrep/aws/go-sdk.yml b/.ci/semgrep/aws/go-sdk.yml index 4dce3e2b306..ab63b1186d6 100644 --- a/.ci/semgrep/aws/go-sdk.yml +++ b/.ci/semgrep/aws/go-sdk.yml @@ -16,19 +16,15 @@ rules: import ("$Y") - metavariable-regex: metavariable: "$X" - regex: '^github.com/aws/aws-sdk-go(-v2)?/service/[^/]+$' + regex: '^github.com/aws/aws-sdk-go-v2/service/[^/]+$' - metavariable-regex: metavariable: "$Y" - regex: '^github.com/aws/aws-sdk-go/service(-v2)?/[^/]+$' - # wafregional uses a number of resources from waf - - pattern-not: | - import ("github.com/aws/aws-sdk-go/service/waf") - import ("github.com/aws/aws-sdk-go/service/wafregional") + regex: '^github.com/aws/aws-sdk-go-v2/service/[^/]+$' severity: WARNING - id: prefer-pointer-conversion-assignment languages: [go] - message: Prefer AWS Go SDK pointer conversion functions for dereferencing during assignment, e.g. aws.StringValue() + message: Prefer AWS Go SDK pointer conversion functions for dereferencing during assignment, e.g. aws.ToString() paths: include: - internal/service @@ -43,7 +39,7 @@ rules: - id: prefer-pointer-conversion-conditional languages: [go] - message: Prefer AWS Go SDK pointer conversion functions for dereferencing during conditionals, e.g. aws.StringValue() + message: Prefer AWS Go SDK pointer conversion functions for dereferencing during conditionals, e.g. aws.ToString() paths: include: - internal/service @@ -82,9 +78,9 @@ rules: severity: WARNING - id: pointer-conversion-ResourceData-SetId - fix: d.SetId(aws.StringValue($VALUE)) + fix: d.SetId(aws.ToString($VALUE)) languages: [go] - message: Prefer AWS Go SDK pointer conversion aws.StringValue() function for dereferencing during d.SetId() + message: Prefer AWS Go SDK pointer conversion aws.ToString() function for dereferencing during d.SetId() paths: include: - internal/ @@ -100,17 +96,14 @@ rules: - internal/ patterns: - pattern-either: - - pattern: d.Set($ATTRIBUTE, aws.BoolValue($APIOBJECT)) - pattern: d.Set($ATTRIBUTE, aws.ToBool($APIOBJECT)) - - pattern: d.Set($ATTRIBUTE, aws.Float64Value($APIOBJECT)) + - pattern: d.Set($ATTRIBUTE, aws.ToFloat32($APIOBJECT)) - pattern: d.Set($ATTRIBUTE, aws.ToFloat64($APIOBJECT)) - - pattern: d.Set($ATTRIBUTE, aws.IntValue($APIOBJECT)) - pattern: d.Set($ATTRIBUTE, aws.ToInt($APIOBJECT)) - - pattern: d.Set($ATTRIBUTE, aws.Int64Value($APIOBJECT)) + - pattern: d.Set($ATTRIBUTE, aws.ToInt32($APIOBJECT)) - pattern: d.Set($ATTRIBUTE, aws.ToInt64($APIOBJECT)) - - pattern: d.Set($ATTRIBUTE, int(aws.Int64Value($APIOBJECT))) + - pattern: d.Set($ATTRIBUTE, int(aws.ToInt32($APIOBJECT))) - pattern: d.Set($ATTRIBUTE, int(aws.ToInt64($APIOBJECT))) - - pattern: d.Set($ATTRIBUTE, aws.StringValue($APIOBJECT)) - pattern: d.Set($ATTRIBUTE, aws.ToString($APIOBJECT)) severity: WARNING diff --git a/.ci/semgrep/migrate/context.yml b/.ci/semgrep/migrate/context.yml index a94c021b9a9..3199e60de33 100644 --- a/.ci/semgrep/migrate/context.yml +++ b/.ci/semgrep/migrate/context.yml @@ -1,42 +1,4 @@ rules: - - id: aws-api-context - languages: [go] - message: All AWS API calls should use the WithContext version - paths: - include: - - internal/service/* - - internal/acctest/* - exclude: - - "internal/service/*/service_package.go" - - "internal/service/*/service_package_gen.go" - patterns: - - pattern: | - $CONN.$API(...) - - metavariable-regex: - metavariable: $CONN - regex: ^(?!conns)\w*([cC]onn) - - metavariable-regex: - metavariable: $API - # This weird construction is to get around greedy matching - regex: ^(?!.*(WithContext|_Values|Paginator)).*$ - - pattern-not: | - $CONN.$APIV2(ctx, ...) - - pattern-not: tfcodestarconnections.$API() - - pattern-not: tfconnect.$API(...) - - pattern-not: tfdirectconnect.$API() - - pattern-not: tfkafkaconnect.$API() - - pattern-not: conn.Handlers.$X(...) - - pattern-not: conn.Handlers.$X.$Y(...) - - pattern-not: conn.Options() - - pattern-not: codeconnections_sdkv2.$API() - - pattern-not: codestarconnections_sdkv2.$API() - - pattern-not: connect_sdkv2.$API() - - pattern-not: connectcases_sdkv2.$API() - - pattern-not: directconnect_sdkv2.$API() - - pattern-not: kafkaconnect_sdkv2.$API() - - pattern-not: mediaconnect_sdkv2.$API() - - pattern-not: pcaconnectorad_sdkv2.$API() - severity: ERROR - id: context-todo languages: [go] message: Should not use `context.TODO()` diff --git a/internal/acctest/acctest.go b/internal/acctest/acctest.go index 0205fbc312e..a5559b583ec 100644 --- a/internal/acctest/acctest.go +++ b/internal/acctest/acctest.go @@ -41,9 +41,8 @@ import ( ssoadmintypes "github.com/aws/aws-sdk-go-v2/service/ssoadmin/types" "github.com/aws/aws-sdk-go-v2/service/wafv2" wafv2types "github.com/aws/aws-sdk-go-v2/service/wafv2/types" - tfawserr_sdkv1 "github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr" "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" - tfawserr_sdkv2 "github.com/hashicorp/aws-sdk-go-base/v2/tfawserr" + "github.com/hashicorp/aws-sdk-go-base/v2/tfawserr" "github.com/hashicorp/terraform-plugin-go/tfprotov5" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/id" @@ -903,7 +902,7 @@ func PartitionDNSSuffix() string { } func PartitionReverseDNSPrefix() string { - return names.ReverseDNS(PartitionDNSSuffix()) + return conns.ReverseDNS(PartitionDNSSuffix()) } func alternateRegionPartition() string { @@ -1786,31 +1785,31 @@ func PreCheckSkipError(err error) bool { // GovCloud has endpoints that respond with (no message provided after the error code): // AccessDeniedException: // Ignore these API endpoints that exist but are not officially enabled - if tfawserr_sdkv1.ErrCodeEquals(err, "AccessDeniedException") || tfawserr_sdkv2.ErrCodeEquals(err, "AccessDeniedException") { + if tfawserr.ErrCodeEquals(err, "AccessDeniedException") { return true } // Ignore missing API endpoints - if tfawserr_sdkv1.ErrMessageContains(err, "RequestError", "send request failed") || tfawserr_sdkv2.ErrMessageContains(err, "RequestError", "send request failed") { + if tfawserr.ErrMessageContains(err, "RequestError", "send request failed") { return true } // Ignore unsupported API calls - if tfawserr_sdkv1.ErrCodeEquals(err, "UnknownOperationException") || tfawserr_sdkv2.ErrCodeEquals(err, "UnknownOperationException") { + if tfawserr.ErrCodeEquals(err, "UnknownOperationException") { return true } - if tfawserr_sdkv1.ErrCodeEquals(err, "UnsupportedOperation") || tfawserr_sdkv2.ErrCodeEquals(err, "UnsupportedOperation") { + if tfawserr.ErrCodeEquals(err, "UnsupportedOperation") { return true } - if tfawserr_sdkv1.ErrMessageContains(err, "InvalidInputException", "Unknown operation") || tfawserr_sdkv2.ErrMessageContains(err, "InvalidInputException", "Unknown operation") { + if tfawserr.ErrMessageContains(err, "InvalidInputException", "Unknown operation") { return true } - if tfawserr_sdkv1.ErrMessageContains(err, "InvalidAction", "is not valid") || tfawserr_sdkv2.ErrMessageContains(err, "InvalidAction", "is not valid") { + if tfawserr.ErrMessageContains(err, "InvalidAction", "is not valid") { return true } - if tfawserr_sdkv1.ErrMessageContains(err, "InvalidAction", "Unavailable Operation") || tfawserr_sdkv2.ErrMessageContains(err, "InvalidAction", "Unavailable Operation") { + if tfawserr.ErrMessageContains(err, "InvalidAction", "Unavailable Operation") { return true } // ignore when not authorized to call API from account - if tfawserr_sdkv1.ErrCodeEquals(err, "ForbiddenException") || tfawserr_sdkv2.ErrCodeEquals(err, "ForbiddenException") { + if tfawserr.ErrCodeEquals(err, "ForbiddenException") { return true } // Ignore missing API endpoints diff --git a/internal/conns/awsclient.go b/internal/conns/awsclient.go index a519121ae5b..9425b4a16de 100644 --- a/internal/conns/awsclient.go +++ b/internal/conns/awsclient.go @@ -12,11 +12,11 @@ import ( "strings" "sync" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - config_sdkv2 "github.com/aws/aws-sdk-go-v2/config" + "github.com/aws/aws-sdk-go-v2/aws" apigatewayv2_types "github.com/aws/aws-sdk-go-v2/service/apigatewayv2/types" - s3_sdkv2 "github.com/aws/aws-sdk-go-v2/service/s3" + "github.com/aws/aws-sdk-go-v2/service/s3" session_sdkv1 "github.com/aws/aws-sdk-go/aws/session" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" baselogging "github.com/hashicorp/aws-sdk-go-base/v2/logging" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" @@ -32,7 +32,7 @@ type AWSClient struct { Region string ServicePackages map[string]ServicePackage - awsConfig *aws_sdkv2.Config + awsConfig *aws.Config clients map[string]any conns map[string]any dnsSuffix string @@ -41,14 +41,14 @@ type AWSClient struct { lock sync.Mutex logger baselogging.Logger session *session_sdkv1.Session - s3ExpressClient *s3_sdkv2.Client + s3ExpressClient *s3.Client s3UsePathStyle bool // From provider configuration. s3USEast1RegionalEndpoint string // From provider configuration. stsRegion string // From provider configuration. } // CredentialsProvider returns the AWS SDK for Go v2 credentials provider. -func (c *AWSClient) CredentialsProvider(context.Context) aws_sdkv2.CredentialsProvider { +func (c *AWSClient) CredentialsProvider(context.Context) aws.CredentialsProvider { if c.awsConfig == nil { return nil } @@ -63,10 +63,19 @@ func (c *AWSClient) IgnoreTagsConfig(context.Context) *tftags.IgnoreConfig { return c.ignoreTagsConfig } -func (c *AWSClient) AwsConfig(context.Context) aws_sdkv2.Config { // nosemgrep:ci.aws-in-func-name +func (c *AWSClient) AwsConfig(context.Context) aws.Config { // nosemgrep:ci.aws-in-func-name return c.awsConfig.Copy() } +// AwsSession and Endpoints can be removed once the simpledb service is removed. +func (c *AWSClient) AwsSession(context.Context) *session_sdkv1.Session { // nosemgrep:ci.aws-in-func-name + return c.session +} + +func (c *AWSClient) Endpoints(context.Context) map[string]string { + return maps.Clone(c.endpoints) +} + // PartitionHostname returns a hostname with the provider domain suffix for the partition // e.g. PREFIX.amazonaws.com // The prefix should not contain a trailing period. @@ -84,15 +93,15 @@ func (c *AWSClient) RegionalHostname(ctx context.Context, prefix string) string // S3ExpressClient returns an AWS SDK for Go v2 S3 API client suitable for use with S3 Express (directory buckets). // This client differs from the standard S3 API client only in us-east-1 if the global S3 endpoint is used. // In that case the returned client uses the regional S3 endpoint. -func (c *AWSClient) S3ExpressClient(ctx context.Context) *s3_sdkv2.Client { +func (c *AWSClient) S3ExpressClient(ctx context.Context) *s3.Client { s3Client := c.S3Client(ctx) c.lock.Lock() // OK since a non-default client is created. defer c.lock.Unlock() if c.s3ExpressClient == nil { - if s3Client.Options().Region == names.GlobalRegionID { - c.s3ExpressClient = errs.Must(client[*s3_sdkv2.Client](ctx, c, names.S3, map[string]any{ + if s3Client.Options().Region == endpoints.AwsGlobalRegionID { + c.s3ExpressClient = errs.Must(client[*s3.Client](ctx, c, names.S3, map[string]any{ "s3_us_east_1_regional_endpoint": "regional", })) } else { @@ -150,7 +159,7 @@ func (c *AWSClient) APIGatewayV2InvokeURL(ctx context.Context, protocolType apig // CloudFrontDistributionHostedZoneID returns the Route 53 hosted zone ID // for Amazon CloudFront distributions in the configured AWS partition. func (c *AWSClient) CloudFrontDistributionHostedZoneID(context.Context) string { - if c.Partition == names.ChinaPartitionID { + if c.Partition == endpoints.AwsCnPartitionID { return "Z3RFFRIM2A3IF5" // See https://docs.amazonaws.cn/en_us/aws/latest/userguide/route53.html } return "Z2FDTNDATAQYW2" // See https://docs.aws.amazon.com/Route53/latest/APIReference/API_AliasTarget.html#Route53-Type-AliasTarget-HostedZoneId @@ -190,13 +199,13 @@ func (c *AWSClient) DNSSuffix(context.Context) string { // ReverseDNSPrefix returns the reverse DNS prefix for the configured AWS partition. func (c *AWSClient) ReverseDNSPrefix(ctx context.Context) string { - return names.ReverseDNS(c.DNSSuffix(ctx)) + return ReverseDNS(c.DNSSuffix(ctx)) } // EC2RegionalPrivateDNSSuffix returns the EC2 private DNS suffix for the configured AWS Region. func (c *AWSClient) EC2RegionalPrivateDNSSuffix(context.Context) string { region := c.Region - if region == names.USEast1RegionID { + if region == endpoints.UsEast1RegionID { return "ec2.internal" } @@ -206,7 +215,7 @@ func (c *AWSClient) EC2RegionalPrivateDNSSuffix(context.Context) string { // EC2RegionalPublicDNSSuffix returns the EC2 public DNS suffix for the configured AWS Region. func (c *AWSClient) EC2RegionalPublicDNSSuffix(context.Context) string { region := c.Region - if region == names.USEast1RegionID { + if region == endpoints.UsEast1RegionID { return "compute-1" } @@ -223,17 +232,27 @@ func (c *AWSClient) EC2PublicDNSNameForIP(ctx context.Context, ip string) string return c.PartitionHostname(ctx, fmt.Sprintf("ec2-%s.%s", convertIPToDashIP(ip), c.EC2RegionalPublicDNSSuffix(ctx))) } +// ReverseDNS switches a DNS hostname to reverse DNS and vice-versa. +func ReverseDNS(hostname string) string { + parts := strings.Split(hostname, ".") + + for i, j := 0, len(parts)-1; i < j; i, j = i+1, j-1 { + parts[i], parts[j] = parts[j], parts[i] + } + + return strings.Join(parts, ".") +} + func convertIPToDashIP(ip string) string { return strings.Replace(ip, ".", "-", -1) } // apiClientConfig returns the AWS API client configuration parameters for the specified service. -func (c *AWSClient) apiClientConfig(ctx context.Context, servicePackageName string) map[string]any { +func (c *AWSClient) apiClientConfig(_ context.Context, servicePackageName string) map[string]any { m := map[string]any{ "aws_sdkv2_config": c.awsConfig, - "endpoint": c.resolveEndpoint(ctx, servicePackageName), + "endpoint": c.endpoints[servicePackageName], "partition": c.Partition, - "session": c.session, } switch servicePackageName { case names.S3: @@ -251,92 +270,6 @@ func (c *AWSClient) apiClientConfig(ctx context.Context, servicePackageName stri return m } -// serviceBaseEndpointProvider is needed to search for all providers -// that provide a configured service endpoint -type serviceBaseEndpointProvider interface { - GetServiceBaseEndpoint(ctx context.Context, sdkID string) (string, bool, error) -} - -// resolveServiceBaseEndpoint is used to retrieve service endpoints from configured sources -// while allowing for configured endpoints to be disabled -func resolveServiceBaseEndpoint(ctx context.Context, sdkID string, configs []any) (value string, found bool, err error) { - if val, found, _ := config_sdkv2.GetIgnoreConfiguredEndpoints(ctx, configs); found && val { - return "", false, nil - } - - for _, cs := range configs { - if p, ok := cs.(serviceBaseEndpointProvider); ok { - value, found, err = p.GetServiceBaseEndpoint(ctx, sdkID) - if err != nil || found { - break - } - } - } - return -} - -// conn returns the AWS SDK for Go v1 API client for the specified service. -// The default service client (`extra` is empty) is cached. In this case the AWSClient lock is held. -// This function is not a method on `AWSClient` as methods can't be parameterized (https://go.googlesource.com/proposal/+/refs/heads/master/design/43651-type-parameters.md#no-parameterized-methods). -func conn[T any](ctx context.Context, c *AWSClient, servicePackageName string, extra map[string]any) (T, error) { - ctx = tflog.SetField(ctx, "tf_aws.service_package", servicePackageName) - - isDefault := len(extra) == 0 - // Default service client is cached. - if isDefault { - c.lock.Lock() - defer c.lock.Unlock() // Runs at function exit, NOT block. - - if raw, ok := c.conns[servicePackageName]; ok { - if conn, ok := raw.(T); ok { - return conn, nil - } else { - var zero T - return zero, fmt.Errorf("AWS SDK v1 API client (%s): %T, want %T", servicePackageName, raw, zero) - } - } - } - - sp, ok := c.ServicePackages[servicePackageName] - if !ok { - var zero T - return zero, fmt.Errorf("unknown service package: %s", servicePackageName) - } - - v, ok := sp.(interface { - NewConn(context.Context, map[string]any) (T, error) - }) - if !ok { - var zero T - return zero, fmt.Errorf("no AWS SDK v1 API client factory: %s", servicePackageName) - } - - config := c.apiClientConfig(ctx, servicePackageName) - maps.Copy(config, extra) // Extras overwrite per-service defaults. - conn, err := v.NewConn(ctx, config) - if err != nil { - var zero T - return zero, err - } - - if v, ok := sp.(interface { - CustomizeConn(context.Context, T) (T, error) - }); ok { - conn, err = v.CustomizeConn(ctx, conn) - if err != nil { - var zero T - return zero, err - } - } - - // Default service client is cached. - if isDefault { - c.conns[servicePackageName] = conn - } - - return conn, nil -} - // client returns the AWS SDK for Go v2 API client for the specified service. // The default service client (`extra` is empty) is cached. In this case the AWSClient lock is held. // This function is not a method on `AWSClient` as methods can't be parameterized (https://go.googlesource.com/proposal/+/refs/heads/master/design/43651-type-parameters.md#no-parameterized-methods). diff --git a/internal/conns/awsclient_gen.go b/internal/conns/awsclient_gen.go index 472c508bc6f..58cc7034cbb 100644 --- a/internal/conns/awsclient_gen.go +++ b/internal/conns/awsclient_gen.go @@ -4,1226 +4,1221 @@ package conns import ( "context" - accessanalyzer_sdkv2 "github.com/aws/aws-sdk-go-v2/service/accessanalyzer" - account_sdkv2 "github.com/aws/aws-sdk-go-v2/service/account" - acm_sdkv2 "github.com/aws/aws-sdk-go-v2/service/acm" - acmpca_sdkv2 "github.com/aws/aws-sdk-go-v2/service/acmpca" - amp_sdkv2 "github.com/aws/aws-sdk-go-v2/service/amp" - amplify_sdkv2 "github.com/aws/aws-sdk-go-v2/service/amplify" - apigateway_sdkv2 "github.com/aws/aws-sdk-go-v2/service/apigateway" - apigatewayv2_sdkv2 "github.com/aws/aws-sdk-go-v2/service/apigatewayv2" - appconfig_sdkv2 "github.com/aws/aws-sdk-go-v2/service/appconfig" - appfabric_sdkv2 "github.com/aws/aws-sdk-go-v2/service/appfabric" - appflow_sdkv2 "github.com/aws/aws-sdk-go-v2/service/appflow" - appintegrations_sdkv2 "github.com/aws/aws-sdk-go-v2/service/appintegrations" - applicationautoscaling_sdkv2 "github.com/aws/aws-sdk-go-v2/service/applicationautoscaling" - applicationinsights_sdkv2 "github.com/aws/aws-sdk-go-v2/service/applicationinsights" - applicationsignals_sdkv2 "github.com/aws/aws-sdk-go-v2/service/applicationsignals" - appmesh_sdkv2 "github.com/aws/aws-sdk-go-v2/service/appmesh" - apprunner_sdkv2 "github.com/aws/aws-sdk-go-v2/service/apprunner" - appstream_sdkv2 "github.com/aws/aws-sdk-go-v2/service/appstream" - appsync_sdkv2 "github.com/aws/aws-sdk-go-v2/service/appsync" - athena_sdkv2 "github.com/aws/aws-sdk-go-v2/service/athena" - auditmanager_sdkv2 "github.com/aws/aws-sdk-go-v2/service/auditmanager" - autoscaling_sdkv2 "github.com/aws/aws-sdk-go-v2/service/autoscaling" - autoscalingplans_sdkv2 "github.com/aws/aws-sdk-go-v2/service/autoscalingplans" - backup_sdkv2 "github.com/aws/aws-sdk-go-v2/service/backup" - batch_sdkv2 "github.com/aws/aws-sdk-go-v2/service/batch" - bcmdataexports_sdkv2 "github.com/aws/aws-sdk-go-v2/service/bcmdataexports" - bedrock_sdkv2 "github.com/aws/aws-sdk-go-v2/service/bedrock" - bedrockagent_sdkv2 "github.com/aws/aws-sdk-go-v2/service/bedrockagent" - budgets_sdkv2 "github.com/aws/aws-sdk-go-v2/service/budgets" - chatbot_sdkv2 "github.com/aws/aws-sdk-go-v2/service/chatbot" - chime_sdkv2 "github.com/aws/aws-sdk-go-v2/service/chime" - chimesdkmediapipelines_sdkv2 "github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines" - chimesdkvoice_sdkv2 "github.com/aws/aws-sdk-go-v2/service/chimesdkvoice" - cleanrooms_sdkv2 "github.com/aws/aws-sdk-go-v2/service/cleanrooms" - cloud9_sdkv2 "github.com/aws/aws-sdk-go-v2/service/cloud9" - cloudcontrol_sdkv2 "github.com/aws/aws-sdk-go-v2/service/cloudcontrol" - cloudformation_sdkv2 "github.com/aws/aws-sdk-go-v2/service/cloudformation" - cloudfront_sdkv2 "github.com/aws/aws-sdk-go-v2/service/cloudfront" - cloudfrontkeyvaluestore_sdkv2 "github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore" - cloudhsmv2_sdkv2 "github.com/aws/aws-sdk-go-v2/service/cloudhsmv2" - cloudsearch_sdkv2 "github.com/aws/aws-sdk-go-v2/service/cloudsearch" - cloudtrail_sdkv2 "github.com/aws/aws-sdk-go-v2/service/cloudtrail" - cloudwatch_sdkv2 "github.com/aws/aws-sdk-go-v2/service/cloudwatch" - cloudwatchlogs_sdkv2 "github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs" - codeartifact_sdkv2 "github.com/aws/aws-sdk-go-v2/service/codeartifact" - codebuild_sdkv2 "github.com/aws/aws-sdk-go-v2/service/codebuild" - codecatalyst_sdkv2 "github.com/aws/aws-sdk-go-v2/service/codecatalyst" - codecommit_sdkv2 "github.com/aws/aws-sdk-go-v2/service/codecommit" - codeconnections_sdkv2 "github.com/aws/aws-sdk-go-v2/service/codeconnections" - codedeploy_sdkv2 "github.com/aws/aws-sdk-go-v2/service/codedeploy" - codeguruprofiler_sdkv2 "github.com/aws/aws-sdk-go-v2/service/codeguruprofiler" - codegurureviewer_sdkv2 "github.com/aws/aws-sdk-go-v2/service/codegurureviewer" - codepipeline_sdkv2 "github.com/aws/aws-sdk-go-v2/service/codepipeline" - codestarconnections_sdkv2 "github.com/aws/aws-sdk-go-v2/service/codestarconnections" - codestarnotifications_sdkv2 "github.com/aws/aws-sdk-go-v2/service/codestarnotifications" - cognitoidentity_sdkv2 "github.com/aws/aws-sdk-go-v2/service/cognitoidentity" - cognitoidentityprovider_sdkv2 "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider" - comprehend_sdkv2 "github.com/aws/aws-sdk-go-v2/service/comprehend" - computeoptimizer_sdkv2 "github.com/aws/aws-sdk-go-v2/service/computeoptimizer" - configservice_sdkv2 "github.com/aws/aws-sdk-go-v2/service/configservice" - connect_sdkv2 "github.com/aws/aws-sdk-go-v2/service/connect" - connectcases_sdkv2 "github.com/aws/aws-sdk-go-v2/service/connectcases" - controltower_sdkv2 "github.com/aws/aws-sdk-go-v2/service/controltower" - costandusagereportservice_sdkv2 "github.com/aws/aws-sdk-go-v2/service/costandusagereportservice" - costexplorer_sdkv2 "github.com/aws/aws-sdk-go-v2/service/costexplorer" - costoptimizationhub_sdkv2 "github.com/aws/aws-sdk-go-v2/service/costoptimizationhub" - customerprofiles_sdkv2 "github.com/aws/aws-sdk-go-v2/service/customerprofiles" - databasemigrationservice_sdkv2 "github.com/aws/aws-sdk-go-v2/service/databasemigrationservice" - databrew_sdkv2 "github.com/aws/aws-sdk-go-v2/service/databrew" - dataexchange_sdkv2 "github.com/aws/aws-sdk-go-v2/service/dataexchange" - datapipeline_sdkv2 "github.com/aws/aws-sdk-go-v2/service/datapipeline" - datasync_sdkv2 "github.com/aws/aws-sdk-go-v2/service/datasync" - datazone_sdkv2 "github.com/aws/aws-sdk-go-v2/service/datazone" - dax_sdkv2 "github.com/aws/aws-sdk-go-v2/service/dax" - detective_sdkv2 "github.com/aws/aws-sdk-go-v2/service/detective" - devicefarm_sdkv2 "github.com/aws/aws-sdk-go-v2/service/devicefarm" - devopsguru_sdkv2 "github.com/aws/aws-sdk-go-v2/service/devopsguru" - directconnect_sdkv2 "github.com/aws/aws-sdk-go-v2/service/directconnect" - directoryservice_sdkv2 "github.com/aws/aws-sdk-go-v2/service/directoryservice" - dlm_sdkv2 "github.com/aws/aws-sdk-go-v2/service/dlm" - docdb_sdkv2 "github.com/aws/aws-sdk-go-v2/service/docdb" - docdbelastic_sdkv2 "github.com/aws/aws-sdk-go-v2/service/docdbelastic" - drs_sdkv2 "github.com/aws/aws-sdk-go-v2/service/drs" - dynamodb_sdkv2 "github.com/aws/aws-sdk-go-v2/service/dynamodb" - ec2_sdkv2 "github.com/aws/aws-sdk-go-v2/service/ec2" - ecr_sdkv2 "github.com/aws/aws-sdk-go-v2/service/ecr" - ecrpublic_sdkv2 "github.com/aws/aws-sdk-go-v2/service/ecrpublic" - ecs_sdkv2 "github.com/aws/aws-sdk-go-v2/service/ecs" - efs_sdkv2 "github.com/aws/aws-sdk-go-v2/service/efs" - eks_sdkv2 "github.com/aws/aws-sdk-go-v2/service/eks" - elasticache_sdkv2 "github.com/aws/aws-sdk-go-v2/service/elasticache" - elasticbeanstalk_sdkv2 "github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk" - elasticloadbalancing_sdkv2 "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing" - elasticloadbalancingv2_sdkv2 "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2" - elasticsearchservice_sdkv2 "github.com/aws/aws-sdk-go-v2/service/elasticsearchservice" - elastictranscoder_sdkv2 "github.com/aws/aws-sdk-go-v2/service/elastictranscoder" - emr_sdkv2 "github.com/aws/aws-sdk-go-v2/service/emr" - emrcontainers_sdkv2 "github.com/aws/aws-sdk-go-v2/service/emrcontainers" - emrserverless_sdkv2 "github.com/aws/aws-sdk-go-v2/service/emrserverless" - eventbridge_sdkv2 "github.com/aws/aws-sdk-go-v2/service/eventbridge" - evidently_sdkv2 "github.com/aws/aws-sdk-go-v2/service/evidently" - finspace_sdkv2 "github.com/aws/aws-sdk-go-v2/service/finspace" - firehose_sdkv2 "github.com/aws/aws-sdk-go-v2/service/firehose" - fis_sdkv2 "github.com/aws/aws-sdk-go-v2/service/fis" - fms_sdkv2 "github.com/aws/aws-sdk-go-v2/service/fms" - fsx_sdkv2 "github.com/aws/aws-sdk-go-v2/service/fsx" - gamelift_sdkv2 "github.com/aws/aws-sdk-go-v2/service/gamelift" - glacier_sdkv2 "github.com/aws/aws-sdk-go-v2/service/glacier" - globalaccelerator_sdkv2 "github.com/aws/aws-sdk-go-v2/service/globalaccelerator" - glue_sdkv2 "github.com/aws/aws-sdk-go-v2/service/glue" - grafana_sdkv2 "github.com/aws/aws-sdk-go-v2/service/grafana" - greengrass_sdkv2 "github.com/aws/aws-sdk-go-v2/service/greengrass" - groundstation_sdkv2 "github.com/aws/aws-sdk-go-v2/service/groundstation" - guardduty_sdkv2 "github.com/aws/aws-sdk-go-v2/service/guardduty" - healthlake_sdkv2 "github.com/aws/aws-sdk-go-v2/service/healthlake" - iam_sdkv2 "github.com/aws/aws-sdk-go-v2/service/iam" - identitystore_sdkv2 "github.com/aws/aws-sdk-go-v2/service/identitystore" - imagebuilder_sdkv2 "github.com/aws/aws-sdk-go-v2/service/imagebuilder" - inspector_sdkv2 "github.com/aws/aws-sdk-go-v2/service/inspector" - inspector2_sdkv2 "github.com/aws/aws-sdk-go-v2/service/inspector2" - internetmonitor_sdkv2 "github.com/aws/aws-sdk-go-v2/service/internetmonitor" - iot_sdkv2 "github.com/aws/aws-sdk-go-v2/service/iot" - iotanalytics_sdkv2 "github.com/aws/aws-sdk-go-v2/service/iotanalytics" - iotevents_sdkv2 "github.com/aws/aws-sdk-go-v2/service/iotevents" - ivs_sdkv2 "github.com/aws/aws-sdk-go-v2/service/ivs" - ivschat_sdkv2 "github.com/aws/aws-sdk-go-v2/service/ivschat" - kafka_sdkv2 "github.com/aws/aws-sdk-go-v2/service/kafka" - kafkaconnect_sdkv2 "github.com/aws/aws-sdk-go-v2/service/kafkaconnect" - kendra_sdkv2 "github.com/aws/aws-sdk-go-v2/service/kendra" - keyspaces_sdkv2 "github.com/aws/aws-sdk-go-v2/service/keyspaces" - kinesis_sdkv2 "github.com/aws/aws-sdk-go-v2/service/kinesis" - kinesisanalytics_sdkv2 "github.com/aws/aws-sdk-go-v2/service/kinesisanalytics" - kinesisanalyticsv2_sdkv2 "github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2" - kinesisvideo_sdkv2 "github.com/aws/aws-sdk-go-v2/service/kinesisvideo" - kms_sdkv2 "github.com/aws/aws-sdk-go-v2/service/kms" - lakeformation_sdkv2 "github.com/aws/aws-sdk-go-v2/service/lakeformation" - lambda_sdkv2 "github.com/aws/aws-sdk-go-v2/service/lambda" - launchwizard_sdkv2 "github.com/aws/aws-sdk-go-v2/service/launchwizard" - lexmodelbuildingservice_sdkv2 "github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice" - lexmodelsv2_sdkv2 "github.com/aws/aws-sdk-go-v2/service/lexmodelsv2" - licensemanager_sdkv2 "github.com/aws/aws-sdk-go-v2/service/licensemanager" - lightsail_sdkv2 "github.com/aws/aws-sdk-go-v2/service/lightsail" - location_sdkv2 "github.com/aws/aws-sdk-go-v2/service/location" - lookoutmetrics_sdkv2 "github.com/aws/aws-sdk-go-v2/service/lookoutmetrics" - m2_sdkv2 "github.com/aws/aws-sdk-go-v2/service/m2" - macie2_sdkv2 "github.com/aws/aws-sdk-go-v2/service/macie2" - mediaconnect_sdkv2 "github.com/aws/aws-sdk-go-v2/service/mediaconnect" - mediaconvert_sdkv2 "github.com/aws/aws-sdk-go-v2/service/mediaconvert" - medialive_sdkv2 "github.com/aws/aws-sdk-go-v2/service/medialive" - mediapackage_sdkv2 "github.com/aws/aws-sdk-go-v2/service/mediapackage" - mediapackagev2_sdkv2 "github.com/aws/aws-sdk-go-v2/service/mediapackagev2" - mediastore_sdkv2 "github.com/aws/aws-sdk-go-v2/service/mediastore" - memorydb_sdkv2 "github.com/aws/aws-sdk-go-v2/service/memorydb" - mq_sdkv2 "github.com/aws/aws-sdk-go-v2/service/mq" - mwaa_sdkv2 "github.com/aws/aws-sdk-go-v2/service/mwaa" - neptune_sdkv2 "github.com/aws/aws-sdk-go-v2/service/neptune" - neptunegraph_sdkv2 "github.com/aws/aws-sdk-go-v2/service/neptunegraph" - networkfirewall_sdkv2 "github.com/aws/aws-sdk-go-v2/service/networkfirewall" - networkmanager_sdkv2 "github.com/aws/aws-sdk-go-v2/service/networkmanager" - networkmonitor_sdkv2 "github.com/aws/aws-sdk-go-v2/service/networkmonitor" - oam_sdkv2 "github.com/aws/aws-sdk-go-v2/service/oam" - opensearch_sdkv2 "github.com/aws/aws-sdk-go-v2/service/opensearch" - opensearchserverless_sdkv2 "github.com/aws/aws-sdk-go-v2/service/opensearchserverless" - opsworks_sdkv2 "github.com/aws/aws-sdk-go-v2/service/opsworks" - organizations_sdkv2 "github.com/aws/aws-sdk-go-v2/service/organizations" - osis_sdkv2 "github.com/aws/aws-sdk-go-v2/service/osis" - outposts_sdkv2 "github.com/aws/aws-sdk-go-v2/service/outposts" - paymentcryptography_sdkv2 "github.com/aws/aws-sdk-go-v2/service/paymentcryptography" - pcaconnectorad_sdkv2 "github.com/aws/aws-sdk-go-v2/service/pcaconnectorad" - pcs_sdkv2 "github.com/aws/aws-sdk-go-v2/service/pcs" - pinpoint_sdkv2 "github.com/aws/aws-sdk-go-v2/service/pinpoint" - pinpointsmsvoicev2_sdkv2 "github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2" - pipes_sdkv2 "github.com/aws/aws-sdk-go-v2/service/pipes" - polly_sdkv2 "github.com/aws/aws-sdk-go-v2/service/polly" - pricing_sdkv2 "github.com/aws/aws-sdk-go-v2/service/pricing" - qbusiness_sdkv2 "github.com/aws/aws-sdk-go-v2/service/qbusiness" - qldb_sdkv2 "github.com/aws/aws-sdk-go-v2/service/qldb" - quicksight_sdkv2 "github.com/aws/aws-sdk-go-v2/service/quicksight" - ram_sdkv2 "github.com/aws/aws-sdk-go-v2/service/ram" - rbin_sdkv2 "github.com/aws/aws-sdk-go-v2/service/rbin" - rds_sdkv2 "github.com/aws/aws-sdk-go-v2/service/rds" - redshift_sdkv2 "github.com/aws/aws-sdk-go-v2/service/redshift" - redshiftdata_sdkv2 "github.com/aws/aws-sdk-go-v2/service/redshiftdata" - redshiftserverless_sdkv2 "github.com/aws/aws-sdk-go-v2/service/redshiftserverless" - rekognition_sdkv2 "github.com/aws/aws-sdk-go-v2/service/rekognition" - resiliencehub_sdkv2 "github.com/aws/aws-sdk-go-v2/service/resiliencehub" - resourceexplorer2_sdkv2 "github.com/aws/aws-sdk-go-v2/service/resourceexplorer2" - resourcegroups_sdkv2 "github.com/aws/aws-sdk-go-v2/service/resourcegroups" - resourcegroupstaggingapi_sdkv2 "github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi" - rolesanywhere_sdkv2 "github.com/aws/aws-sdk-go-v2/service/rolesanywhere" - route53_sdkv2 "github.com/aws/aws-sdk-go-v2/service/route53" - route53domains_sdkv2 "github.com/aws/aws-sdk-go-v2/service/route53domains" - route53profiles_sdkv2 "github.com/aws/aws-sdk-go-v2/service/route53profiles" - route53recoverycontrolconfig_sdkv2 "github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig" - route53recoveryreadiness_sdkv2 "github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness" - route53resolver_sdkv2 "github.com/aws/aws-sdk-go-v2/service/route53resolver" - rum_sdkv2 "github.com/aws/aws-sdk-go-v2/service/rum" - s3_sdkv2 "github.com/aws/aws-sdk-go-v2/service/s3" - s3control_sdkv2 "github.com/aws/aws-sdk-go-v2/service/s3control" - s3outposts_sdkv2 "github.com/aws/aws-sdk-go-v2/service/s3outposts" - sagemaker_sdkv2 "github.com/aws/aws-sdk-go-v2/service/sagemaker" - scheduler_sdkv2 "github.com/aws/aws-sdk-go-v2/service/scheduler" - schemas_sdkv2 "github.com/aws/aws-sdk-go-v2/service/schemas" - secretsmanager_sdkv2 "github.com/aws/aws-sdk-go-v2/service/secretsmanager" - securityhub_sdkv2 "github.com/aws/aws-sdk-go-v2/service/securityhub" - securitylake_sdkv2 "github.com/aws/aws-sdk-go-v2/service/securitylake" - serverlessapplicationrepository_sdkv2 "github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository" - servicecatalog_sdkv2 "github.com/aws/aws-sdk-go-v2/service/servicecatalog" - servicecatalogappregistry_sdkv2 "github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry" - servicediscovery_sdkv2 "github.com/aws/aws-sdk-go-v2/service/servicediscovery" - servicequotas_sdkv2 "github.com/aws/aws-sdk-go-v2/service/servicequotas" - ses_sdkv2 "github.com/aws/aws-sdk-go-v2/service/ses" - sesv2_sdkv2 "github.com/aws/aws-sdk-go-v2/service/sesv2" - sfn_sdkv2 "github.com/aws/aws-sdk-go-v2/service/sfn" - shield_sdkv2 "github.com/aws/aws-sdk-go-v2/service/shield" - signer_sdkv2 "github.com/aws/aws-sdk-go-v2/service/signer" - sns_sdkv2 "github.com/aws/aws-sdk-go-v2/service/sns" - sqs_sdkv2 "github.com/aws/aws-sdk-go-v2/service/sqs" - ssm_sdkv2 "github.com/aws/aws-sdk-go-v2/service/ssm" - ssmcontacts_sdkv2 "github.com/aws/aws-sdk-go-v2/service/ssmcontacts" - ssmincidents_sdkv2 "github.com/aws/aws-sdk-go-v2/service/ssmincidents" - ssmquicksetup_sdkv2 "github.com/aws/aws-sdk-go-v2/service/ssmquicksetup" - ssmsap_sdkv2 "github.com/aws/aws-sdk-go-v2/service/ssmsap" - sso_sdkv2 "github.com/aws/aws-sdk-go-v2/service/sso" - ssoadmin_sdkv2 "github.com/aws/aws-sdk-go-v2/service/ssoadmin" - storagegateway_sdkv2 "github.com/aws/aws-sdk-go-v2/service/storagegateway" - sts_sdkv2 "github.com/aws/aws-sdk-go-v2/service/sts" - swf_sdkv2 "github.com/aws/aws-sdk-go-v2/service/swf" - synthetics_sdkv2 "github.com/aws/aws-sdk-go-v2/service/synthetics" - timestreaminfluxdb_sdkv2 "github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb" - timestreamwrite_sdkv2 "github.com/aws/aws-sdk-go-v2/service/timestreamwrite" - transcribe_sdkv2 "github.com/aws/aws-sdk-go-v2/service/transcribe" - transfer_sdkv2 "github.com/aws/aws-sdk-go-v2/service/transfer" - verifiedpermissions_sdkv2 "github.com/aws/aws-sdk-go-v2/service/verifiedpermissions" - vpclattice_sdkv2 "github.com/aws/aws-sdk-go-v2/service/vpclattice" - waf_sdkv2 "github.com/aws/aws-sdk-go-v2/service/waf" - wafregional_sdkv2 "github.com/aws/aws-sdk-go-v2/service/wafregional" - wafv2_sdkv2 "github.com/aws/aws-sdk-go-v2/service/wafv2" - wellarchitected_sdkv2 "github.com/aws/aws-sdk-go-v2/service/wellarchitected" - worklink_sdkv2 "github.com/aws/aws-sdk-go-v2/service/worklink" - workspaces_sdkv2 "github.com/aws/aws-sdk-go-v2/service/workspaces" - workspacesweb_sdkv2 "github.com/aws/aws-sdk-go-v2/service/workspacesweb" - xray_sdkv2 "github.com/aws/aws-sdk-go-v2/service/xray" - simpledb_sdkv1 "github.com/aws/aws-sdk-go/service/simpledb" + "github.com/aws/aws-sdk-go-v2/service/accessanalyzer" + "github.com/aws/aws-sdk-go-v2/service/account" + "github.com/aws/aws-sdk-go-v2/service/acm" + "github.com/aws/aws-sdk-go-v2/service/acmpca" + "github.com/aws/aws-sdk-go-v2/service/amp" + "github.com/aws/aws-sdk-go-v2/service/amplify" + "github.com/aws/aws-sdk-go-v2/service/apigateway" + "github.com/aws/aws-sdk-go-v2/service/apigatewayv2" + "github.com/aws/aws-sdk-go-v2/service/appconfig" + "github.com/aws/aws-sdk-go-v2/service/appfabric" + "github.com/aws/aws-sdk-go-v2/service/appflow" + "github.com/aws/aws-sdk-go-v2/service/appintegrations" + "github.com/aws/aws-sdk-go-v2/service/applicationautoscaling" + "github.com/aws/aws-sdk-go-v2/service/applicationinsights" + "github.com/aws/aws-sdk-go-v2/service/applicationsignals" + "github.com/aws/aws-sdk-go-v2/service/appmesh" + "github.com/aws/aws-sdk-go-v2/service/apprunner" + "github.com/aws/aws-sdk-go-v2/service/appstream" + "github.com/aws/aws-sdk-go-v2/service/appsync" + "github.com/aws/aws-sdk-go-v2/service/athena" + "github.com/aws/aws-sdk-go-v2/service/auditmanager" + "github.com/aws/aws-sdk-go-v2/service/autoscaling" + "github.com/aws/aws-sdk-go-v2/service/autoscalingplans" + "github.com/aws/aws-sdk-go-v2/service/backup" + "github.com/aws/aws-sdk-go-v2/service/batch" + "github.com/aws/aws-sdk-go-v2/service/bcmdataexports" + "github.com/aws/aws-sdk-go-v2/service/bedrock" + "github.com/aws/aws-sdk-go-v2/service/bedrockagent" + "github.com/aws/aws-sdk-go-v2/service/budgets" + "github.com/aws/aws-sdk-go-v2/service/chatbot" + "github.com/aws/aws-sdk-go-v2/service/chime" + "github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines" + "github.com/aws/aws-sdk-go-v2/service/chimesdkvoice" + "github.com/aws/aws-sdk-go-v2/service/cleanrooms" + "github.com/aws/aws-sdk-go-v2/service/cloud9" + "github.com/aws/aws-sdk-go-v2/service/cloudcontrol" + "github.com/aws/aws-sdk-go-v2/service/cloudformation" + "github.com/aws/aws-sdk-go-v2/service/cloudfront" + "github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore" + "github.com/aws/aws-sdk-go-v2/service/cloudhsmv2" + "github.com/aws/aws-sdk-go-v2/service/cloudsearch" + "github.com/aws/aws-sdk-go-v2/service/cloudtrail" + "github.com/aws/aws-sdk-go-v2/service/cloudwatch" + "github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs" + "github.com/aws/aws-sdk-go-v2/service/codeartifact" + "github.com/aws/aws-sdk-go-v2/service/codebuild" + "github.com/aws/aws-sdk-go-v2/service/codecatalyst" + "github.com/aws/aws-sdk-go-v2/service/codecommit" + "github.com/aws/aws-sdk-go-v2/service/codeconnections" + "github.com/aws/aws-sdk-go-v2/service/codedeploy" + "github.com/aws/aws-sdk-go-v2/service/codeguruprofiler" + "github.com/aws/aws-sdk-go-v2/service/codegurureviewer" + "github.com/aws/aws-sdk-go-v2/service/codepipeline" + "github.com/aws/aws-sdk-go-v2/service/codestarconnections" + "github.com/aws/aws-sdk-go-v2/service/codestarnotifications" + "github.com/aws/aws-sdk-go-v2/service/cognitoidentity" + "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider" + "github.com/aws/aws-sdk-go-v2/service/comprehend" + "github.com/aws/aws-sdk-go-v2/service/computeoptimizer" + "github.com/aws/aws-sdk-go-v2/service/configservice" + "github.com/aws/aws-sdk-go-v2/service/connect" + "github.com/aws/aws-sdk-go-v2/service/connectcases" + "github.com/aws/aws-sdk-go-v2/service/controltower" + "github.com/aws/aws-sdk-go-v2/service/costandusagereportservice" + "github.com/aws/aws-sdk-go-v2/service/costexplorer" + "github.com/aws/aws-sdk-go-v2/service/costoptimizationhub" + "github.com/aws/aws-sdk-go-v2/service/customerprofiles" + "github.com/aws/aws-sdk-go-v2/service/databasemigrationservice" + "github.com/aws/aws-sdk-go-v2/service/databrew" + "github.com/aws/aws-sdk-go-v2/service/dataexchange" + "github.com/aws/aws-sdk-go-v2/service/datapipeline" + "github.com/aws/aws-sdk-go-v2/service/datasync" + "github.com/aws/aws-sdk-go-v2/service/datazone" + "github.com/aws/aws-sdk-go-v2/service/dax" + "github.com/aws/aws-sdk-go-v2/service/detective" + "github.com/aws/aws-sdk-go-v2/service/devicefarm" + "github.com/aws/aws-sdk-go-v2/service/devopsguru" + "github.com/aws/aws-sdk-go-v2/service/directconnect" + "github.com/aws/aws-sdk-go-v2/service/directoryservice" + "github.com/aws/aws-sdk-go-v2/service/dlm" + "github.com/aws/aws-sdk-go-v2/service/docdb" + "github.com/aws/aws-sdk-go-v2/service/docdbelastic" + "github.com/aws/aws-sdk-go-v2/service/drs" + "github.com/aws/aws-sdk-go-v2/service/dynamodb" + "github.com/aws/aws-sdk-go-v2/service/ec2" + "github.com/aws/aws-sdk-go-v2/service/ecr" + "github.com/aws/aws-sdk-go-v2/service/ecrpublic" + "github.com/aws/aws-sdk-go-v2/service/ecs" + "github.com/aws/aws-sdk-go-v2/service/efs" + "github.com/aws/aws-sdk-go-v2/service/eks" + "github.com/aws/aws-sdk-go-v2/service/elasticache" + "github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk" + "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing" + "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2" + "github.com/aws/aws-sdk-go-v2/service/elasticsearchservice" + "github.com/aws/aws-sdk-go-v2/service/elastictranscoder" + "github.com/aws/aws-sdk-go-v2/service/emr" + "github.com/aws/aws-sdk-go-v2/service/emrcontainers" + "github.com/aws/aws-sdk-go-v2/service/emrserverless" + "github.com/aws/aws-sdk-go-v2/service/eventbridge" + "github.com/aws/aws-sdk-go-v2/service/evidently" + "github.com/aws/aws-sdk-go-v2/service/finspace" + "github.com/aws/aws-sdk-go-v2/service/firehose" + "github.com/aws/aws-sdk-go-v2/service/fis" + "github.com/aws/aws-sdk-go-v2/service/fms" + "github.com/aws/aws-sdk-go-v2/service/fsx" + "github.com/aws/aws-sdk-go-v2/service/gamelift" + "github.com/aws/aws-sdk-go-v2/service/glacier" + "github.com/aws/aws-sdk-go-v2/service/globalaccelerator" + "github.com/aws/aws-sdk-go-v2/service/glue" + "github.com/aws/aws-sdk-go-v2/service/grafana" + "github.com/aws/aws-sdk-go-v2/service/greengrass" + "github.com/aws/aws-sdk-go-v2/service/groundstation" + "github.com/aws/aws-sdk-go-v2/service/guardduty" + "github.com/aws/aws-sdk-go-v2/service/healthlake" + "github.com/aws/aws-sdk-go-v2/service/iam" + "github.com/aws/aws-sdk-go-v2/service/identitystore" + "github.com/aws/aws-sdk-go-v2/service/imagebuilder" + "github.com/aws/aws-sdk-go-v2/service/inspector" + "github.com/aws/aws-sdk-go-v2/service/inspector2" + "github.com/aws/aws-sdk-go-v2/service/internetmonitor" + "github.com/aws/aws-sdk-go-v2/service/iot" + "github.com/aws/aws-sdk-go-v2/service/iotanalytics" + "github.com/aws/aws-sdk-go-v2/service/iotevents" + "github.com/aws/aws-sdk-go-v2/service/ivs" + "github.com/aws/aws-sdk-go-v2/service/ivschat" + "github.com/aws/aws-sdk-go-v2/service/kafka" + "github.com/aws/aws-sdk-go-v2/service/kafkaconnect" + "github.com/aws/aws-sdk-go-v2/service/kendra" + "github.com/aws/aws-sdk-go-v2/service/keyspaces" + "github.com/aws/aws-sdk-go-v2/service/kinesis" + "github.com/aws/aws-sdk-go-v2/service/kinesisanalytics" + "github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2" + "github.com/aws/aws-sdk-go-v2/service/kinesisvideo" + "github.com/aws/aws-sdk-go-v2/service/kms" + "github.com/aws/aws-sdk-go-v2/service/lakeformation" + "github.com/aws/aws-sdk-go-v2/service/lambda" + "github.com/aws/aws-sdk-go-v2/service/launchwizard" + "github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice" + "github.com/aws/aws-sdk-go-v2/service/lexmodelsv2" + "github.com/aws/aws-sdk-go-v2/service/licensemanager" + "github.com/aws/aws-sdk-go-v2/service/lightsail" + "github.com/aws/aws-sdk-go-v2/service/location" + "github.com/aws/aws-sdk-go-v2/service/lookoutmetrics" + "github.com/aws/aws-sdk-go-v2/service/m2" + "github.com/aws/aws-sdk-go-v2/service/macie2" + "github.com/aws/aws-sdk-go-v2/service/mediaconnect" + "github.com/aws/aws-sdk-go-v2/service/mediaconvert" + "github.com/aws/aws-sdk-go-v2/service/medialive" + "github.com/aws/aws-sdk-go-v2/service/mediapackage" + "github.com/aws/aws-sdk-go-v2/service/mediapackagev2" + "github.com/aws/aws-sdk-go-v2/service/mediastore" + "github.com/aws/aws-sdk-go-v2/service/memorydb" + "github.com/aws/aws-sdk-go-v2/service/mq" + "github.com/aws/aws-sdk-go-v2/service/mwaa" + "github.com/aws/aws-sdk-go-v2/service/neptune" + "github.com/aws/aws-sdk-go-v2/service/neptunegraph" + "github.com/aws/aws-sdk-go-v2/service/networkfirewall" + "github.com/aws/aws-sdk-go-v2/service/networkmanager" + "github.com/aws/aws-sdk-go-v2/service/networkmonitor" + "github.com/aws/aws-sdk-go-v2/service/oam" + "github.com/aws/aws-sdk-go-v2/service/opensearch" + "github.com/aws/aws-sdk-go-v2/service/opensearchserverless" + "github.com/aws/aws-sdk-go-v2/service/opsworks" + "github.com/aws/aws-sdk-go-v2/service/organizations" + "github.com/aws/aws-sdk-go-v2/service/osis" + "github.com/aws/aws-sdk-go-v2/service/outposts" + "github.com/aws/aws-sdk-go-v2/service/paymentcryptography" + "github.com/aws/aws-sdk-go-v2/service/pcaconnectorad" + "github.com/aws/aws-sdk-go-v2/service/pcs" + "github.com/aws/aws-sdk-go-v2/service/pinpoint" + "github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2" + "github.com/aws/aws-sdk-go-v2/service/pipes" + "github.com/aws/aws-sdk-go-v2/service/polly" + "github.com/aws/aws-sdk-go-v2/service/pricing" + "github.com/aws/aws-sdk-go-v2/service/qbusiness" + "github.com/aws/aws-sdk-go-v2/service/qldb" + "github.com/aws/aws-sdk-go-v2/service/quicksight" + "github.com/aws/aws-sdk-go-v2/service/ram" + "github.com/aws/aws-sdk-go-v2/service/rbin" + "github.com/aws/aws-sdk-go-v2/service/rds" + "github.com/aws/aws-sdk-go-v2/service/redshift" + "github.com/aws/aws-sdk-go-v2/service/redshiftdata" + "github.com/aws/aws-sdk-go-v2/service/redshiftserverless" + "github.com/aws/aws-sdk-go-v2/service/rekognition" + "github.com/aws/aws-sdk-go-v2/service/resiliencehub" + "github.com/aws/aws-sdk-go-v2/service/resourceexplorer2" + "github.com/aws/aws-sdk-go-v2/service/resourcegroups" + "github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi" + "github.com/aws/aws-sdk-go-v2/service/rolesanywhere" + "github.com/aws/aws-sdk-go-v2/service/route53" + "github.com/aws/aws-sdk-go-v2/service/route53domains" + "github.com/aws/aws-sdk-go-v2/service/route53profiles" + "github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig" + "github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness" + "github.com/aws/aws-sdk-go-v2/service/route53resolver" + "github.com/aws/aws-sdk-go-v2/service/rum" + "github.com/aws/aws-sdk-go-v2/service/s3" + "github.com/aws/aws-sdk-go-v2/service/s3control" + "github.com/aws/aws-sdk-go-v2/service/s3outposts" + "github.com/aws/aws-sdk-go-v2/service/sagemaker" + "github.com/aws/aws-sdk-go-v2/service/scheduler" + "github.com/aws/aws-sdk-go-v2/service/schemas" + "github.com/aws/aws-sdk-go-v2/service/secretsmanager" + "github.com/aws/aws-sdk-go-v2/service/securityhub" + "github.com/aws/aws-sdk-go-v2/service/securitylake" + "github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository" + "github.com/aws/aws-sdk-go-v2/service/servicecatalog" + "github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry" + "github.com/aws/aws-sdk-go-v2/service/servicediscovery" + "github.com/aws/aws-sdk-go-v2/service/servicequotas" + "github.com/aws/aws-sdk-go-v2/service/ses" + "github.com/aws/aws-sdk-go-v2/service/sesv2" + "github.com/aws/aws-sdk-go-v2/service/sfn" + "github.com/aws/aws-sdk-go-v2/service/shield" + "github.com/aws/aws-sdk-go-v2/service/signer" + "github.com/aws/aws-sdk-go-v2/service/sns" + "github.com/aws/aws-sdk-go-v2/service/sqs" + "github.com/aws/aws-sdk-go-v2/service/ssm" + "github.com/aws/aws-sdk-go-v2/service/ssmcontacts" + "github.com/aws/aws-sdk-go-v2/service/ssmincidents" + "github.com/aws/aws-sdk-go-v2/service/ssmquicksetup" + "github.com/aws/aws-sdk-go-v2/service/ssmsap" + "github.com/aws/aws-sdk-go-v2/service/sso" + "github.com/aws/aws-sdk-go-v2/service/ssoadmin" + "github.com/aws/aws-sdk-go-v2/service/storagegateway" + "github.com/aws/aws-sdk-go-v2/service/sts" + "github.com/aws/aws-sdk-go-v2/service/swf" + "github.com/aws/aws-sdk-go-v2/service/synthetics" + "github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb" + "github.com/aws/aws-sdk-go-v2/service/timestreamwrite" + "github.com/aws/aws-sdk-go-v2/service/transcribe" + "github.com/aws/aws-sdk-go-v2/service/transfer" + "github.com/aws/aws-sdk-go-v2/service/verifiedpermissions" + "github.com/aws/aws-sdk-go-v2/service/vpclattice" + "github.com/aws/aws-sdk-go-v2/service/waf" + "github.com/aws/aws-sdk-go-v2/service/wafregional" + "github.com/aws/aws-sdk-go-v2/service/wafv2" + "github.com/aws/aws-sdk-go-v2/service/wellarchitected" + "github.com/aws/aws-sdk-go-v2/service/worklink" + "github.com/aws/aws-sdk-go-v2/service/workspaces" + "github.com/aws/aws-sdk-go-v2/service/workspacesweb" + "github.com/aws/aws-sdk-go-v2/service/xray" "github.com/hashicorp/terraform-provider-aws/internal/errs" "github.com/hashicorp/terraform-provider-aws/names" ) -func (c *AWSClient) ACMClient(ctx context.Context) *acm_sdkv2.Client { - return errs.Must(client[*acm_sdkv2.Client](ctx, c, names.ACM, make(map[string]any))) +func (c *AWSClient) ACMClient(ctx context.Context) *acm.Client { + return errs.Must(client[*acm.Client](ctx, c, names.ACM, make(map[string]any))) } -func (c *AWSClient) ACMPCAClient(ctx context.Context) *acmpca_sdkv2.Client { - return errs.Must(client[*acmpca_sdkv2.Client](ctx, c, names.ACMPCA, make(map[string]any))) +func (c *AWSClient) ACMPCAClient(ctx context.Context) *acmpca.Client { + return errs.Must(client[*acmpca.Client](ctx, c, names.ACMPCA, make(map[string]any))) } -func (c *AWSClient) AMPClient(ctx context.Context) *amp_sdkv2.Client { - return errs.Must(client[*amp_sdkv2.Client](ctx, c, names.AMP, make(map[string]any))) +func (c *AWSClient) AMPClient(ctx context.Context) *amp.Client { + return errs.Must(client[*amp.Client](ctx, c, names.AMP, make(map[string]any))) } -func (c *AWSClient) APIGatewayClient(ctx context.Context) *apigateway_sdkv2.Client { - return errs.Must(client[*apigateway_sdkv2.Client](ctx, c, names.APIGateway, make(map[string]any))) +func (c *AWSClient) APIGatewayClient(ctx context.Context) *apigateway.Client { + return errs.Must(client[*apigateway.Client](ctx, c, names.APIGateway, make(map[string]any))) } -func (c *AWSClient) APIGatewayV2Client(ctx context.Context) *apigatewayv2_sdkv2.Client { - return errs.Must(client[*apigatewayv2_sdkv2.Client](ctx, c, names.APIGatewayV2, make(map[string]any))) +func (c *AWSClient) APIGatewayV2Client(ctx context.Context) *apigatewayv2.Client { + return errs.Must(client[*apigatewayv2.Client](ctx, c, names.APIGatewayV2, make(map[string]any))) } -func (c *AWSClient) AccessAnalyzerClient(ctx context.Context) *accessanalyzer_sdkv2.Client { - return errs.Must(client[*accessanalyzer_sdkv2.Client](ctx, c, names.AccessAnalyzer, make(map[string]any))) +func (c *AWSClient) AccessAnalyzerClient(ctx context.Context) *accessanalyzer.Client { + return errs.Must(client[*accessanalyzer.Client](ctx, c, names.AccessAnalyzer, make(map[string]any))) } -func (c *AWSClient) AccountClient(ctx context.Context) *account_sdkv2.Client { - return errs.Must(client[*account_sdkv2.Client](ctx, c, names.Account, make(map[string]any))) +func (c *AWSClient) AccountClient(ctx context.Context) *account.Client { + return errs.Must(client[*account.Client](ctx, c, names.Account, make(map[string]any))) } -func (c *AWSClient) AmplifyClient(ctx context.Context) *amplify_sdkv2.Client { - return errs.Must(client[*amplify_sdkv2.Client](ctx, c, names.Amplify, make(map[string]any))) +func (c *AWSClient) AmplifyClient(ctx context.Context) *amplify.Client { + return errs.Must(client[*amplify.Client](ctx, c, names.Amplify, make(map[string]any))) } -func (c *AWSClient) AppAutoScalingClient(ctx context.Context) *applicationautoscaling_sdkv2.Client { - return errs.Must(client[*applicationautoscaling_sdkv2.Client](ctx, c, names.AppAutoScaling, make(map[string]any))) +func (c *AWSClient) AppAutoScalingClient(ctx context.Context) *applicationautoscaling.Client { + return errs.Must(client[*applicationautoscaling.Client](ctx, c, names.AppAutoScaling, make(map[string]any))) } -func (c *AWSClient) AppConfigClient(ctx context.Context) *appconfig_sdkv2.Client { - return errs.Must(client[*appconfig_sdkv2.Client](ctx, c, names.AppConfig, make(map[string]any))) +func (c *AWSClient) AppConfigClient(ctx context.Context) *appconfig.Client { + return errs.Must(client[*appconfig.Client](ctx, c, names.AppConfig, make(map[string]any))) } -func (c *AWSClient) AppFabricClient(ctx context.Context) *appfabric_sdkv2.Client { - return errs.Must(client[*appfabric_sdkv2.Client](ctx, c, names.AppFabric, make(map[string]any))) +func (c *AWSClient) AppFabricClient(ctx context.Context) *appfabric.Client { + return errs.Must(client[*appfabric.Client](ctx, c, names.AppFabric, make(map[string]any))) } -func (c *AWSClient) AppFlowClient(ctx context.Context) *appflow_sdkv2.Client { - return errs.Must(client[*appflow_sdkv2.Client](ctx, c, names.AppFlow, make(map[string]any))) +func (c *AWSClient) AppFlowClient(ctx context.Context) *appflow.Client { + return errs.Must(client[*appflow.Client](ctx, c, names.AppFlow, make(map[string]any))) } -func (c *AWSClient) AppIntegrationsClient(ctx context.Context) *appintegrations_sdkv2.Client { - return errs.Must(client[*appintegrations_sdkv2.Client](ctx, c, names.AppIntegrations, make(map[string]any))) +func (c *AWSClient) AppIntegrationsClient(ctx context.Context) *appintegrations.Client { + return errs.Must(client[*appintegrations.Client](ctx, c, names.AppIntegrations, make(map[string]any))) } -func (c *AWSClient) AppMeshClient(ctx context.Context) *appmesh_sdkv2.Client { - return errs.Must(client[*appmesh_sdkv2.Client](ctx, c, names.AppMesh, make(map[string]any))) +func (c *AWSClient) AppMeshClient(ctx context.Context) *appmesh.Client { + return errs.Must(client[*appmesh.Client](ctx, c, names.AppMesh, make(map[string]any))) } -func (c *AWSClient) AppRunnerClient(ctx context.Context) *apprunner_sdkv2.Client { - return errs.Must(client[*apprunner_sdkv2.Client](ctx, c, names.AppRunner, make(map[string]any))) +func (c *AWSClient) AppRunnerClient(ctx context.Context) *apprunner.Client { + return errs.Must(client[*apprunner.Client](ctx, c, names.AppRunner, make(map[string]any))) } -func (c *AWSClient) AppStreamClient(ctx context.Context) *appstream_sdkv2.Client { - return errs.Must(client[*appstream_sdkv2.Client](ctx, c, names.AppStream, make(map[string]any))) +func (c *AWSClient) AppStreamClient(ctx context.Context) *appstream.Client { + return errs.Must(client[*appstream.Client](ctx, c, names.AppStream, make(map[string]any))) } -func (c *AWSClient) AppSyncClient(ctx context.Context) *appsync_sdkv2.Client { - return errs.Must(client[*appsync_sdkv2.Client](ctx, c, names.AppSync, make(map[string]any))) +func (c *AWSClient) AppSyncClient(ctx context.Context) *appsync.Client { + return errs.Must(client[*appsync.Client](ctx, c, names.AppSync, make(map[string]any))) } -func (c *AWSClient) ApplicationInsightsClient(ctx context.Context) *applicationinsights_sdkv2.Client { - return errs.Must(client[*applicationinsights_sdkv2.Client](ctx, c, names.ApplicationInsights, make(map[string]any))) +func (c *AWSClient) ApplicationInsightsClient(ctx context.Context) *applicationinsights.Client { + return errs.Must(client[*applicationinsights.Client](ctx, c, names.ApplicationInsights, make(map[string]any))) } -func (c *AWSClient) ApplicationSignalsClient(ctx context.Context) *applicationsignals_sdkv2.Client { - return errs.Must(client[*applicationsignals_sdkv2.Client](ctx, c, names.ApplicationSignals, make(map[string]any))) +func (c *AWSClient) ApplicationSignalsClient(ctx context.Context) *applicationsignals.Client { + return errs.Must(client[*applicationsignals.Client](ctx, c, names.ApplicationSignals, make(map[string]any))) } -func (c *AWSClient) AthenaClient(ctx context.Context) *athena_sdkv2.Client { - return errs.Must(client[*athena_sdkv2.Client](ctx, c, names.Athena, make(map[string]any))) +func (c *AWSClient) AthenaClient(ctx context.Context) *athena.Client { + return errs.Must(client[*athena.Client](ctx, c, names.Athena, make(map[string]any))) } -func (c *AWSClient) AuditManagerClient(ctx context.Context) *auditmanager_sdkv2.Client { - return errs.Must(client[*auditmanager_sdkv2.Client](ctx, c, names.AuditManager, make(map[string]any))) +func (c *AWSClient) AuditManagerClient(ctx context.Context) *auditmanager.Client { + return errs.Must(client[*auditmanager.Client](ctx, c, names.AuditManager, make(map[string]any))) } -func (c *AWSClient) AutoScalingClient(ctx context.Context) *autoscaling_sdkv2.Client { - return errs.Must(client[*autoscaling_sdkv2.Client](ctx, c, names.AutoScaling, make(map[string]any))) +func (c *AWSClient) AutoScalingClient(ctx context.Context) *autoscaling.Client { + return errs.Must(client[*autoscaling.Client](ctx, c, names.AutoScaling, make(map[string]any))) } -func (c *AWSClient) AutoScalingPlansClient(ctx context.Context) *autoscalingplans_sdkv2.Client { - return errs.Must(client[*autoscalingplans_sdkv2.Client](ctx, c, names.AutoScalingPlans, make(map[string]any))) +func (c *AWSClient) AutoScalingPlansClient(ctx context.Context) *autoscalingplans.Client { + return errs.Must(client[*autoscalingplans.Client](ctx, c, names.AutoScalingPlans, make(map[string]any))) } -func (c *AWSClient) BCMDataExportsClient(ctx context.Context) *bcmdataexports_sdkv2.Client { - return errs.Must(client[*bcmdataexports_sdkv2.Client](ctx, c, names.BCMDataExports, make(map[string]any))) +func (c *AWSClient) BCMDataExportsClient(ctx context.Context) *bcmdataexports.Client { + return errs.Must(client[*bcmdataexports.Client](ctx, c, names.BCMDataExports, make(map[string]any))) } -func (c *AWSClient) BackupClient(ctx context.Context) *backup_sdkv2.Client { - return errs.Must(client[*backup_sdkv2.Client](ctx, c, names.Backup, make(map[string]any))) +func (c *AWSClient) BackupClient(ctx context.Context) *backup.Client { + return errs.Must(client[*backup.Client](ctx, c, names.Backup, make(map[string]any))) } -func (c *AWSClient) BatchClient(ctx context.Context) *batch_sdkv2.Client { - return errs.Must(client[*batch_sdkv2.Client](ctx, c, names.Batch, make(map[string]any))) +func (c *AWSClient) BatchClient(ctx context.Context) *batch.Client { + return errs.Must(client[*batch.Client](ctx, c, names.Batch, make(map[string]any))) } -func (c *AWSClient) BedrockClient(ctx context.Context) *bedrock_sdkv2.Client { - return errs.Must(client[*bedrock_sdkv2.Client](ctx, c, names.Bedrock, make(map[string]any))) +func (c *AWSClient) BedrockClient(ctx context.Context) *bedrock.Client { + return errs.Must(client[*bedrock.Client](ctx, c, names.Bedrock, make(map[string]any))) } -func (c *AWSClient) BedrockAgentClient(ctx context.Context) *bedrockagent_sdkv2.Client { - return errs.Must(client[*bedrockagent_sdkv2.Client](ctx, c, names.BedrockAgent, make(map[string]any))) +func (c *AWSClient) BedrockAgentClient(ctx context.Context) *bedrockagent.Client { + return errs.Must(client[*bedrockagent.Client](ctx, c, names.BedrockAgent, make(map[string]any))) } -func (c *AWSClient) BudgetsClient(ctx context.Context) *budgets_sdkv2.Client { - return errs.Must(client[*budgets_sdkv2.Client](ctx, c, names.Budgets, make(map[string]any))) +func (c *AWSClient) BudgetsClient(ctx context.Context) *budgets.Client { + return errs.Must(client[*budgets.Client](ctx, c, names.Budgets, make(map[string]any))) } -func (c *AWSClient) CEClient(ctx context.Context) *costexplorer_sdkv2.Client { - return errs.Must(client[*costexplorer_sdkv2.Client](ctx, c, names.CE, make(map[string]any))) +func (c *AWSClient) CEClient(ctx context.Context) *costexplorer.Client { + return errs.Must(client[*costexplorer.Client](ctx, c, names.CE, make(map[string]any))) } -func (c *AWSClient) CURClient(ctx context.Context) *costandusagereportservice_sdkv2.Client { - return errs.Must(client[*costandusagereportservice_sdkv2.Client](ctx, c, names.CUR, make(map[string]any))) +func (c *AWSClient) CURClient(ctx context.Context) *costandusagereportservice.Client { + return errs.Must(client[*costandusagereportservice.Client](ctx, c, names.CUR, make(map[string]any))) } -func (c *AWSClient) ChatbotClient(ctx context.Context) *chatbot_sdkv2.Client { - return errs.Must(client[*chatbot_sdkv2.Client](ctx, c, names.Chatbot, make(map[string]any))) +func (c *AWSClient) ChatbotClient(ctx context.Context) *chatbot.Client { + return errs.Must(client[*chatbot.Client](ctx, c, names.Chatbot, make(map[string]any))) } -func (c *AWSClient) ChimeClient(ctx context.Context) *chime_sdkv2.Client { - return errs.Must(client[*chime_sdkv2.Client](ctx, c, names.Chime, make(map[string]any))) +func (c *AWSClient) ChimeClient(ctx context.Context) *chime.Client { + return errs.Must(client[*chime.Client](ctx, c, names.Chime, make(map[string]any))) } -func (c *AWSClient) ChimeSDKMediaPipelinesClient(ctx context.Context) *chimesdkmediapipelines_sdkv2.Client { - return errs.Must(client[*chimesdkmediapipelines_sdkv2.Client](ctx, c, names.ChimeSDKMediaPipelines, make(map[string]any))) +func (c *AWSClient) ChimeSDKMediaPipelinesClient(ctx context.Context) *chimesdkmediapipelines.Client { + return errs.Must(client[*chimesdkmediapipelines.Client](ctx, c, names.ChimeSDKMediaPipelines, make(map[string]any))) } -func (c *AWSClient) ChimeSDKVoiceClient(ctx context.Context) *chimesdkvoice_sdkv2.Client { - return errs.Must(client[*chimesdkvoice_sdkv2.Client](ctx, c, names.ChimeSDKVoice, make(map[string]any))) +func (c *AWSClient) ChimeSDKVoiceClient(ctx context.Context) *chimesdkvoice.Client { + return errs.Must(client[*chimesdkvoice.Client](ctx, c, names.ChimeSDKVoice, make(map[string]any))) } -func (c *AWSClient) CleanRoomsClient(ctx context.Context) *cleanrooms_sdkv2.Client { - return errs.Must(client[*cleanrooms_sdkv2.Client](ctx, c, names.CleanRooms, make(map[string]any))) +func (c *AWSClient) CleanRoomsClient(ctx context.Context) *cleanrooms.Client { + return errs.Must(client[*cleanrooms.Client](ctx, c, names.CleanRooms, make(map[string]any))) } -func (c *AWSClient) Cloud9Client(ctx context.Context) *cloud9_sdkv2.Client { - return errs.Must(client[*cloud9_sdkv2.Client](ctx, c, names.Cloud9, make(map[string]any))) +func (c *AWSClient) Cloud9Client(ctx context.Context) *cloud9.Client { + return errs.Must(client[*cloud9.Client](ctx, c, names.Cloud9, make(map[string]any))) } -func (c *AWSClient) CloudControlClient(ctx context.Context) *cloudcontrol_sdkv2.Client { - return errs.Must(client[*cloudcontrol_sdkv2.Client](ctx, c, names.CloudControl, make(map[string]any))) +func (c *AWSClient) CloudControlClient(ctx context.Context) *cloudcontrol.Client { + return errs.Must(client[*cloudcontrol.Client](ctx, c, names.CloudControl, make(map[string]any))) } -func (c *AWSClient) CloudFormationClient(ctx context.Context) *cloudformation_sdkv2.Client { - return errs.Must(client[*cloudformation_sdkv2.Client](ctx, c, names.CloudFormation, make(map[string]any))) +func (c *AWSClient) CloudFormationClient(ctx context.Context) *cloudformation.Client { + return errs.Must(client[*cloudformation.Client](ctx, c, names.CloudFormation, make(map[string]any))) } -func (c *AWSClient) CloudFrontClient(ctx context.Context) *cloudfront_sdkv2.Client { - return errs.Must(client[*cloudfront_sdkv2.Client](ctx, c, names.CloudFront, make(map[string]any))) +func (c *AWSClient) CloudFrontClient(ctx context.Context) *cloudfront.Client { + return errs.Must(client[*cloudfront.Client](ctx, c, names.CloudFront, make(map[string]any))) } -func (c *AWSClient) CloudFrontKeyValueStoreClient(ctx context.Context) *cloudfrontkeyvaluestore_sdkv2.Client { - return errs.Must(client[*cloudfrontkeyvaluestore_sdkv2.Client](ctx, c, names.CloudFrontKeyValueStore, make(map[string]any))) +func (c *AWSClient) CloudFrontKeyValueStoreClient(ctx context.Context) *cloudfrontkeyvaluestore.Client { + return errs.Must(client[*cloudfrontkeyvaluestore.Client](ctx, c, names.CloudFrontKeyValueStore, make(map[string]any))) } -func (c *AWSClient) CloudHSMV2Client(ctx context.Context) *cloudhsmv2_sdkv2.Client { - return errs.Must(client[*cloudhsmv2_sdkv2.Client](ctx, c, names.CloudHSMV2, make(map[string]any))) +func (c *AWSClient) CloudHSMV2Client(ctx context.Context) *cloudhsmv2.Client { + return errs.Must(client[*cloudhsmv2.Client](ctx, c, names.CloudHSMV2, make(map[string]any))) } -func (c *AWSClient) CloudSearchClient(ctx context.Context) *cloudsearch_sdkv2.Client { - return errs.Must(client[*cloudsearch_sdkv2.Client](ctx, c, names.CloudSearch, make(map[string]any))) +func (c *AWSClient) CloudSearchClient(ctx context.Context) *cloudsearch.Client { + return errs.Must(client[*cloudsearch.Client](ctx, c, names.CloudSearch, make(map[string]any))) } -func (c *AWSClient) CloudTrailClient(ctx context.Context) *cloudtrail_sdkv2.Client { - return errs.Must(client[*cloudtrail_sdkv2.Client](ctx, c, names.CloudTrail, make(map[string]any))) +func (c *AWSClient) CloudTrailClient(ctx context.Context) *cloudtrail.Client { + return errs.Must(client[*cloudtrail.Client](ctx, c, names.CloudTrail, make(map[string]any))) } -func (c *AWSClient) CloudWatchClient(ctx context.Context) *cloudwatch_sdkv2.Client { - return errs.Must(client[*cloudwatch_sdkv2.Client](ctx, c, names.CloudWatch, make(map[string]any))) +func (c *AWSClient) CloudWatchClient(ctx context.Context) *cloudwatch.Client { + return errs.Must(client[*cloudwatch.Client](ctx, c, names.CloudWatch, make(map[string]any))) } -func (c *AWSClient) CodeArtifactClient(ctx context.Context) *codeartifact_sdkv2.Client { - return errs.Must(client[*codeartifact_sdkv2.Client](ctx, c, names.CodeArtifact, make(map[string]any))) +func (c *AWSClient) CodeArtifactClient(ctx context.Context) *codeartifact.Client { + return errs.Must(client[*codeartifact.Client](ctx, c, names.CodeArtifact, make(map[string]any))) } -func (c *AWSClient) CodeBuildClient(ctx context.Context) *codebuild_sdkv2.Client { - return errs.Must(client[*codebuild_sdkv2.Client](ctx, c, names.CodeBuild, make(map[string]any))) +func (c *AWSClient) CodeBuildClient(ctx context.Context) *codebuild.Client { + return errs.Must(client[*codebuild.Client](ctx, c, names.CodeBuild, make(map[string]any))) } -func (c *AWSClient) CodeCatalystClient(ctx context.Context) *codecatalyst_sdkv2.Client { - return errs.Must(client[*codecatalyst_sdkv2.Client](ctx, c, names.CodeCatalyst, make(map[string]any))) +func (c *AWSClient) CodeCatalystClient(ctx context.Context) *codecatalyst.Client { + return errs.Must(client[*codecatalyst.Client](ctx, c, names.CodeCatalyst, make(map[string]any))) } -func (c *AWSClient) CodeCommitClient(ctx context.Context) *codecommit_sdkv2.Client { - return errs.Must(client[*codecommit_sdkv2.Client](ctx, c, names.CodeCommit, make(map[string]any))) +func (c *AWSClient) CodeCommitClient(ctx context.Context) *codecommit.Client { + return errs.Must(client[*codecommit.Client](ctx, c, names.CodeCommit, make(map[string]any))) } -func (c *AWSClient) CodeConnectionsClient(ctx context.Context) *codeconnections_sdkv2.Client { - return errs.Must(client[*codeconnections_sdkv2.Client](ctx, c, names.CodeConnections, make(map[string]any))) +func (c *AWSClient) CodeConnectionsClient(ctx context.Context) *codeconnections.Client { + return errs.Must(client[*codeconnections.Client](ctx, c, names.CodeConnections, make(map[string]any))) } -func (c *AWSClient) CodeGuruProfilerClient(ctx context.Context) *codeguruprofiler_sdkv2.Client { - return errs.Must(client[*codeguruprofiler_sdkv2.Client](ctx, c, names.CodeGuruProfiler, make(map[string]any))) +func (c *AWSClient) CodeGuruProfilerClient(ctx context.Context) *codeguruprofiler.Client { + return errs.Must(client[*codeguruprofiler.Client](ctx, c, names.CodeGuruProfiler, make(map[string]any))) } -func (c *AWSClient) CodeGuruReviewerClient(ctx context.Context) *codegurureviewer_sdkv2.Client { - return errs.Must(client[*codegurureviewer_sdkv2.Client](ctx, c, names.CodeGuruReviewer, make(map[string]any))) +func (c *AWSClient) CodeGuruReviewerClient(ctx context.Context) *codegurureviewer.Client { + return errs.Must(client[*codegurureviewer.Client](ctx, c, names.CodeGuruReviewer, make(map[string]any))) } -func (c *AWSClient) CodePipelineClient(ctx context.Context) *codepipeline_sdkv2.Client { - return errs.Must(client[*codepipeline_sdkv2.Client](ctx, c, names.CodePipeline, make(map[string]any))) +func (c *AWSClient) CodePipelineClient(ctx context.Context) *codepipeline.Client { + return errs.Must(client[*codepipeline.Client](ctx, c, names.CodePipeline, make(map[string]any))) } -func (c *AWSClient) CodeStarConnectionsClient(ctx context.Context) *codestarconnections_sdkv2.Client { - return errs.Must(client[*codestarconnections_sdkv2.Client](ctx, c, names.CodeStarConnections, make(map[string]any))) +func (c *AWSClient) CodeStarConnectionsClient(ctx context.Context) *codestarconnections.Client { + return errs.Must(client[*codestarconnections.Client](ctx, c, names.CodeStarConnections, make(map[string]any))) } -func (c *AWSClient) CodeStarNotificationsClient(ctx context.Context) *codestarnotifications_sdkv2.Client { - return errs.Must(client[*codestarnotifications_sdkv2.Client](ctx, c, names.CodeStarNotifications, make(map[string]any))) +func (c *AWSClient) CodeStarNotificationsClient(ctx context.Context) *codestarnotifications.Client { + return errs.Must(client[*codestarnotifications.Client](ctx, c, names.CodeStarNotifications, make(map[string]any))) } -func (c *AWSClient) CognitoIDPClient(ctx context.Context) *cognitoidentityprovider_sdkv2.Client { - return errs.Must(client[*cognitoidentityprovider_sdkv2.Client](ctx, c, names.CognitoIDP, make(map[string]any))) +func (c *AWSClient) CognitoIDPClient(ctx context.Context) *cognitoidentityprovider.Client { + return errs.Must(client[*cognitoidentityprovider.Client](ctx, c, names.CognitoIDP, make(map[string]any))) } -func (c *AWSClient) CognitoIdentityClient(ctx context.Context) *cognitoidentity_sdkv2.Client { - return errs.Must(client[*cognitoidentity_sdkv2.Client](ctx, c, names.CognitoIdentity, make(map[string]any))) +func (c *AWSClient) CognitoIdentityClient(ctx context.Context) *cognitoidentity.Client { + return errs.Must(client[*cognitoidentity.Client](ctx, c, names.CognitoIdentity, make(map[string]any))) } -func (c *AWSClient) ComprehendClient(ctx context.Context) *comprehend_sdkv2.Client { - return errs.Must(client[*comprehend_sdkv2.Client](ctx, c, names.Comprehend, make(map[string]any))) +func (c *AWSClient) ComprehendClient(ctx context.Context) *comprehend.Client { + return errs.Must(client[*comprehend.Client](ctx, c, names.Comprehend, make(map[string]any))) } -func (c *AWSClient) ComputeOptimizerClient(ctx context.Context) *computeoptimizer_sdkv2.Client { - return errs.Must(client[*computeoptimizer_sdkv2.Client](ctx, c, names.ComputeOptimizer, make(map[string]any))) +func (c *AWSClient) ComputeOptimizerClient(ctx context.Context) *computeoptimizer.Client { + return errs.Must(client[*computeoptimizer.Client](ctx, c, names.ComputeOptimizer, make(map[string]any))) } -func (c *AWSClient) ConfigServiceClient(ctx context.Context) *configservice_sdkv2.Client { - return errs.Must(client[*configservice_sdkv2.Client](ctx, c, names.ConfigService, make(map[string]any))) +func (c *AWSClient) ConfigServiceClient(ctx context.Context) *configservice.Client { + return errs.Must(client[*configservice.Client](ctx, c, names.ConfigService, make(map[string]any))) } -func (c *AWSClient) ConnectClient(ctx context.Context) *connect_sdkv2.Client { - return errs.Must(client[*connect_sdkv2.Client](ctx, c, names.Connect, make(map[string]any))) +func (c *AWSClient) ConnectClient(ctx context.Context) *connect.Client { + return errs.Must(client[*connect.Client](ctx, c, names.Connect, make(map[string]any))) } -func (c *AWSClient) ConnectCasesClient(ctx context.Context) *connectcases_sdkv2.Client { - return errs.Must(client[*connectcases_sdkv2.Client](ctx, c, names.ConnectCases, make(map[string]any))) +func (c *AWSClient) ConnectCasesClient(ctx context.Context) *connectcases.Client { + return errs.Must(client[*connectcases.Client](ctx, c, names.ConnectCases, make(map[string]any))) } -func (c *AWSClient) ControlTowerClient(ctx context.Context) *controltower_sdkv2.Client { - return errs.Must(client[*controltower_sdkv2.Client](ctx, c, names.ControlTower, make(map[string]any))) +func (c *AWSClient) ControlTowerClient(ctx context.Context) *controltower.Client { + return errs.Must(client[*controltower.Client](ctx, c, names.ControlTower, make(map[string]any))) } -func (c *AWSClient) CostOptimizationHubClient(ctx context.Context) *costoptimizationhub_sdkv2.Client { - return errs.Must(client[*costoptimizationhub_sdkv2.Client](ctx, c, names.CostOptimizationHub, make(map[string]any))) +func (c *AWSClient) CostOptimizationHubClient(ctx context.Context) *costoptimizationhub.Client { + return errs.Must(client[*costoptimizationhub.Client](ctx, c, names.CostOptimizationHub, make(map[string]any))) } -func (c *AWSClient) CustomerProfilesClient(ctx context.Context) *customerprofiles_sdkv2.Client { - return errs.Must(client[*customerprofiles_sdkv2.Client](ctx, c, names.CustomerProfiles, make(map[string]any))) +func (c *AWSClient) CustomerProfilesClient(ctx context.Context) *customerprofiles.Client { + return errs.Must(client[*customerprofiles.Client](ctx, c, names.CustomerProfiles, make(map[string]any))) } -func (c *AWSClient) DAXClient(ctx context.Context) *dax_sdkv2.Client { - return errs.Must(client[*dax_sdkv2.Client](ctx, c, names.DAX, make(map[string]any))) +func (c *AWSClient) DAXClient(ctx context.Context) *dax.Client { + return errs.Must(client[*dax.Client](ctx, c, names.DAX, make(map[string]any))) } -func (c *AWSClient) DLMClient(ctx context.Context) *dlm_sdkv2.Client { - return errs.Must(client[*dlm_sdkv2.Client](ctx, c, names.DLM, make(map[string]any))) +func (c *AWSClient) DLMClient(ctx context.Context) *dlm.Client { + return errs.Must(client[*dlm.Client](ctx, c, names.DLM, make(map[string]any))) } -func (c *AWSClient) DMSClient(ctx context.Context) *databasemigrationservice_sdkv2.Client { - return errs.Must(client[*databasemigrationservice_sdkv2.Client](ctx, c, names.DMS, make(map[string]any))) +func (c *AWSClient) DMSClient(ctx context.Context) *databasemigrationservice.Client { + return errs.Must(client[*databasemigrationservice.Client](ctx, c, names.DMS, make(map[string]any))) } -func (c *AWSClient) DRSClient(ctx context.Context) *drs_sdkv2.Client { - return errs.Must(client[*drs_sdkv2.Client](ctx, c, names.DRS, make(map[string]any))) +func (c *AWSClient) DRSClient(ctx context.Context) *drs.Client { + return errs.Must(client[*drs.Client](ctx, c, names.DRS, make(map[string]any))) } -func (c *AWSClient) DSClient(ctx context.Context) *directoryservice_sdkv2.Client { - return errs.Must(client[*directoryservice_sdkv2.Client](ctx, c, names.DS, make(map[string]any))) +func (c *AWSClient) DSClient(ctx context.Context) *directoryservice.Client { + return errs.Must(client[*directoryservice.Client](ctx, c, names.DS, make(map[string]any))) } -func (c *AWSClient) DataBrewClient(ctx context.Context) *databrew_sdkv2.Client { - return errs.Must(client[*databrew_sdkv2.Client](ctx, c, names.DataBrew, make(map[string]any))) +func (c *AWSClient) DataBrewClient(ctx context.Context) *databrew.Client { + return errs.Must(client[*databrew.Client](ctx, c, names.DataBrew, make(map[string]any))) } -func (c *AWSClient) DataExchangeClient(ctx context.Context) *dataexchange_sdkv2.Client { - return errs.Must(client[*dataexchange_sdkv2.Client](ctx, c, names.DataExchange, make(map[string]any))) +func (c *AWSClient) DataExchangeClient(ctx context.Context) *dataexchange.Client { + return errs.Must(client[*dataexchange.Client](ctx, c, names.DataExchange, make(map[string]any))) } -func (c *AWSClient) DataPipelineClient(ctx context.Context) *datapipeline_sdkv2.Client { - return errs.Must(client[*datapipeline_sdkv2.Client](ctx, c, names.DataPipeline, make(map[string]any))) +func (c *AWSClient) DataPipelineClient(ctx context.Context) *datapipeline.Client { + return errs.Must(client[*datapipeline.Client](ctx, c, names.DataPipeline, make(map[string]any))) } -func (c *AWSClient) DataSyncClient(ctx context.Context) *datasync_sdkv2.Client { - return errs.Must(client[*datasync_sdkv2.Client](ctx, c, names.DataSync, make(map[string]any))) +func (c *AWSClient) DataSyncClient(ctx context.Context) *datasync.Client { + return errs.Must(client[*datasync.Client](ctx, c, names.DataSync, make(map[string]any))) } -func (c *AWSClient) DataZoneClient(ctx context.Context) *datazone_sdkv2.Client { - return errs.Must(client[*datazone_sdkv2.Client](ctx, c, names.DataZone, make(map[string]any))) +func (c *AWSClient) DataZoneClient(ctx context.Context) *datazone.Client { + return errs.Must(client[*datazone.Client](ctx, c, names.DataZone, make(map[string]any))) } -func (c *AWSClient) DeployClient(ctx context.Context) *codedeploy_sdkv2.Client { - return errs.Must(client[*codedeploy_sdkv2.Client](ctx, c, names.Deploy, make(map[string]any))) +func (c *AWSClient) DeployClient(ctx context.Context) *codedeploy.Client { + return errs.Must(client[*codedeploy.Client](ctx, c, names.Deploy, make(map[string]any))) } -func (c *AWSClient) DetectiveClient(ctx context.Context) *detective_sdkv2.Client { - return errs.Must(client[*detective_sdkv2.Client](ctx, c, names.Detective, make(map[string]any))) +func (c *AWSClient) DetectiveClient(ctx context.Context) *detective.Client { + return errs.Must(client[*detective.Client](ctx, c, names.Detective, make(map[string]any))) } -func (c *AWSClient) DevOpsGuruClient(ctx context.Context) *devopsguru_sdkv2.Client { - return errs.Must(client[*devopsguru_sdkv2.Client](ctx, c, names.DevOpsGuru, make(map[string]any))) +func (c *AWSClient) DevOpsGuruClient(ctx context.Context) *devopsguru.Client { + return errs.Must(client[*devopsguru.Client](ctx, c, names.DevOpsGuru, make(map[string]any))) } -func (c *AWSClient) DeviceFarmClient(ctx context.Context) *devicefarm_sdkv2.Client { - return errs.Must(client[*devicefarm_sdkv2.Client](ctx, c, names.DeviceFarm, make(map[string]any))) +func (c *AWSClient) DeviceFarmClient(ctx context.Context) *devicefarm.Client { + return errs.Must(client[*devicefarm.Client](ctx, c, names.DeviceFarm, make(map[string]any))) } -func (c *AWSClient) DirectConnectClient(ctx context.Context) *directconnect_sdkv2.Client { - return errs.Must(client[*directconnect_sdkv2.Client](ctx, c, names.DirectConnect, make(map[string]any))) +func (c *AWSClient) DirectConnectClient(ctx context.Context) *directconnect.Client { + return errs.Must(client[*directconnect.Client](ctx, c, names.DirectConnect, make(map[string]any))) } -func (c *AWSClient) DocDBClient(ctx context.Context) *docdb_sdkv2.Client { - return errs.Must(client[*docdb_sdkv2.Client](ctx, c, names.DocDB, make(map[string]any))) +func (c *AWSClient) DocDBClient(ctx context.Context) *docdb.Client { + return errs.Must(client[*docdb.Client](ctx, c, names.DocDB, make(map[string]any))) } -func (c *AWSClient) DocDBElasticClient(ctx context.Context) *docdbelastic_sdkv2.Client { - return errs.Must(client[*docdbelastic_sdkv2.Client](ctx, c, names.DocDBElastic, make(map[string]any))) +func (c *AWSClient) DocDBElasticClient(ctx context.Context) *docdbelastic.Client { + return errs.Must(client[*docdbelastic.Client](ctx, c, names.DocDBElastic, make(map[string]any))) } -func (c *AWSClient) DynamoDBClient(ctx context.Context) *dynamodb_sdkv2.Client { - return errs.Must(client[*dynamodb_sdkv2.Client](ctx, c, names.DynamoDB, make(map[string]any))) +func (c *AWSClient) DynamoDBClient(ctx context.Context) *dynamodb.Client { + return errs.Must(client[*dynamodb.Client](ctx, c, names.DynamoDB, make(map[string]any))) } -func (c *AWSClient) EC2Client(ctx context.Context) *ec2_sdkv2.Client { - return errs.Must(client[*ec2_sdkv2.Client](ctx, c, names.EC2, make(map[string]any))) +func (c *AWSClient) EC2Client(ctx context.Context) *ec2.Client { + return errs.Must(client[*ec2.Client](ctx, c, names.EC2, make(map[string]any))) } -func (c *AWSClient) ECRClient(ctx context.Context) *ecr_sdkv2.Client { - return errs.Must(client[*ecr_sdkv2.Client](ctx, c, names.ECR, make(map[string]any))) +func (c *AWSClient) ECRClient(ctx context.Context) *ecr.Client { + return errs.Must(client[*ecr.Client](ctx, c, names.ECR, make(map[string]any))) } -func (c *AWSClient) ECRPublicClient(ctx context.Context) *ecrpublic_sdkv2.Client { - return errs.Must(client[*ecrpublic_sdkv2.Client](ctx, c, names.ECRPublic, make(map[string]any))) +func (c *AWSClient) ECRPublicClient(ctx context.Context) *ecrpublic.Client { + return errs.Must(client[*ecrpublic.Client](ctx, c, names.ECRPublic, make(map[string]any))) } -func (c *AWSClient) ECSClient(ctx context.Context) *ecs_sdkv2.Client { - return errs.Must(client[*ecs_sdkv2.Client](ctx, c, names.ECS, make(map[string]any))) +func (c *AWSClient) ECSClient(ctx context.Context) *ecs.Client { + return errs.Must(client[*ecs.Client](ctx, c, names.ECS, make(map[string]any))) } -func (c *AWSClient) EFSClient(ctx context.Context) *efs_sdkv2.Client { - return errs.Must(client[*efs_sdkv2.Client](ctx, c, names.EFS, make(map[string]any))) +func (c *AWSClient) EFSClient(ctx context.Context) *efs.Client { + return errs.Must(client[*efs.Client](ctx, c, names.EFS, make(map[string]any))) } -func (c *AWSClient) EKSClient(ctx context.Context) *eks_sdkv2.Client { - return errs.Must(client[*eks_sdkv2.Client](ctx, c, names.EKS, make(map[string]any))) +func (c *AWSClient) EKSClient(ctx context.Context) *eks.Client { + return errs.Must(client[*eks.Client](ctx, c, names.EKS, make(map[string]any))) } -func (c *AWSClient) ELBClient(ctx context.Context) *elasticloadbalancing_sdkv2.Client { - return errs.Must(client[*elasticloadbalancing_sdkv2.Client](ctx, c, names.ELB, make(map[string]any))) +func (c *AWSClient) ELBClient(ctx context.Context) *elasticloadbalancing.Client { + return errs.Must(client[*elasticloadbalancing.Client](ctx, c, names.ELB, make(map[string]any))) } -func (c *AWSClient) ELBV2Client(ctx context.Context) *elasticloadbalancingv2_sdkv2.Client { - return errs.Must(client[*elasticloadbalancingv2_sdkv2.Client](ctx, c, names.ELBV2, make(map[string]any))) +func (c *AWSClient) ELBV2Client(ctx context.Context) *elasticloadbalancingv2.Client { + return errs.Must(client[*elasticloadbalancingv2.Client](ctx, c, names.ELBV2, make(map[string]any))) } -func (c *AWSClient) EMRClient(ctx context.Context) *emr_sdkv2.Client { - return errs.Must(client[*emr_sdkv2.Client](ctx, c, names.EMR, make(map[string]any))) +func (c *AWSClient) EMRClient(ctx context.Context) *emr.Client { + return errs.Must(client[*emr.Client](ctx, c, names.EMR, make(map[string]any))) } -func (c *AWSClient) EMRContainersClient(ctx context.Context) *emrcontainers_sdkv2.Client { - return errs.Must(client[*emrcontainers_sdkv2.Client](ctx, c, names.EMRContainers, make(map[string]any))) +func (c *AWSClient) EMRContainersClient(ctx context.Context) *emrcontainers.Client { + return errs.Must(client[*emrcontainers.Client](ctx, c, names.EMRContainers, make(map[string]any))) } -func (c *AWSClient) EMRServerlessClient(ctx context.Context) *emrserverless_sdkv2.Client { - return errs.Must(client[*emrserverless_sdkv2.Client](ctx, c, names.EMRServerless, make(map[string]any))) +func (c *AWSClient) EMRServerlessClient(ctx context.Context) *emrserverless.Client { + return errs.Must(client[*emrserverless.Client](ctx, c, names.EMRServerless, make(map[string]any))) } -func (c *AWSClient) ElastiCacheClient(ctx context.Context) *elasticache_sdkv2.Client { - return errs.Must(client[*elasticache_sdkv2.Client](ctx, c, names.ElastiCache, make(map[string]any))) +func (c *AWSClient) ElastiCacheClient(ctx context.Context) *elasticache.Client { + return errs.Must(client[*elasticache.Client](ctx, c, names.ElastiCache, make(map[string]any))) } -func (c *AWSClient) ElasticBeanstalkClient(ctx context.Context) *elasticbeanstalk_sdkv2.Client { - return errs.Must(client[*elasticbeanstalk_sdkv2.Client](ctx, c, names.ElasticBeanstalk, make(map[string]any))) +func (c *AWSClient) ElasticBeanstalkClient(ctx context.Context) *elasticbeanstalk.Client { + return errs.Must(client[*elasticbeanstalk.Client](ctx, c, names.ElasticBeanstalk, make(map[string]any))) } -func (c *AWSClient) ElasticTranscoderClient(ctx context.Context) *elastictranscoder_sdkv2.Client { - return errs.Must(client[*elastictranscoder_sdkv2.Client](ctx, c, names.ElasticTranscoder, make(map[string]any))) +func (c *AWSClient) ElasticTranscoderClient(ctx context.Context) *elastictranscoder.Client { + return errs.Must(client[*elastictranscoder.Client](ctx, c, names.ElasticTranscoder, make(map[string]any))) } -func (c *AWSClient) ElasticsearchClient(ctx context.Context) *elasticsearchservice_sdkv2.Client { - return errs.Must(client[*elasticsearchservice_sdkv2.Client](ctx, c, names.Elasticsearch, make(map[string]any))) +func (c *AWSClient) ElasticsearchClient(ctx context.Context) *elasticsearchservice.Client { + return errs.Must(client[*elasticsearchservice.Client](ctx, c, names.Elasticsearch, make(map[string]any))) } -func (c *AWSClient) EventsClient(ctx context.Context) *eventbridge_sdkv2.Client { - return errs.Must(client[*eventbridge_sdkv2.Client](ctx, c, names.Events, make(map[string]any))) +func (c *AWSClient) EventsClient(ctx context.Context) *eventbridge.Client { + return errs.Must(client[*eventbridge.Client](ctx, c, names.Events, make(map[string]any))) } -func (c *AWSClient) EvidentlyClient(ctx context.Context) *evidently_sdkv2.Client { - return errs.Must(client[*evidently_sdkv2.Client](ctx, c, names.Evidently, make(map[string]any))) +func (c *AWSClient) EvidentlyClient(ctx context.Context) *evidently.Client { + return errs.Must(client[*evidently.Client](ctx, c, names.Evidently, make(map[string]any))) } -func (c *AWSClient) FISClient(ctx context.Context) *fis_sdkv2.Client { - return errs.Must(client[*fis_sdkv2.Client](ctx, c, names.FIS, make(map[string]any))) +func (c *AWSClient) FISClient(ctx context.Context) *fis.Client { + return errs.Must(client[*fis.Client](ctx, c, names.FIS, make(map[string]any))) } -func (c *AWSClient) FMSClient(ctx context.Context) *fms_sdkv2.Client { - return errs.Must(client[*fms_sdkv2.Client](ctx, c, names.FMS, make(map[string]any))) +func (c *AWSClient) FMSClient(ctx context.Context) *fms.Client { + return errs.Must(client[*fms.Client](ctx, c, names.FMS, make(map[string]any))) } -func (c *AWSClient) FSxClient(ctx context.Context) *fsx_sdkv2.Client { - return errs.Must(client[*fsx_sdkv2.Client](ctx, c, names.FSx, make(map[string]any))) +func (c *AWSClient) FSxClient(ctx context.Context) *fsx.Client { + return errs.Must(client[*fsx.Client](ctx, c, names.FSx, make(map[string]any))) } -func (c *AWSClient) FinSpaceClient(ctx context.Context) *finspace_sdkv2.Client { - return errs.Must(client[*finspace_sdkv2.Client](ctx, c, names.FinSpace, make(map[string]any))) +func (c *AWSClient) FinSpaceClient(ctx context.Context) *finspace.Client { + return errs.Must(client[*finspace.Client](ctx, c, names.FinSpace, make(map[string]any))) } -func (c *AWSClient) FirehoseClient(ctx context.Context) *firehose_sdkv2.Client { - return errs.Must(client[*firehose_sdkv2.Client](ctx, c, names.Firehose, make(map[string]any))) +func (c *AWSClient) FirehoseClient(ctx context.Context) *firehose.Client { + return errs.Must(client[*firehose.Client](ctx, c, names.Firehose, make(map[string]any))) } -func (c *AWSClient) GameLiftClient(ctx context.Context) *gamelift_sdkv2.Client { - return errs.Must(client[*gamelift_sdkv2.Client](ctx, c, names.GameLift, make(map[string]any))) +func (c *AWSClient) GameLiftClient(ctx context.Context) *gamelift.Client { + return errs.Must(client[*gamelift.Client](ctx, c, names.GameLift, make(map[string]any))) } -func (c *AWSClient) GlacierClient(ctx context.Context) *glacier_sdkv2.Client { - return errs.Must(client[*glacier_sdkv2.Client](ctx, c, names.Glacier, make(map[string]any))) +func (c *AWSClient) GlacierClient(ctx context.Context) *glacier.Client { + return errs.Must(client[*glacier.Client](ctx, c, names.Glacier, make(map[string]any))) } -func (c *AWSClient) GlobalAcceleratorClient(ctx context.Context) *globalaccelerator_sdkv2.Client { - return errs.Must(client[*globalaccelerator_sdkv2.Client](ctx, c, names.GlobalAccelerator, make(map[string]any))) +func (c *AWSClient) GlobalAcceleratorClient(ctx context.Context) *globalaccelerator.Client { + return errs.Must(client[*globalaccelerator.Client](ctx, c, names.GlobalAccelerator, make(map[string]any))) } -func (c *AWSClient) GlueClient(ctx context.Context) *glue_sdkv2.Client { - return errs.Must(client[*glue_sdkv2.Client](ctx, c, names.Glue, make(map[string]any))) +func (c *AWSClient) GlueClient(ctx context.Context) *glue.Client { + return errs.Must(client[*glue.Client](ctx, c, names.Glue, make(map[string]any))) } -func (c *AWSClient) GrafanaClient(ctx context.Context) *grafana_sdkv2.Client { - return errs.Must(client[*grafana_sdkv2.Client](ctx, c, names.Grafana, make(map[string]any))) +func (c *AWSClient) GrafanaClient(ctx context.Context) *grafana.Client { + return errs.Must(client[*grafana.Client](ctx, c, names.Grafana, make(map[string]any))) } -func (c *AWSClient) GreengrassClient(ctx context.Context) *greengrass_sdkv2.Client { - return errs.Must(client[*greengrass_sdkv2.Client](ctx, c, names.Greengrass, make(map[string]any))) +func (c *AWSClient) GreengrassClient(ctx context.Context) *greengrass.Client { + return errs.Must(client[*greengrass.Client](ctx, c, names.Greengrass, make(map[string]any))) } -func (c *AWSClient) GroundStationClient(ctx context.Context) *groundstation_sdkv2.Client { - return errs.Must(client[*groundstation_sdkv2.Client](ctx, c, names.GroundStation, make(map[string]any))) +func (c *AWSClient) GroundStationClient(ctx context.Context) *groundstation.Client { + return errs.Must(client[*groundstation.Client](ctx, c, names.GroundStation, make(map[string]any))) } -func (c *AWSClient) GuardDutyClient(ctx context.Context) *guardduty_sdkv2.Client { - return errs.Must(client[*guardduty_sdkv2.Client](ctx, c, names.GuardDuty, make(map[string]any))) +func (c *AWSClient) GuardDutyClient(ctx context.Context) *guardduty.Client { + return errs.Must(client[*guardduty.Client](ctx, c, names.GuardDuty, make(map[string]any))) } -func (c *AWSClient) HealthLakeClient(ctx context.Context) *healthlake_sdkv2.Client { - return errs.Must(client[*healthlake_sdkv2.Client](ctx, c, names.HealthLake, make(map[string]any))) +func (c *AWSClient) HealthLakeClient(ctx context.Context) *healthlake.Client { + return errs.Must(client[*healthlake.Client](ctx, c, names.HealthLake, make(map[string]any))) } -func (c *AWSClient) IAMClient(ctx context.Context) *iam_sdkv2.Client { - return errs.Must(client[*iam_sdkv2.Client](ctx, c, names.IAM, make(map[string]any))) +func (c *AWSClient) IAMClient(ctx context.Context) *iam.Client { + return errs.Must(client[*iam.Client](ctx, c, names.IAM, make(map[string]any))) } -func (c *AWSClient) IVSClient(ctx context.Context) *ivs_sdkv2.Client { - return errs.Must(client[*ivs_sdkv2.Client](ctx, c, names.IVS, make(map[string]any))) +func (c *AWSClient) IVSClient(ctx context.Context) *ivs.Client { + return errs.Must(client[*ivs.Client](ctx, c, names.IVS, make(map[string]any))) } -func (c *AWSClient) IVSChatClient(ctx context.Context) *ivschat_sdkv2.Client { - return errs.Must(client[*ivschat_sdkv2.Client](ctx, c, names.IVSChat, make(map[string]any))) +func (c *AWSClient) IVSChatClient(ctx context.Context) *ivschat.Client { + return errs.Must(client[*ivschat.Client](ctx, c, names.IVSChat, make(map[string]any))) } -func (c *AWSClient) IdentityStoreClient(ctx context.Context) *identitystore_sdkv2.Client { - return errs.Must(client[*identitystore_sdkv2.Client](ctx, c, names.IdentityStore, make(map[string]any))) +func (c *AWSClient) IdentityStoreClient(ctx context.Context) *identitystore.Client { + return errs.Must(client[*identitystore.Client](ctx, c, names.IdentityStore, make(map[string]any))) } -func (c *AWSClient) ImageBuilderClient(ctx context.Context) *imagebuilder_sdkv2.Client { - return errs.Must(client[*imagebuilder_sdkv2.Client](ctx, c, names.ImageBuilder, make(map[string]any))) +func (c *AWSClient) ImageBuilderClient(ctx context.Context) *imagebuilder.Client { + return errs.Must(client[*imagebuilder.Client](ctx, c, names.ImageBuilder, make(map[string]any))) } -func (c *AWSClient) InspectorClient(ctx context.Context) *inspector_sdkv2.Client { - return errs.Must(client[*inspector_sdkv2.Client](ctx, c, names.Inspector, make(map[string]any))) +func (c *AWSClient) InspectorClient(ctx context.Context) *inspector.Client { + return errs.Must(client[*inspector.Client](ctx, c, names.Inspector, make(map[string]any))) } -func (c *AWSClient) Inspector2Client(ctx context.Context) *inspector2_sdkv2.Client { - return errs.Must(client[*inspector2_sdkv2.Client](ctx, c, names.Inspector2, make(map[string]any))) +func (c *AWSClient) Inspector2Client(ctx context.Context) *inspector2.Client { + return errs.Must(client[*inspector2.Client](ctx, c, names.Inspector2, make(map[string]any))) } -func (c *AWSClient) InternetMonitorClient(ctx context.Context) *internetmonitor_sdkv2.Client { - return errs.Must(client[*internetmonitor_sdkv2.Client](ctx, c, names.InternetMonitor, make(map[string]any))) +func (c *AWSClient) InternetMonitorClient(ctx context.Context) *internetmonitor.Client { + return errs.Must(client[*internetmonitor.Client](ctx, c, names.InternetMonitor, make(map[string]any))) } -func (c *AWSClient) IoTClient(ctx context.Context) *iot_sdkv2.Client { - return errs.Must(client[*iot_sdkv2.Client](ctx, c, names.IoT, make(map[string]any))) +func (c *AWSClient) IoTClient(ctx context.Context) *iot.Client { + return errs.Must(client[*iot.Client](ctx, c, names.IoT, make(map[string]any))) } -func (c *AWSClient) IoTAnalyticsClient(ctx context.Context) *iotanalytics_sdkv2.Client { - return errs.Must(client[*iotanalytics_sdkv2.Client](ctx, c, names.IoTAnalytics, make(map[string]any))) +func (c *AWSClient) IoTAnalyticsClient(ctx context.Context) *iotanalytics.Client { + return errs.Must(client[*iotanalytics.Client](ctx, c, names.IoTAnalytics, make(map[string]any))) } -func (c *AWSClient) IoTEventsClient(ctx context.Context) *iotevents_sdkv2.Client { - return errs.Must(client[*iotevents_sdkv2.Client](ctx, c, names.IoTEvents, make(map[string]any))) +func (c *AWSClient) IoTEventsClient(ctx context.Context) *iotevents.Client { + return errs.Must(client[*iotevents.Client](ctx, c, names.IoTEvents, make(map[string]any))) } -func (c *AWSClient) KMSClient(ctx context.Context) *kms_sdkv2.Client { - return errs.Must(client[*kms_sdkv2.Client](ctx, c, names.KMS, make(map[string]any))) +func (c *AWSClient) KMSClient(ctx context.Context) *kms.Client { + return errs.Must(client[*kms.Client](ctx, c, names.KMS, make(map[string]any))) } -func (c *AWSClient) KafkaClient(ctx context.Context) *kafka_sdkv2.Client { - return errs.Must(client[*kafka_sdkv2.Client](ctx, c, names.Kafka, make(map[string]any))) +func (c *AWSClient) KafkaClient(ctx context.Context) *kafka.Client { + return errs.Must(client[*kafka.Client](ctx, c, names.Kafka, make(map[string]any))) } -func (c *AWSClient) KafkaConnectClient(ctx context.Context) *kafkaconnect_sdkv2.Client { - return errs.Must(client[*kafkaconnect_sdkv2.Client](ctx, c, names.KafkaConnect, make(map[string]any))) +func (c *AWSClient) KafkaConnectClient(ctx context.Context) *kafkaconnect.Client { + return errs.Must(client[*kafkaconnect.Client](ctx, c, names.KafkaConnect, make(map[string]any))) } -func (c *AWSClient) KendraClient(ctx context.Context) *kendra_sdkv2.Client { - return errs.Must(client[*kendra_sdkv2.Client](ctx, c, names.Kendra, make(map[string]any))) +func (c *AWSClient) KendraClient(ctx context.Context) *kendra.Client { + return errs.Must(client[*kendra.Client](ctx, c, names.Kendra, make(map[string]any))) } -func (c *AWSClient) KeyspacesClient(ctx context.Context) *keyspaces_sdkv2.Client { - return errs.Must(client[*keyspaces_sdkv2.Client](ctx, c, names.Keyspaces, make(map[string]any))) +func (c *AWSClient) KeyspacesClient(ctx context.Context) *keyspaces.Client { + return errs.Must(client[*keyspaces.Client](ctx, c, names.Keyspaces, make(map[string]any))) } -func (c *AWSClient) KinesisClient(ctx context.Context) *kinesis_sdkv2.Client { - return errs.Must(client[*kinesis_sdkv2.Client](ctx, c, names.Kinesis, make(map[string]any))) +func (c *AWSClient) KinesisClient(ctx context.Context) *kinesis.Client { + return errs.Must(client[*kinesis.Client](ctx, c, names.Kinesis, make(map[string]any))) } -func (c *AWSClient) KinesisAnalyticsClient(ctx context.Context) *kinesisanalytics_sdkv2.Client { - return errs.Must(client[*kinesisanalytics_sdkv2.Client](ctx, c, names.KinesisAnalytics, make(map[string]any))) +func (c *AWSClient) KinesisAnalyticsClient(ctx context.Context) *kinesisanalytics.Client { + return errs.Must(client[*kinesisanalytics.Client](ctx, c, names.KinesisAnalytics, make(map[string]any))) } -func (c *AWSClient) KinesisAnalyticsV2Client(ctx context.Context) *kinesisanalyticsv2_sdkv2.Client { - return errs.Must(client[*kinesisanalyticsv2_sdkv2.Client](ctx, c, names.KinesisAnalyticsV2, make(map[string]any))) +func (c *AWSClient) KinesisAnalyticsV2Client(ctx context.Context) *kinesisanalyticsv2.Client { + return errs.Must(client[*kinesisanalyticsv2.Client](ctx, c, names.KinesisAnalyticsV2, make(map[string]any))) } -func (c *AWSClient) KinesisVideoClient(ctx context.Context) *kinesisvideo_sdkv2.Client { - return errs.Must(client[*kinesisvideo_sdkv2.Client](ctx, c, names.KinesisVideo, make(map[string]any))) +func (c *AWSClient) KinesisVideoClient(ctx context.Context) *kinesisvideo.Client { + return errs.Must(client[*kinesisvideo.Client](ctx, c, names.KinesisVideo, make(map[string]any))) } -func (c *AWSClient) LakeFormationClient(ctx context.Context) *lakeformation_sdkv2.Client { - return errs.Must(client[*lakeformation_sdkv2.Client](ctx, c, names.LakeFormation, make(map[string]any))) +func (c *AWSClient) LakeFormationClient(ctx context.Context) *lakeformation.Client { + return errs.Must(client[*lakeformation.Client](ctx, c, names.LakeFormation, make(map[string]any))) } -func (c *AWSClient) LambdaClient(ctx context.Context) *lambda_sdkv2.Client { - return errs.Must(client[*lambda_sdkv2.Client](ctx, c, names.Lambda, make(map[string]any))) +func (c *AWSClient) LambdaClient(ctx context.Context) *lambda.Client { + return errs.Must(client[*lambda.Client](ctx, c, names.Lambda, make(map[string]any))) } -func (c *AWSClient) LaunchWizardClient(ctx context.Context) *launchwizard_sdkv2.Client { - return errs.Must(client[*launchwizard_sdkv2.Client](ctx, c, names.LaunchWizard, make(map[string]any))) +func (c *AWSClient) LaunchWizardClient(ctx context.Context) *launchwizard.Client { + return errs.Must(client[*launchwizard.Client](ctx, c, names.LaunchWizard, make(map[string]any))) } -func (c *AWSClient) LexModelsClient(ctx context.Context) *lexmodelbuildingservice_sdkv2.Client { - return errs.Must(client[*lexmodelbuildingservice_sdkv2.Client](ctx, c, names.LexModels, make(map[string]any))) +func (c *AWSClient) LexModelsClient(ctx context.Context) *lexmodelbuildingservice.Client { + return errs.Must(client[*lexmodelbuildingservice.Client](ctx, c, names.LexModels, make(map[string]any))) } -func (c *AWSClient) LexV2ModelsClient(ctx context.Context) *lexmodelsv2_sdkv2.Client { - return errs.Must(client[*lexmodelsv2_sdkv2.Client](ctx, c, names.LexV2Models, make(map[string]any))) +func (c *AWSClient) LexV2ModelsClient(ctx context.Context) *lexmodelsv2.Client { + return errs.Must(client[*lexmodelsv2.Client](ctx, c, names.LexV2Models, make(map[string]any))) } -func (c *AWSClient) LicenseManagerClient(ctx context.Context) *licensemanager_sdkv2.Client { - return errs.Must(client[*licensemanager_sdkv2.Client](ctx, c, names.LicenseManager, make(map[string]any))) +func (c *AWSClient) LicenseManagerClient(ctx context.Context) *licensemanager.Client { + return errs.Must(client[*licensemanager.Client](ctx, c, names.LicenseManager, make(map[string]any))) } -func (c *AWSClient) LightsailClient(ctx context.Context) *lightsail_sdkv2.Client { - return errs.Must(client[*lightsail_sdkv2.Client](ctx, c, names.Lightsail, make(map[string]any))) +func (c *AWSClient) LightsailClient(ctx context.Context) *lightsail.Client { + return errs.Must(client[*lightsail.Client](ctx, c, names.Lightsail, make(map[string]any))) } -func (c *AWSClient) LocationClient(ctx context.Context) *location_sdkv2.Client { - return errs.Must(client[*location_sdkv2.Client](ctx, c, names.Location, make(map[string]any))) +func (c *AWSClient) LocationClient(ctx context.Context) *location.Client { + return errs.Must(client[*location.Client](ctx, c, names.Location, make(map[string]any))) } -func (c *AWSClient) LogsClient(ctx context.Context) *cloudwatchlogs_sdkv2.Client { - return errs.Must(client[*cloudwatchlogs_sdkv2.Client](ctx, c, names.Logs, make(map[string]any))) +func (c *AWSClient) LogsClient(ctx context.Context) *cloudwatchlogs.Client { + return errs.Must(client[*cloudwatchlogs.Client](ctx, c, names.Logs, make(map[string]any))) } -func (c *AWSClient) LookoutMetricsClient(ctx context.Context) *lookoutmetrics_sdkv2.Client { - return errs.Must(client[*lookoutmetrics_sdkv2.Client](ctx, c, names.LookoutMetrics, make(map[string]any))) +func (c *AWSClient) LookoutMetricsClient(ctx context.Context) *lookoutmetrics.Client { + return errs.Must(client[*lookoutmetrics.Client](ctx, c, names.LookoutMetrics, make(map[string]any))) } -func (c *AWSClient) M2Client(ctx context.Context) *m2_sdkv2.Client { - return errs.Must(client[*m2_sdkv2.Client](ctx, c, names.M2, make(map[string]any))) +func (c *AWSClient) M2Client(ctx context.Context) *m2.Client { + return errs.Must(client[*m2.Client](ctx, c, names.M2, make(map[string]any))) } -func (c *AWSClient) MQClient(ctx context.Context) *mq_sdkv2.Client { - return errs.Must(client[*mq_sdkv2.Client](ctx, c, names.MQ, make(map[string]any))) +func (c *AWSClient) MQClient(ctx context.Context) *mq.Client { + return errs.Must(client[*mq.Client](ctx, c, names.MQ, make(map[string]any))) } -func (c *AWSClient) MWAAClient(ctx context.Context) *mwaa_sdkv2.Client { - return errs.Must(client[*mwaa_sdkv2.Client](ctx, c, names.MWAA, make(map[string]any))) +func (c *AWSClient) MWAAClient(ctx context.Context) *mwaa.Client { + return errs.Must(client[*mwaa.Client](ctx, c, names.MWAA, make(map[string]any))) } -func (c *AWSClient) Macie2Client(ctx context.Context) *macie2_sdkv2.Client { - return errs.Must(client[*macie2_sdkv2.Client](ctx, c, names.Macie2, make(map[string]any))) +func (c *AWSClient) Macie2Client(ctx context.Context) *macie2.Client { + return errs.Must(client[*macie2.Client](ctx, c, names.Macie2, make(map[string]any))) } -func (c *AWSClient) MediaConnectClient(ctx context.Context) *mediaconnect_sdkv2.Client { - return errs.Must(client[*mediaconnect_sdkv2.Client](ctx, c, names.MediaConnect, make(map[string]any))) +func (c *AWSClient) MediaConnectClient(ctx context.Context) *mediaconnect.Client { + return errs.Must(client[*mediaconnect.Client](ctx, c, names.MediaConnect, make(map[string]any))) } -func (c *AWSClient) MediaConvertClient(ctx context.Context) *mediaconvert_sdkv2.Client { - return errs.Must(client[*mediaconvert_sdkv2.Client](ctx, c, names.MediaConvert, make(map[string]any))) +func (c *AWSClient) MediaConvertClient(ctx context.Context) *mediaconvert.Client { + return errs.Must(client[*mediaconvert.Client](ctx, c, names.MediaConvert, make(map[string]any))) } -func (c *AWSClient) MediaLiveClient(ctx context.Context) *medialive_sdkv2.Client { - return errs.Must(client[*medialive_sdkv2.Client](ctx, c, names.MediaLive, make(map[string]any))) +func (c *AWSClient) MediaLiveClient(ctx context.Context) *medialive.Client { + return errs.Must(client[*medialive.Client](ctx, c, names.MediaLive, make(map[string]any))) } -func (c *AWSClient) MediaPackageClient(ctx context.Context) *mediapackage_sdkv2.Client { - return errs.Must(client[*mediapackage_sdkv2.Client](ctx, c, names.MediaPackage, make(map[string]any))) +func (c *AWSClient) MediaPackageClient(ctx context.Context) *mediapackage.Client { + return errs.Must(client[*mediapackage.Client](ctx, c, names.MediaPackage, make(map[string]any))) } -func (c *AWSClient) MediaPackageV2Client(ctx context.Context) *mediapackagev2_sdkv2.Client { - return errs.Must(client[*mediapackagev2_sdkv2.Client](ctx, c, names.MediaPackageV2, make(map[string]any))) +func (c *AWSClient) MediaPackageV2Client(ctx context.Context) *mediapackagev2.Client { + return errs.Must(client[*mediapackagev2.Client](ctx, c, names.MediaPackageV2, make(map[string]any))) } -func (c *AWSClient) MediaStoreClient(ctx context.Context) *mediastore_sdkv2.Client { - return errs.Must(client[*mediastore_sdkv2.Client](ctx, c, names.MediaStore, make(map[string]any))) +func (c *AWSClient) MediaStoreClient(ctx context.Context) *mediastore.Client { + return errs.Must(client[*mediastore.Client](ctx, c, names.MediaStore, make(map[string]any))) } -func (c *AWSClient) MemoryDBClient(ctx context.Context) *memorydb_sdkv2.Client { - return errs.Must(client[*memorydb_sdkv2.Client](ctx, c, names.MemoryDB, make(map[string]any))) +func (c *AWSClient) MemoryDBClient(ctx context.Context) *memorydb.Client { + return errs.Must(client[*memorydb.Client](ctx, c, names.MemoryDB, make(map[string]any))) } -func (c *AWSClient) NeptuneClient(ctx context.Context) *neptune_sdkv2.Client { - return errs.Must(client[*neptune_sdkv2.Client](ctx, c, names.Neptune, make(map[string]any))) +func (c *AWSClient) NeptuneClient(ctx context.Context) *neptune.Client { + return errs.Must(client[*neptune.Client](ctx, c, names.Neptune, make(map[string]any))) } -func (c *AWSClient) NeptuneGraphClient(ctx context.Context) *neptunegraph_sdkv2.Client { - return errs.Must(client[*neptunegraph_sdkv2.Client](ctx, c, names.NeptuneGraph, make(map[string]any))) +func (c *AWSClient) NeptuneGraphClient(ctx context.Context) *neptunegraph.Client { + return errs.Must(client[*neptunegraph.Client](ctx, c, names.NeptuneGraph, make(map[string]any))) } -func (c *AWSClient) NetworkFirewallClient(ctx context.Context) *networkfirewall_sdkv2.Client { - return errs.Must(client[*networkfirewall_sdkv2.Client](ctx, c, names.NetworkFirewall, make(map[string]any))) +func (c *AWSClient) NetworkFirewallClient(ctx context.Context) *networkfirewall.Client { + return errs.Must(client[*networkfirewall.Client](ctx, c, names.NetworkFirewall, make(map[string]any))) } -func (c *AWSClient) NetworkManagerClient(ctx context.Context) *networkmanager_sdkv2.Client { - return errs.Must(client[*networkmanager_sdkv2.Client](ctx, c, names.NetworkManager, make(map[string]any))) +func (c *AWSClient) NetworkManagerClient(ctx context.Context) *networkmanager.Client { + return errs.Must(client[*networkmanager.Client](ctx, c, names.NetworkManager, make(map[string]any))) } -func (c *AWSClient) NetworkMonitorClient(ctx context.Context) *networkmonitor_sdkv2.Client { - return errs.Must(client[*networkmonitor_sdkv2.Client](ctx, c, names.NetworkMonitor, make(map[string]any))) +func (c *AWSClient) NetworkMonitorClient(ctx context.Context) *networkmonitor.Client { + return errs.Must(client[*networkmonitor.Client](ctx, c, names.NetworkMonitor, make(map[string]any))) } -func (c *AWSClient) ObservabilityAccessManagerClient(ctx context.Context) *oam_sdkv2.Client { - return errs.Must(client[*oam_sdkv2.Client](ctx, c, names.ObservabilityAccessManager, make(map[string]any))) +func (c *AWSClient) ObservabilityAccessManagerClient(ctx context.Context) *oam.Client { + return errs.Must(client[*oam.Client](ctx, c, names.ObservabilityAccessManager, make(map[string]any))) } -func (c *AWSClient) OpenSearchClient(ctx context.Context) *opensearch_sdkv2.Client { - return errs.Must(client[*opensearch_sdkv2.Client](ctx, c, names.OpenSearch, make(map[string]any))) +func (c *AWSClient) OpenSearchClient(ctx context.Context) *opensearch.Client { + return errs.Must(client[*opensearch.Client](ctx, c, names.OpenSearch, make(map[string]any))) } -func (c *AWSClient) OpenSearchIngestionClient(ctx context.Context) *osis_sdkv2.Client { - return errs.Must(client[*osis_sdkv2.Client](ctx, c, names.OpenSearchIngestion, make(map[string]any))) +func (c *AWSClient) OpenSearchIngestionClient(ctx context.Context) *osis.Client { + return errs.Must(client[*osis.Client](ctx, c, names.OpenSearchIngestion, make(map[string]any))) } -func (c *AWSClient) OpenSearchServerlessClient(ctx context.Context) *opensearchserverless_sdkv2.Client { - return errs.Must(client[*opensearchserverless_sdkv2.Client](ctx, c, names.OpenSearchServerless, make(map[string]any))) +func (c *AWSClient) OpenSearchServerlessClient(ctx context.Context) *opensearchserverless.Client { + return errs.Must(client[*opensearchserverless.Client](ctx, c, names.OpenSearchServerless, make(map[string]any))) } -func (c *AWSClient) OpsWorksClient(ctx context.Context) *opsworks_sdkv2.Client { - return errs.Must(client[*opsworks_sdkv2.Client](ctx, c, names.OpsWorks, make(map[string]any))) +func (c *AWSClient) OpsWorksClient(ctx context.Context) *opsworks.Client { + return errs.Must(client[*opsworks.Client](ctx, c, names.OpsWorks, make(map[string]any))) } -func (c *AWSClient) OrganizationsClient(ctx context.Context) *organizations_sdkv2.Client { - return errs.Must(client[*organizations_sdkv2.Client](ctx, c, names.Organizations, make(map[string]any))) +func (c *AWSClient) OrganizationsClient(ctx context.Context) *organizations.Client { + return errs.Must(client[*organizations.Client](ctx, c, names.Organizations, make(map[string]any))) } -func (c *AWSClient) OutpostsClient(ctx context.Context) *outposts_sdkv2.Client { - return errs.Must(client[*outposts_sdkv2.Client](ctx, c, names.Outposts, make(map[string]any))) +func (c *AWSClient) OutpostsClient(ctx context.Context) *outposts.Client { + return errs.Must(client[*outposts.Client](ctx, c, names.Outposts, make(map[string]any))) } -func (c *AWSClient) PCAConnectorADClient(ctx context.Context) *pcaconnectorad_sdkv2.Client { - return errs.Must(client[*pcaconnectorad_sdkv2.Client](ctx, c, names.PCAConnectorAD, make(map[string]any))) +func (c *AWSClient) PCAConnectorADClient(ctx context.Context) *pcaconnectorad.Client { + return errs.Must(client[*pcaconnectorad.Client](ctx, c, names.PCAConnectorAD, make(map[string]any))) } -func (c *AWSClient) PCSClient(ctx context.Context) *pcs_sdkv2.Client { - return errs.Must(client[*pcs_sdkv2.Client](ctx, c, names.PCS, make(map[string]any))) +func (c *AWSClient) PCSClient(ctx context.Context) *pcs.Client { + return errs.Must(client[*pcs.Client](ctx, c, names.PCS, make(map[string]any))) } -func (c *AWSClient) PaymentCryptographyClient(ctx context.Context) *paymentcryptography_sdkv2.Client { - return errs.Must(client[*paymentcryptography_sdkv2.Client](ctx, c, names.PaymentCryptography, make(map[string]any))) +func (c *AWSClient) PaymentCryptographyClient(ctx context.Context) *paymentcryptography.Client { + return errs.Must(client[*paymentcryptography.Client](ctx, c, names.PaymentCryptography, make(map[string]any))) } -func (c *AWSClient) PinpointClient(ctx context.Context) *pinpoint_sdkv2.Client { - return errs.Must(client[*pinpoint_sdkv2.Client](ctx, c, names.Pinpoint, make(map[string]any))) +func (c *AWSClient) PinpointClient(ctx context.Context) *pinpoint.Client { + return errs.Must(client[*pinpoint.Client](ctx, c, names.Pinpoint, make(map[string]any))) } -func (c *AWSClient) PinpointSMSVoiceV2Client(ctx context.Context) *pinpointsmsvoicev2_sdkv2.Client { - return errs.Must(client[*pinpointsmsvoicev2_sdkv2.Client](ctx, c, names.PinpointSMSVoiceV2, make(map[string]any))) +func (c *AWSClient) PinpointSMSVoiceV2Client(ctx context.Context) *pinpointsmsvoicev2.Client { + return errs.Must(client[*pinpointsmsvoicev2.Client](ctx, c, names.PinpointSMSVoiceV2, make(map[string]any))) } -func (c *AWSClient) PipesClient(ctx context.Context) *pipes_sdkv2.Client { - return errs.Must(client[*pipes_sdkv2.Client](ctx, c, names.Pipes, make(map[string]any))) +func (c *AWSClient) PipesClient(ctx context.Context) *pipes.Client { + return errs.Must(client[*pipes.Client](ctx, c, names.Pipes, make(map[string]any))) } -func (c *AWSClient) PollyClient(ctx context.Context) *polly_sdkv2.Client { - return errs.Must(client[*polly_sdkv2.Client](ctx, c, names.Polly, make(map[string]any))) +func (c *AWSClient) PollyClient(ctx context.Context) *polly.Client { + return errs.Must(client[*polly.Client](ctx, c, names.Polly, make(map[string]any))) } -func (c *AWSClient) PricingClient(ctx context.Context) *pricing_sdkv2.Client { - return errs.Must(client[*pricing_sdkv2.Client](ctx, c, names.Pricing, make(map[string]any))) +func (c *AWSClient) PricingClient(ctx context.Context) *pricing.Client { + return errs.Must(client[*pricing.Client](ctx, c, names.Pricing, make(map[string]any))) } -func (c *AWSClient) QBusinessClient(ctx context.Context) *qbusiness_sdkv2.Client { - return errs.Must(client[*qbusiness_sdkv2.Client](ctx, c, names.QBusiness, make(map[string]any))) +func (c *AWSClient) QBusinessClient(ctx context.Context) *qbusiness.Client { + return errs.Must(client[*qbusiness.Client](ctx, c, names.QBusiness, make(map[string]any))) } -func (c *AWSClient) QLDBClient(ctx context.Context) *qldb_sdkv2.Client { - return errs.Must(client[*qldb_sdkv2.Client](ctx, c, names.QLDB, make(map[string]any))) +func (c *AWSClient) QLDBClient(ctx context.Context) *qldb.Client { + return errs.Must(client[*qldb.Client](ctx, c, names.QLDB, make(map[string]any))) } -func (c *AWSClient) QuickSightClient(ctx context.Context) *quicksight_sdkv2.Client { - return errs.Must(client[*quicksight_sdkv2.Client](ctx, c, names.QuickSight, make(map[string]any))) +func (c *AWSClient) QuickSightClient(ctx context.Context) *quicksight.Client { + return errs.Must(client[*quicksight.Client](ctx, c, names.QuickSight, make(map[string]any))) } -func (c *AWSClient) RAMClient(ctx context.Context) *ram_sdkv2.Client { - return errs.Must(client[*ram_sdkv2.Client](ctx, c, names.RAM, make(map[string]any))) +func (c *AWSClient) RAMClient(ctx context.Context) *ram.Client { + return errs.Must(client[*ram.Client](ctx, c, names.RAM, make(map[string]any))) } -func (c *AWSClient) RBinClient(ctx context.Context) *rbin_sdkv2.Client { - return errs.Must(client[*rbin_sdkv2.Client](ctx, c, names.RBin, make(map[string]any))) +func (c *AWSClient) RBinClient(ctx context.Context) *rbin.Client { + return errs.Must(client[*rbin.Client](ctx, c, names.RBin, make(map[string]any))) } -func (c *AWSClient) RDSClient(ctx context.Context) *rds_sdkv2.Client { - return errs.Must(client[*rds_sdkv2.Client](ctx, c, names.RDS, make(map[string]any))) +func (c *AWSClient) RDSClient(ctx context.Context) *rds.Client { + return errs.Must(client[*rds.Client](ctx, c, names.RDS, make(map[string]any))) } -func (c *AWSClient) RUMClient(ctx context.Context) *rum_sdkv2.Client { - return errs.Must(client[*rum_sdkv2.Client](ctx, c, names.RUM, make(map[string]any))) +func (c *AWSClient) RUMClient(ctx context.Context) *rum.Client { + return errs.Must(client[*rum.Client](ctx, c, names.RUM, make(map[string]any))) } -func (c *AWSClient) RedshiftClient(ctx context.Context) *redshift_sdkv2.Client { - return errs.Must(client[*redshift_sdkv2.Client](ctx, c, names.Redshift, make(map[string]any))) +func (c *AWSClient) RedshiftClient(ctx context.Context) *redshift.Client { + return errs.Must(client[*redshift.Client](ctx, c, names.Redshift, make(map[string]any))) } -func (c *AWSClient) RedshiftDataClient(ctx context.Context) *redshiftdata_sdkv2.Client { - return errs.Must(client[*redshiftdata_sdkv2.Client](ctx, c, names.RedshiftData, make(map[string]any))) +func (c *AWSClient) RedshiftDataClient(ctx context.Context) *redshiftdata.Client { + return errs.Must(client[*redshiftdata.Client](ctx, c, names.RedshiftData, make(map[string]any))) } -func (c *AWSClient) RedshiftServerlessClient(ctx context.Context) *redshiftserverless_sdkv2.Client { - return errs.Must(client[*redshiftserverless_sdkv2.Client](ctx, c, names.RedshiftServerless, make(map[string]any))) +func (c *AWSClient) RedshiftServerlessClient(ctx context.Context) *redshiftserverless.Client { + return errs.Must(client[*redshiftserverless.Client](ctx, c, names.RedshiftServerless, make(map[string]any))) } -func (c *AWSClient) RekognitionClient(ctx context.Context) *rekognition_sdkv2.Client { - return errs.Must(client[*rekognition_sdkv2.Client](ctx, c, names.Rekognition, make(map[string]any))) +func (c *AWSClient) RekognitionClient(ctx context.Context) *rekognition.Client { + return errs.Must(client[*rekognition.Client](ctx, c, names.Rekognition, make(map[string]any))) } -func (c *AWSClient) ResilienceHubClient(ctx context.Context) *resiliencehub_sdkv2.Client { - return errs.Must(client[*resiliencehub_sdkv2.Client](ctx, c, names.ResilienceHub, make(map[string]any))) +func (c *AWSClient) ResilienceHubClient(ctx context.Context) *resiliencehub.Client { + return errs.Must(client[*resiliencehub.Client](ctx, c, names.ResilienceHub, make(map[string]any))) } -func (c *AWSClient) ResourceExplorer2Client(ctx context.Context) *resourceexplorer2_sdkv2.Client { - return errs.Must(client[*resourceexplorer2_sdkv2.Client](ctx, c, names.ResourceExplorer2, make(map[string]any))) +func (c *AWSClient) ResourceExplorer2Client(ctx context.Context) *resourceexplorer2.Client { + return errs.Must(client[*resourceexplorer2.Client](ctx, c, names.ResourceExplorer2, make(map[string]any))) } -func (c *AWSClient) ResourceGroupsClient(ctx context.Context) *resourcegroups_sdkv2.Client { - return errs.Must(client[*resourcegroups_sdkv2.Client](ctx, c, names.ResourceGroups, make(map[string]any))) +func (c *AWSClient) ResourceGroupsClient(ctx context.Context) *resourcegroups.Client { + return errs.Must(client[*resourcegroups.Client](ctx, c, names.ResourceGroups, make(map[string]any))) } -func (c *AWSClient) ResourceGroupsTaggingAPIClient(ctx context.Context) *resourcegroupstaggingapi_sdkv2.Client { - return errs.Must(client[*resourcegroupstaggingapi_sdkv2.Client](ctx, c, names.ResourceGroupsTaggingAPI, make(map[string]any))) +func (c *AWSClient) ResourceGroupsTaggingAPIClient(ctx context.Context) *resourcegroupstaggingapi.Client { + return errs.Must(client[*resourcegroupstaggingapi.Client](ctx, c, names.ResourceGroupsTaggingAPI, make(map[string]any))) } -func (c *AWSClient) RolesAnywhereClient(ctx context.Context) *rolesanywhere_sdkv2.Client { - return errs.Must(client[*rolesanywhere_sdkv2.Client](ctx, c, names.RolesAnywhere, make(map[string]any))) +func (c *AWSClient) RolesAnywhereClient(ctx context.Context) *rolesanywhere.Client { + return errs.Must(client[*rolesanywhere.Client](ctx, c, names.RolesAnywhere, make(map[string]any))) } -func (c *AWSClient) Route53Client(ctx context.Context) *route53_sdkv2.Client { - return errs.Must(client[*route53_sdkv2.Client](ctx, c, names.Route53, make(map[string]any))) +func (c *AWSClient) Route53Client(ctx context.Context) *route53.Client { + return errs.Must(client[*route53.Client](ctx, c, names.Route53, make(map[string]any))) } -func (c *AWSClient) Route53DomainsClient(ctx context.Context) *route53domains_sdkv2.Client { - return errs.Must(client[*route53domains_sdkv2.Client](ctx, c, names.Route53Domains, make(map[string]any))) +func (c *AWSClient) Route53DomainsClient(ctx context.Context) *route53domains.Client { + return errs.Must(client[*route53domains.Client](ctx, c, names.Route53Domains, make(map[string]any))) } -func (c *AWSClient) Route53ProfilesClient(ctx context.Context) *route53profiles_sdkv2.Client { - return errs.Must(client[*route53profiles_sdkv2.Client](ctx, c, names.Route53Profiles, make(map[string]any))) +func (c *AWSClient) Route53ProfilesClient(ctx context.Context) *route53profiles.Client { + return errs.Must(client[*route53profiles.Client](ctx, c, names.Route53Profiles, make(map[string]any))) } -func (c *AWSClient) Route53RecoveryControlConfigClient(ctx context.Context) *route53recoverycontrolconfig_sdkv2.Client { - return errs.Must(client[*route53recoverycontrolconfig_sdkv2.Client](ctx, c, names.Route53RecoveryControlConfig, make(map[string]any))) +func (c *AWSClient) Route53RecoveryControlConfigClient(ctx context.Context) *route53recoverycontrolconfig.Client { + return errs.Must(client[*route53recoverycontrolconfig.Client](ctx, c, names.Route53RecoveryControlConfig, make(map[string]any))) } -func (c *AWSClient) Route53RecoveryReadinessClient(ctx context.Context) *route53recoveryreadiness_sdkv2.Client { - return errs.Must(client[*route53recoveryreadiness_sdkv2.Client](ctx, c, names.Route53RecoveryReadiness, make(map[string]any))) +func (c *AWSClient) Route53RecoveryReadinessClient(ctx context.Context) *route53recoveryreadiness.Client { + return errs.Must(client[*route53recoveryreadiness.Client](ctx, c, names.Route53RecoveryReadiness, make(map[string]any))) } -func (c *AWSClient) Route53ResolverClient(ctx context.Context) *route53resolver_sdkv2.Client { - return errs.Must(client[*route53resolver_sdkv2.Client](ctx, c, names.Route53Resolver, make(map[string]any))) +func (c *AWSClient) Route53ResolverClient(ctx context.Context) *route53resolver.Client { + return errs.Must(client[*route53resolver.Client](ctx, c, names.Route53Resolver, make(map[string]any))) } -func (c *AWSClient) S3Client(ctx context.Context) *s3_sdkv2.Client { - return errs.Must(client[*s3_sdkv2.Client](ctx, c, names.S3, make(map[string]any))) +func (c *AWSClient) S3Client(ctx context.Context) *s3.Client { + return errs.Must(client[*s3.Client](ctx, c, names.S3, make(map[string]any))) } -func (c *AWSClient) S3ControlClient(ctx context.Context) *s3control_sdkv2.Client { - return errs.Must(client[*s3control_sdkv2.Client](ctx, c, names.S3Control, make(map[string]any))) +func (c *AWSClient) S3ControlClient(ctx context.Context) *s3control.Client { + return errs.Must(client[*s3control.Client](ctx, c, names.S3Control, make(map[string]any))) } -func (c *AWSClient) S3OutpostsClient(ctx context.Context) *s3outposts_sdkv2.Client { - return errs.Must(client[*s3outposts_sdkv2.Client](ctx, c, names.S3Outposts, make(map[string]any))) +func (c *AWSClient) S3OutpostsClient(ctx context.Context) *s3outposts.Client { + return errs.Must(client[*s3outposts.Client](ctx, c, names.S3Outposts, make(map[string]any))) } -func (c *AWSClient) SESClient(ctx context.Context) *ses_sdkv2.Client { - return errs.Must(client[*ses_sdkv2.Client](ctx, c, names.SES, make(map[string]any))) +func (c *AWSClient) SESClient(ctx context.Context) *ses.Client { + return errs.Must(client[*ses.Client](ctx, c, names.SES, make(map[string]any))) } -func (c *AWSClient) SESV2Client(ctx context.Context) *sesv2_sdkv2.Client { - return errs.Must(client[*sesv2_sdkv2.Client](ctx, c, names.SESV2, make(map[string]any))) +func (c *AWSClient) SESV2Client(ctx context.Context) *sesv2.Client { + return errs.Must(client[*sesv2.Client](ctx, c, names.SESV2, make(map[string]any))) } -func (c *AWSClient) SFNClient(ctx context.Context) *sfn_sdkv2.Client { - return errs.Must(client[*sfn_sdkv2.Client](ctx, c, names.SFN, make(map[string]any))) +func (c *AWSClient) SFNClient(ctx context.Context) *sfn.Client { + return errs.Must(client[*sfn.Client](ctx, c, names.SFN, make(map[string]any))) } -func (c *AWSClient) SNSClient(ctx context.Context) *sns_sdkv2.Client { - return errs.Must(client[*sns_sdkv2.Client](ctx, c, names.SNS, make(map[string]any))) +func (c *AWSClient) SNSClient(ctx context.Context) *sns.Client { + return errs.Must(client[*sns.Client](ctx, c, names.SNS, make(map[string]any))) } -func (c *AWSClient) SQSClient(ctx context.Context) *sqs_sdkv2.Client { - return errs.Must(client[*sqs_sdkv2.Client](ctx, c, names.SQS, make(map[string]any))) +func (c *AWSClient) SQSClient(ctx context.Context) *sqs.Client { + return errs.Must(client[*sqs.Client](ctx, c, names.SQS, make(map[string]any))) } -func (c *AWSClient) SSMClient(ctx context.Context) *ssm_sdkv2.Client { - return errs.Must(client[*ssm_sdkv2.Client](ctx, c, names.SSM, make(map[string]any))) +func (c *AWSClient) SSMClient(ctx context.Context) *ssm.Client { + return errs.Must(client[*ssm.Client](ctx, c, names.SSM, make(map[string]any))) } -func (c *AWSClient) SSMContactsClient(ctx context.Context) *ssmcontacts_sdkv2.Client { - return errs.Must(client[*ssmcontacts_sdkv2.Client](ctx, c, names.SSMContacts, make(map[string]any))) +func (c *AWSClient) SSMContactsClient(ctx context.Context) *ssmcontacts.Client { + return errs.Must(client[*ssmcontacts.Client](ctx, c, names.SSMContacts, make(map[string]any))) } -func (c *AWSClient) SSMIncidentsClient(ctx context.Context) *ssmincidents_sdkv2.Client { - return errs.Must(client[*ssmincidents_sdkv2.Client](ctx, c, names.SSMIncidents, make(map[string]any))) +func (c *AWSClient) SSMIncidentsClient(ctx context.Context) *ssmincidents.Client { + return errs.Must(client[*ssmincidents.Client](ctx, c, names.SSMIncidents, make(map[string]any))) } -func (c *AWSClient) SSMQuickSetupClient(ctx context.Context) *ssmquicksetup_sdkv2.Client { - return errs.Must(client[*ssmquicksetup_sdkv2.Client](ctx, c, names.SSMQuickSetup, make(map[string]any))) +func (c *AWSClient) SSMQuickSetupClient(ctx context.Context) *ssmquicksetup.Client { + return errs.Must(client[*ssmquicksetup.Client](ctx, c, names.SSMQuickSetup, make(map[string]any))) } -func (c *AWSClient) SSMSAPClient(ctx context.Context) *ssmsap_sdkv2.Client { - return errs.Must(client[*ssmsap_sdkv2.Client](ctx, c, names.SSMSAP, make(map[string]any))) +func (c *AWSClient) SSMSAPClient(ctx context.Context) *ssmsap.Client { + return errs.Must(client[*ssmsap.Client](ctx, c, names.SSMSAP, make(map[string]any))) } -func (c *AWSClient) SSOClient(ctx context.Context) *sso_sdkv2.Client { - return errs.Must(client[*sso_sdkv2.Client](ctx, c, names.SSO, make(map[string]any))) +func (c *AWSClient) SSOClient(ctx context.Context) *sso.Client { + return errs.Must(client[*sso.Client](ctx, c, names.SSO, make(map[string]any))) } -func (c *AWSClient) SSOAdminClient(ctx context.Context) *ssoadmin_sdkv2.Client { - return errs.Must(client[*ssoadmin_sdkv2.Client](ctx, c, names.SSOAdmin, make(map[string]any))) +func (c *AWSClient) SSOAdminClient(ctx context.Context) *ssoadmin.Client { + return errs.Must(client[*ssoadmin.Client](ctx, c, names.SSOAdmin, make(map[string]any))) } -func (c *AWSClient) STSClient(ctx context.Context) *sts_sdkv2.Client { - return errs.Must(client[*sts_sdkv2.Client](ctx, c, names.STS, make(map[string]any))) +func (c *AWSClient) STSClient(ctx context.Context) *sts.Client { + return errs.Must(client[*sts.Client](ctx, c, names.STS, make(map[string]any))) } -func (c *AWSClient) SWFClient(ctx context.Context) *swf_sdkv2.Client { - return errs.Must(client[*swf_sdkv2.Client](ctx, c, names.SWF, make(map[string]any))) +func (c *AWSClient) SWFClient(ctx context.Context) *swf.Client { + return errs.Must(client[*swf.Client](ctx, c, names.SWF, make(map[string]any))) } -func (c *AWSClient) SageMakerClient(ctx context.Context) *sagemaker_sdkv2.Client { - return errs.Must(client[*sagemaker_sdkv2.Client](ctx, c, names.SageMaker, make(map[string]any))) +func (c *AWSClient) SageMakerClient(ctx context.Context) *sagemaker.Client { + return errs.Must(client[*sagemaker.Client](ctx, c, names.SageMaker, make(map[string]any))) } -func (c *AWSClient) SchedulerClient(ctx context.Context) *scheduler_sdkv2.Client { - return errs.Must(client[*scheduler_sdkv2.Client](ctx, c, names.Scheduler, make(map[string]any))) +func (c *AWSClient) SchedulerClient(ctx context.Context) *scheduler.Client { + return errs.Must(client[*scheduler.Client](ctx, c, names.Scheduler, make(map[string]any))) } -func (c *AWSClient) SchemasClient(ctx context.Context) *schemas_sdkv2.Client { - return errs.Must(client[*schemas_sdkv2.Client](ctx, c, names.Schemas, make(map[string]any))) +func (c *AWSClient) SchemasClient(ctx context.Context) *schemas.Client { + return errs.Must(client[*schemas.Client](ctx, c, names.Schemas, make(map[string]any))) } -func (c *AWSClient) SecretsManagerClient(ctx context.Context) *secretsmanager_sdkv2.Client { - return errs.Must(client[*secretsmanager_sdkv2.Client](ctx, c, names.SecretsManager, make(map[string]any))) +func (c *AWSClient) SecretsManagerClient(ctx context.Context) *secretsmanager.Client { + return errs.Must(client[*secretsmanager.Client](ctx, c, names.SecretsManager, make(map[string]any))) } -func (c *AWSClient) SecurityHubClient(ctx context.Context) *securityhub_sdkv2.Client { - return errs.Must(client[*securityhub_sdkv2.Client](ctx, c, names.SecurityHub, make(map[string]any))) +func (c *AWSClient) SecurityHubClient(ctx context.Context) *securityhub.Client { + return errs.Must(client[*securityhub.Client](ctx, c, names.SecurityHub, make(map[string]any))) } -func (c *AWSClient) SecurityLakeClient(ctx context.Context) *securitylake_sdkv2.Client { - return errs.Must(client[*securitylake_sdkv2.Client](ctx, c, names.SecurityLake, make(map[string]any))) +func (c *AWSClient) SecurityLakeClient(ctx context.Context) *securitylake.Client { + return errs.Must(client[*securitylake.Client](ctx, c, names.SecurityLake, make(map[string]any))) } -func (c *AWSClient) ServerlessRepoClient(ctx context.Context) *serverlessapplicationrepository_sdkv2.Client { - return errs.Must(client[*serverlessapplicationrepository_sdkv2.Client](ctx, c, names.ServerlessRepo, make(map[string]any))) +func (c *AWSClient) ServerlessRepoClient(ctx context.Context) *serverlessapplicationrepository.Client { + return errs.Must(client[*serverlessapplicationrepository.Client](ctx, c, names.ServerlessRepo, make(map[string]any))) } -func (c *AWSClient) ServiceCatalogClient(ctx context.Context) *servicecatalog_sdkv2.Client { - return errs.Must(client[*servicecatalog_sdkv2.Client](ctx, c, names.ServiceCatalog, make(map[string]any))) +func (c *AWSClient) ServiceCatalogClient(ctx context.Context) *servicecatalog.Client { + return errs.Must(client[*servicecatalog.Client](ctx, c, names.ServiceCatalog, make(map[string]any))) } -func (c *AWSClient) ServiceCatalogAppRegistryClient(ctx context.Context) *servicecatalogappregistry_sdkv2.Client { - return errs.Must(client[*servicecatalogappregistry_sdkv2.Client](ctx, c, names.ServiceCatalogAppRegistry, make(map[string]any))) +func (c *AWSClient) ServiceCatalogAppRegistryClient(ctx context.Context) *servicecatalogappregistry.Client { + return errs.Must(client[*servicecatalogappregistry.Client](ctx, c, names.ServiceCatalogAppRegistry, make(map[string]any))) } -func (c *AWSClient) ServiceDiscoveryClient(ctx context.Context) *servicediscovery_sdkv2.Client { - return errs.Must(client[*servicediscovery_sdkv2.Client](ctx, c, names.ServiceDiscovery, make(map[string]any))) +func (c *AWSClient) ServiceDiscoveryClient(ctx context.Context) *servicediscovery.Client { + return errs.Must(client[*servicediscovery.Client](ctx, c, names.ServiceDiscovery, make(map[string]any))) } -func (c *AWSClient) ServiceQuotasClient(ctx context.Context) *servicequotas_sdkv2.Client { - return errs.Must(client[*servicequotas_sdkv2.Client](ctx, c, names.ServiceQuotas, make(map[string]any))) +func (c *AWSClient) ServiceQuotasClient(ctx context.Context) *servicequotas.Client { + return errs.Must(client[*servicequotas.Client](ctx, c, names.ServiceQuotas, make(map[string]any))) } -func (c *AWSClient) ShieldClient(ctx context.Context) *shield_sdkv2.Client { - return errs.Must(client[*shield_sdkv2.Client](ctx, c, names.Shield, make(map[string]any))) +func (c *AWSClient) ShieldClient(ctx context.Context) *shield.Client { + return errs.Must(client[*shield.Client](ctx, c, names.Shield, make(map[string]any))) } -func (c *AWSClient) SignerClient(ctx context.Context) *signer_sdkv2.Client { - return errs.Must(client[*signer_sdkv2.Client](ctx, c, names.Signer, make(map[string]any))) +func (c *AWSClient) SignerClient(ctx context.Context) *signer.Client { + return errs.Must(client[*signer.Client](ctx, c, names.Signer, make(map[string]any))) } -func (c *AWSClient) SimpleDBConn(ctx context.Context) *simpledb_sdkv1.SimpleDB { - return errs.Must(conn[*simpledb_sdkv1.SimpleDB](ctx, c, names.SimpleDB, make(map[string]any))) +func (c *AWSClient) StorageGatewayClient(ctx context.Context) *storagegateway.Client { + return errs.Must(client[*storagegateway.Client](ctx, c, names.StorageGateway, make(map[string]any))) } -func (c *AWSClient) StorageGatewayClient(ctx context.Context) *storagegateway_sdkv2.Client { - return errs.Must(client[*storagegateway_sdkv2.Client](ctx, c, names.StorageGateway, make(map[string]any))) +func (c *AWSClient) SyntheticsClient(ctx context.Context) *synthetics.Client { + return errs.Must(client[*synthetics.Client](ctx, c, names.Synthetics, make(map[string]any))) } -func (c *AWSClient) SyntheticsClient(ctx context.Context) *synthetics_sdkv2.Client { - return errs.Must(client[*synthetics_sdkv2.Client](ctx, c, names.Synthetics, make(map[string]any))) +func (c *AWSClient) TimestreamInfluxDBClient(ctx context.Context) *timestreaminfluxdb.Client { + return errs.Must(client[*timestreaminfluxdb.Client](ctx, c, names.TimestreamInfluxDB, make(map[string]any))) } -func (c *AWSClient) TimestreamInfluxDBClient(ctx context.Context) *timestreaminfluxdb_sdkv2.Client { - return errs.Must(client[*timestreaminfluxdb_sdkv2.Client](ctx, c, names.TimestreamInfluxDB, make(map[string]any))) +func (c *AWSClient) TimestreamWriteClient(ctx context.Context) *timestreamwrite.Client { + return errs.Must(client[*timestreamwrite.Client](ctx, c, names.TimestreamWrite, make(map[string]any))) } -func (c *AWSClient) TimestreamWriteClient(ctx context.Context) *timestreamwrite_sdkv2.Client { - return errs.Must(client[*timestreamwrite_sdkv2.Client](ctx, c, names.TimestreamWrite, make(map[string]any))) +func (c *AWSClient) TranscribeClient(ctx context.Context) *transcribe.Client { + return errs.Must(client[*transcribe.Client](ctx, c, names.Transcribe, make(map[string]any))) } -func (c *AWSClient) TranscribeClient(ctx context.Context) *transcribe_sdkv2.Client { - return errs.Must(client[*transcribe_sdkv2.Client](ctx, c, names.Transcribe, make(map[string]any))) +func (c *AWSClient) TransferClient(ctx context.Context) *transfer.Client { + return errs.Must(client[*transfer.Client](ctx, c, names.Transfer, make(map[string]any))) } -func (c *AWSClient) TransferClient(ctx context.Context) *transfer_sdkv2.Client { - return errs.Must(client[*transfer_sdkv2.Client](ctx, c, names.Transfer, make(map[string]any))) +func (c *AWSClient) VPCLatticeClient(ctx context.Context) *vpclattice.Client { + return errs.Must(client[*vpclattice.Client](ctx, c, names.VPCLattice, make(map[string]any))) } -func (c *AWSClient) VPCLatticeClient(ctx context.Context) *vpclattice_sdkv2.Client { - return errs.Must(client[*vpclattice_sdkv2.Client](ctx, c, names.VPCLattice, make(map[string]any))) +func (c *AWSClient) VerifiedPermissionsClient(ctx context.Context) *verifiedpermissions.Client { + return errs.Must(client[*verifiedpermissions.Client](ctx, c, names.VerifiedPermissions, make(map[string]any))) } -func (c *AWSClient) VerifiedPermissionsClient(ctx context.Context) *verifiedpermissions_sdkv2.Client { - return errs.Must(client[*verifiedpermissions_sdkv2.Client](ctx, c, names.VerifiedPermissions, make(map[string]any))) +func (c *AWSClient) WAFClient(ctx context.Context) *waf.Client { + return errs.Must(client[*waf.Client](ctx, c, names.WAF, make(map[string]any))) } -func (c *AWSClient) WAFClient(ctx context.Context) *waf_sdkv2.Client { - return errs.Must(client[*waf_sdkv2.Client](ctx, c, names.WAF, make(map[string]any))) +func (c *AWSClient) WAFRegionalClient(ctx context.Context) *wafregional.Client { + return errs.Must(client[*wafregional.Client](ctx, c, names.WAFRegional, make(map[string]any))) } -func (c *AWSClient) WAFRegionalClient(ctx context.Context) *wafregional_sdkv2.Client { - return errs.Must(client[*wafregional_sdkv2.Client](ctx, c, names.WAFRegional, make(map[string]any))) +func (c *AWSClient) WAFV2Client(ctx context.Context) *wafv2.Client { + return errs.Must(client[*wafv2.Client](ctx, c, names.WAFV2, make(map[string]any))) } -func (c *AWSClient) WAFV2Client(ctx context.Context) *wafv2_sdkv2.Client { - return errs.Must(client[*wafv2_sdkv2.Client](ctx, c, names.WAFV2, make(map[string]any))) +func (c *AWSClient) WellArchitectedClient(ctx context.Context) *wellarchitected.Client { + return errs.Must(client[*wellarchitected.Client](ctx, c, names.WellArchitected, make(map[string]any))) } -func (c *AWSClient) WellArchitectedClient(ctx context.Context) *wellarchitected_sdkv2.Client { - return errs.Must(client[*wellarchitected_sdkv2.Client](ctx, c, names.WellArchitected, make(map[string]any))) +func (c *AWSClient) WorkLinkClient(ctx context.Context) *worklink.Client { + return errs.Must(client[*worklink.Client](ctx, c, names.WorkLink, make(map[string]any))) } -func (c *AWSClient) WorkLinkClient(ctx context.Context) *worklink_sdkv2.Client { - return errs.Must(client[*worklink_sdkv2.Client](ctx, c, names.WorkLink, make(map[string]any))) +func (c *AWSClient) WorkSpacesClient(ctx context.Context) *workspaces.Client { + return errs.Must(client[*workspaces.Client](ctx, c, names.WorkSpaces, make(map[string]any))) } -func (c *AWSClient) WorkSpacesClient(ctx context.Context) *workspaces_sdkv2.Client { - return errs.Must(client[*workspaces_sdkv2.Client](ctx, c, names.WorkSpaces, make(map[string]any))) +func (c *AWSClient) WorkSpacesWebClient(ctx context.Context) *workspacesweb.Client { + return errs.Must(client[*workspacesweb.Client](ctx, c, names.WorkSpacesWeb, make(map[string]any))) } -func (c *AWSClient) WorkSpacesWebClient(ctx context.Context) *workspacesweb_sdkv2.Client { - return errs.Must(client[*workspacesweb_sdkv2.Client](ctx, c, names.WorkSpacesWeb, make(map[string]any))) -} - -func (c *AWSClient) XRayClient(ctx context.Context) *xray_sdkv2.Client { - return errs.Must(client[*xray_sdkv2.Client](ctx, c, names.XRay, make(map[string]any))) +func (c *AWSClient) XRayClient(ctx context.Context) *xray.Client { + return errs.Must(client[*xray.Client](ctx, c, names.XRay, make(map[string]any))) } diff --git a/internal/conns/awsclient_resolveendpoint_gen.go b/internal/conns/awsclient_resolveendpoint_gen.go deleted file mode 100644 index 539381e2a34..00000000000 --- a/internal/conns/awsclient_resolveendpoint_gen.go +++ /dev/null @@ -1,43 +0,0 @@ -// Code generated by internal/generate/resolveendpoints/main.go; DO NOT EDIT. - -// Copyright (c) HashiCorp, Inc. -// SPDX-License-Identifier: MPL-2.0 - -package conns - -import ( - "context" - "os" - - "github.com/aws/aws-sdk-go-v2/aws" -) - -func (c *AWSClient) resolveEndpoint(ctx context.Context, servicePackageName string) string { - endpoint := c.endpoints[servicePackageName] - if endpoint != "" { - return endpoint - } - - // Only SDK v1 packages. This is already supported by SDK v2. - switch servicePackageName { - - case "simpledb": - endpoint = aws.ToString(c.awsConfig.BaseEndpoint) - svc := os.Getenv("AWS_ENDPOINT_URL_SIMPLEDB") - if svc != "" { - return svc - } - - if base := os.Getenv("AWS_ENDPOINT_URL"); base != "" { - return base - } - - endpoint, found, err := resolveServiceBaseEndpoint(ctx, "SimpleDB", c.awsConfig.ConfigSources) - if found && err == nil { - return endpoint - } - - } - - return endpoint -} diff --git a/internal/conns/awsclient_test.go b/internal/conns/awsclient_test.go index 5676cd90d93..eaa2d52cce8 100644 --- a/internal/conns/awsclient_test.go +++ b/internal/conns/awsclient_test.go @@ -177,3 +177,49 @@ func TestAWSClientEC2PublicDNSNameForIP(t *testing.T) { // nosemgrep:ci.aws-in-f }) } } + +func TestReverseDNS(t *testing.T) { + t.Parallel() + + testCases := []struct { + name string + input string + expected string + }{ + { + name: "empty", + input: "", + expected: "", + }, + { + name: "amazonaws.com", + input: "amazonaws.com", + expected: "com.amazonaws", + }, + { + name: "amazonaws.com.cn", + input: "amazonaws.com.cn", + expected: "cn.com.amazonaws", + }, + { + name: "sc2s.sgov.gov", + input: "sc2s.sgov.gov", + expected: "gov.sgov.sc2s", + }, + { + name: "c2s.ic.gov", + input: "c2s.ic.gov", + expected: "gov.ic.c2s", + }, + } + + for _, testCase := range testCases { + t.Run(testCase.name, func(t *testing.T) { + t.Parallel() + + if got, want := ReverseDNS(testCase.input), testCase.expected; got != want { + t.Errorf("got: %s, expected: %s", got, want) + } + }) + } +} diff --git a/internal/conns/config.go b/internal/conns/config.go index 14759c2e241..3c1521b6f42 100644 --- a/internal/conns/config.go +++ b/internal/conns/config.go @@ -9,8 +9,8 @@ import ( "strings" "time" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - imds_sdkv2 "github.com/aws/aws-sdk-go-v2/feature/ec2/imds" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/feature/ec2/imds" awsbase "github.com/hashicorp/aws-sdk-go-base/v2" awsbasev1 "github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2" basediag "github.com/hashicorp/aws-sdk-go-base/v2/diag" @@ -33,7 +33,7 @@ type Config struct { AssumeRoleWithWebIdentity *awsbase.AssumeRoleWithWebIdentity CustomCABundle string DefaultTagsConfig *tftags.DefaultConfig - EC2MetadataServiceEnableState imds_sdkv2.ClientEnableState + EC2MetadataServiceEnableState imds.ClientEnableState EC2MetadataServiceEndpoint string EC2MetadataServiceEndpointMode string Endpoints map[string]string @@ -46,7 +46,7 @@ type Config struct { NoProxy string Profile string Region string - RetryMode aws_sdkv2.RetryMode + RetryMode aws.RetryMode S3UsePathStyle bool S3USEast1RegionalEndpoint string SecretKey string diff --git a/internal/conns/generate.go b/internal/conns/generate.go index b4d4cc9f1f0..201771e6fcc 100644 --- a/internal/conns/generate.go +++ b/internal/conns/generate.go @@ -2,7 +2,6 @@ // SPDX-License-Identifier: MPL-2.0 //go:generate go run ../generate/awsclient/main.go -//go:generate go run ../generate/resolveendpoints/main.go // ONLY generate directives and package declaration! Do not add anything else to this file. package conns diff --git a/internal/generate/awsclient/file.gtpl b/internal/generate/awsclient/file.gtpl index 900b3e65b09..d85cf2ec5a8 100644 --- a/internal/generate/awsclient/file.gtpl +++ b/internal/generate/awsclient/file.gtpl @@ -5,24 +5,14 @@ import ( "context" {{ range .Services }} - {{- if eq .SDKVersion 1 }} - {{ .GoPackage }}_sdkv1 "github.com/aws/aws-sdk-go/service/{{ .GoPackage }}" - {{- else }} - {{ .GoPackage }}_sdkv2 "github.com/aws/aws-sdk-go-v2/service/{{ .GoPackage }}" - {{- end }} + "github.com/aws/aws-sdk-go-v2/service/{{ .GoPackage }}" {{- end }} "github.com/hashicorp/terraform-provider-aws/internal/errs" "github.com/hashicorp/terraform-provider-aws/names" ) {{ range .Services }} - {{if eq .SDKVersion 1 }} -func (c *AWSClient) {{ .ProviderNameUpper }}Conn(ctx context.Context) *{{ .GoPackage }}_sdkv1.{{ .GoV1ClientTypeName }} { - return errs.Must(conn[*{{ .GoPackage }}_sdkv1.{{ .GoV1ClientTypeName }}](ctx, c, names.{{ .ProviderNameUpper }}, make(map[string]any))) +func (c *AWSClient) {{ .ProviderNameUpper }}Client(ctx context.Context) *{{ .GoPackage }}.Client { + return errs.Must(client[*{{ .GoPackage }}.Client](ctx, c, names.{{ .ProviderNameUpper }}, make(map[string]any))) } - {{- else }} -func (c *AWSClient) {{ .ProviderNameUpper }}Client(ctx context.Context) *{{ .GoPackage }}_sdkv2.Client { - return errs.Must(client[*{{ .GoPackage }}_sdkv2.Client](ctx, c, names.{{ .ProviderNameUpper }}, make(map[string]any))) -} - {{- end }} {{ end }} diff --git a/internal/generate/awsclient/main.go b/internal/generate/awsclient/main.go index b72bf2d9c81..ad89bee6f38 100644 --- a/internal/generate/awsclient/main.go +++ b/internal/generate/awsclient/main.go @@ -15,10 +15,8 @@ import ( ) type ServiceDatum struct { - SDKVersion int - GoPackage string - GoV1ClientTypeName string - ProviderNameUpper string + GoPackage string + ProviderNameUpper string } type TemplateData struct { @@ -49,16 +47,15 @@ func main() { continue } + if l.IsClientSDKV1() { + continue + } + s := ServiceDatum{ ProviderNameUpper: l.ProviderNameUpper(), - SDKVersion: l.SDKVersion(), GoPackage: l.GoPackageName(), } - if l.IsClientSDKV1() { - s.GoV1ClientTypeName = l.GoV1ClientTypeName() - } - td.Services = append(td.Services, s) } diff --git a/internal/generate/resolveendpoints/main.go b/internal/generate/resolveendpoints/main.go deleted file mode 100644 index 6e1dbf8a326..00000000000 --- a/internal/generate/resolveendpoints/main.go +++ /dev/null @@ -1,67 +0,0 @@ -// Copyright (c) HashiCorp, Inc. -// SPDX-License-Identifier: MPL-2.0 - -//go:build generate -// +build generate - -package main - -import ( - _ "embed" - "slices" - "strings" - - "github.com/hashicorp/terraform-provider-aws/internal/generate/common" - "github.com/hashicorp/terraform-provider-aws/names/data" -) - -func main() { - filename := `awsclient_resolveendpoint_gen.go` - - g := common.NewGenerator() - - serviceData, err := data.ReadAllServiceData() - - if err != nil { - g.Fatalf("error reading service data: %s", err) - } - - var services []serviceDatum - for _, l := range serviceData { - if l.IsClientSDKV1() { - services = append(services, serviceDatum{ - PackageName: l.ProviderPackage(), - ServiceEndpointEnvVar: l.AWSServiceEnvVar(), - SDKID: l.SDKID(), - }) - } - } - - if len(services) == 0 { - g.Fatalf("No AWS SDK v1 services found") - } - - slices.SortFunc(services, func(a, b serviceDatum) int { - return strings.Compare(a.PackageName, b.PackageName) - }) - - d := g.NewGoFileDestination(filename) - - if err := d.WriteTemplate("endpointresolver", sourceTemplate, services); err != nil { - g.Fatalf("error generating endpoint resolver: %s", err) - } - - if err := d.Write(); err != nil { - g.Fatalf("generating file (%s): %s", filename, err) - } - -} - -type serviceDatum struct { - PackageName string - ServiceEndpointEnvVar string - SDKID string -} - -//go:embed template.go.gtpl -var sourceTemplate string diff --git a/internal/generate/resolveendpoints/template.go.gtpl b/internal/generate/resolveendpoints/template.go.gtpl deleted file mode 100644 index cb280a1eb1e..00000000000 --- a/internal/generate/resolveendpoints/template.go.gtpl +++ /dev/null @@ -1,43 +0,0 @@ -// Code generated by internal/generate/resolveendpoints/main.go; DO NOT EDIT. - -// Copyright (c) HashiCorp, Inc. -// SPDX-License-Identifier: MPL-2.0 - -package conns - -import ( - "context" - "os" - - "github.com/aws/aws-sdk-go-v2/aws" -) - -func (c *AWSClient) resolveEndpoint(ctx context.Context, servicePackageName string) string { - endpoint := c.endpoints[servicePackageName] - if endpoint != "" { - return endpoint - } - - // Only SDK v1 packages. This is already supported by SDK v2. - switch servicePackageName { -{{ range . }} - case "{{ .PackageName }}": - endpoint = aws.ToString(c.awsConfig.BaseEndpoint) - svc := os.Getenv("{{ .ServiceEndpointEnvVar }}") - if svc != "" { - return svc - } - - if base := os.Getenv("AWS_ENDPOINT_URL"); base != "" { - return base - } - - endpoint, found, err := resolveServiceBaseEndpoint(ctx, "{{ .SDKID }}", c.awsConfig.ConfigSources) - if found && err == nil { - return endpoint - } -{{ end }} - } - - return endpoint -} diff --git a/internal/generate/serviceendpointtests/file.gtpl b/internal/generate/serviceendpointtests/file.gtpl index 4139e6cca82..187d61e0d51 100644 --- a/internal/generate/serviceendpointtests/file.gtpl +++ b/internal/generate/serviceendpointtests/file.gtpl @@ -4,33 +4,25 @@ package {{ .PackageName }}_test import ( "context" -{{- if eq .SDKVersion 2 }} "errors" - "reflect" -{{- end }} "fmt" "maps" "net" "net/url" "os" "path/filepath" + "reflect" "strings" "testing" -{{ if eq .SDKVersion 1 -}} - aws_sdkv1 "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/aws/endpoints" - {{ .GoPackage }}_sdkv1 "github.com/aws/aws-sdk-go/service/{{ .GoPackage }}" -{{ else }} - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - {{ .GoPackage }}_sdkv2 "github.com/aws/aws-sdk-go-v2/service/{{ .GoPackage }}" + "github.com/aws/aws-sdk-go-v2/service/{{ .GoPackage }}" {{- if .ImportAwsTypes }} awstypes "github.com/aws/aws-sdk-go-v2/service/{{ .GoPackage }}/types" {{- end }} "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" -{{ end -}} "github.com/google/go-cmp/cmp" "github.com/hashicorp/aws-sdk-go-base/v2/servicemocks" {{- if gt (len .Aliases) 0 }} @@ -487,11 +479,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { -{{- if eq .SDKVersion 2 }} - r := {{ .GoPackage }}_sdkv2.NewDefaultEndpointResolverV2() + r := {{ .GoPackage }}.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), {{ .GoPackage }}_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), {{ .GoPackage }}.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -502,36 +493,14 @@ func defaultEndpoint(region string) (url.URL, error) { } return ep.URI, nil -{{ else }} - r := endpoints.DefaultResolver() - - ep, err := r.EndpointFor({{ .GoPackage }}_sdkv1.EndpointsID, region - {{- if .V1NameResolverNeedsUnknownService }}, func(opt *endpoints.Options) { - opt.ResolveUnknownService = true - } - {{- end -}} - ) - if err != nil { - return url.URL{}, err - } - - url, _ := url.Parse(ep.URL) - - if url.Path == "" { - url.Path = "/" - } - - return *url, nil -{{ end -}} } func defaultFIPSEndpoint(region string) (url.URL, error) { -{{- if eq .SDKVersion 2 }} - r := {{ .GoPackage }}_sdkv2.NewDefaultEndpointResolverV2() + r := {{ .GoPackage }}.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), {{ .GoPackage }}_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), {{ .GoPackage }}.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -542,28 +511,8 @@ func defaultFIPSEndpoint(region string) (url.URL, error) { } return ep.URI, nil -{{ else }} - r := endpoints.DefaultResolver() - - ep, err := r.EndpointFor({{ .GoPackage }}_sdkv1.EndpointsID, region, func(opt *endpoints.Options) { - {{- if .V1NameResolverNeedsUnknownService }}opt.ResolveUnknownService = true{{ end }} - opt.UseFIPSEndpoint = endpoints.FIPSEndpointStateEnabled - }) - if err != nil { - return url.URL{}, err - } - - url, _ := url.Parse(ep.URL) - - if url.Path == "" { - url.Path = "/" - } - - return *url, nil -{{ end -}} } -{{ if eq .SDKVersion 2 }} func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCallParams { t.Helper() @@ -571,10 +520,10 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.{{ .APICall }}(ctx, &{{ .GoPackage }}_sdkv2.{{ .APICall }}Input{ + _, err := client.{{ .APICall }}(ctx, &{{ .GoPackage }}.{{ .APICall }}Input{ {{ if ne .APICallParams "" }}{{ .APICallParams }},{{ end }} }, - func(opts *{{ .GoPackage }}_sdkv2.Options) { + func(opts *{{ .GoPackage }}.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), @@ -590,26 +539,6 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa return result } -{{ end }} - -{{ if eq .SDKVersion 1 }} -func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCallParams { - t.Helper() - - client := meta.{{ .ProviderNameUpper }}Conn(ctx) - - req, _ := client.{{ .APICall }}Request( &{{ .GoPackage }}_sdkv1.{{ .APICall }}Input{ - {{ if ne .APICallParams "" }}{{ .APICallParams }},{{ end }} - }) - - req.HTTPRequest.URL.Path = "/" - - return apiCallParams{ - endpoint: req.HTTPRequest.URL.String(), - region: aws_sdkv1.StringValue(client.Config.Region), - } -} -{{ end }} func withNoConfig(_ *caseSetup) { // no-op @@ -857,7 +786,6 @@ func testEndpointCase(t *testing.T, region string, testcase endpointTestCase, ca } } -{{ if eq .SDKVersion 2 }} func addRetrieveEndpointURLMiddleware(t *testing.T, endpoint *string) func(*middleware.Stack) error { return func(stack *middleware.Stack) error { return stack.Finalize.Add( @@ -940,7 +868,6 @@ func fullValueTypeName(v reflect.Value) string { requestType := v.Type() return fmt.Sprintf("%s.%s", requestType.PkgPath(), requestType.Name()) } -{{ end }} func generateSharedConfigFile(config configFile) string { var buf strings.Builder diff --git a/internal/generate/serviceendpointtests/main.go b/internal/generate/serviceendpointtests/main.go index a4a8a71c480..7b941ebd382 100644 --- a/internal/generate/serviceendpointtests/main.go +++ b/internal/generate/serviceendpointtests/main.go @@ -42,6 +42,7 @@ func main() { "paymentcryptography", // Resolver modifies URL "route53profiles", // Resolver modifies URL "s3control", // Resolver modifies URL + "simpledb", // AWS SDK for Go v1 "timestreamwrite": // Uses endpoint discovery continue } @@ -59,7 +60,6 @@ func main() { td := TemplateData{ HumanFriendly: l.HumanFriendly(), PackageName: packageName, - SDKVersion: l.SDKVersion(), GoPackage: l.GoPackageName(), ProviderNameUpper: l.ProviderNameUpper(), Region: "us-west-2", @@ -72,16 +72,8 @@ func main() { Aliases: l.Aliases(), OverrideRegion: l.EndpointOverrideRegion(), } - if l.IsClientSDKV1() { - switch packageName { - case "imagebuilder": - td.V1NameResolverNeedsUnknownService = true - } - } - if l.IsClientSDKV2() { - if strings.Contains(td.APICallParams, "awstypes") { - td.ImportAwsTypes = true - } + if strings.Contains(td.APICallParams, "awstypes") { + td.ImportAwsTypes = true } if td.OverrideRegion == "us-west-2" { @@ -120,7 +112,6 @@ func main() { type TemplateData struct { HumanFriendly string PackageName string - SDKVersion int GoPackage string ProviderNameUpper string Region string diff --git a/internal/generate/servicepackage/endpoint_resolver.go.gtpl b/internal/generate/servicepackage/endpoint_resolver.go.gtpl index bdc4c6e3294..d4fbc9a1967 100644 --- a/internal/generate/servicepackage/endpoint_resolver.go.gtpl +++ b/internal/generate/servicepackage/endpoint_resolver.go.gtpl @@ -6,111 +6,38 @@ import ( "context" "fmt" "net" -{{ if .ClientSDKV1 -}} - "net/url" -{{ end }} -{{- if .ClientSDKV1 }} - endpoints_sdkv1 "github.com/aws/aws-sdk-go/aws/endpoints" -{{- end }} -{{- if .ClientSDKV2 }} - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - {{ .GoV2Package }}_sdkv2 "github.com/aws/aws-sdk-go-v2/service/{{ .GoV2Package }}" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/{{ .GoV2Package }}" smithyendpoints "github.com/aws/smithy-go/endpoints" -{{- end }} "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -{{ if .ClientSDKV1 }} -var _ endpoints_sdkv1.Resolver = resolverSDKv1{} +var _ {{ .GoV2Package }}.EndpointResolverV2 = resolverV2{} -type resolverSDKv1 struct { - ctx context.Context +type resolverV2 struct { + defaultResolver {{ .GoV2Package }}.EndpointResolverV2 } -func newEndpointResolverSDKv1(ctx context.Context) resolverSDKv1 { - return resolverSDKv1{ - ctx: ctx, +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: {{ .GoV2Package }}.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv1) EndpointFor(service, region string, opts ...func(*endpoints_sdkv1.Options)) (endpoint endpoints_sdkv1.ResolvedEndpoint, err error) { - ctx := r.ctx - - var opt endpoints_sdkv1.Options - opt.Set(opts...) - - useFIPS := opt.UseFIPSEndpoint == endpoints_sdkv1.FIPSEndpointStateEnabled - - defaultResolver := endpoints_sdkv1.DefaultResolver() - - if useFIPS { - ctx = tflog.SetField(ctx, "tf_aws.use_fips", useFIPS) - - endpoint, err = defaultResolver.EndpointFor(service, region, opts...) - if err != nil { - return endpoint, err - } - - tflog.Debug(ctx, "endpoint resolved", map[string]any{ - "tf_aws.endpoint": endpoint.URL, - }) - - var endpointURL *url.URL - endpointURL, err = url.Parse(endpoint.URL) - if err != nil { - return endpoint, err - } - - hostname := endpointURL.Hostname() - _, err = net.LookupHost(hostname) - if err != nil { - if dnsErr, ok := errs.As[*net.DNSError](err); ok && dnsErr.IsNotFound { - tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ - "tf_aws.hostname": hostname, - }) - opts = append(opts, func(o *endpoints_sdkv1.Options) { - o.UseFIPSEndpoint = endpoints_sdkv1.FIPSEndpointStateDisabled - }) - } else { - err = fmt.Errorf("looking up accessanalyzer endpoint %q: %s", hostname, err) - return - } - } else { - return endpoint, err - } - } - - return defaultResolver.EndpointFor(service, region, opts...) -} -{{ end }} - -{{ if .ClientSDKV2 }} -var _ {{ .GoV2Package }}_sdkv2.EndpointResolverV2 = resolverSDKv2{} - -type resolverSDKv2 struct { - defaultResolver {{ .GoV2Package }}_sdkv2.EndpointResolverV2 -} - -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: {{ .GoV2Package }}_sdkv2.NewDefaultEndpointResolverV2(), - } -} - -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params {{ .GoV2Package }}_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params {{ .GoV2Package }}.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -133,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params {{ .GoV2Packa tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up {{ .GoV2Package }} endpoint %q: %s", hostname, err) return @@ -146,11 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params {{ .GoV2Packa return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*{{ .GoV2Package }}_sdkv2.Options) { - return func(o *{{ .GoV2Package }}_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*{{ .GoV2Package }}.Options) { + return func(o *{{ .GoV2Package }}.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } -{{ end }} diff --git a/internal/generate/servicepackage/file.gtpl b/internal/generate/servicepackage/file.gtpl index 403cf19244b..45aa0c3c471 100644 --- a/internal/generate/servicepackage/file.gtpl +++ b/internal/generate/servicepackage/file.gtpl @@ -6,16 +6,8 @@ import ( "context" {{ if .GenerateClient }} - {{- if .ClientSDKV1 }} - aws_sdkv1 "github.com/aws/aws-sdk-go/aws" - session_sdkv1 "github.com/aws/aws-sdk-go/aws/session" - {{ .GoV1Package }}_sdkv1 "github.com/aws/aws-sdk-go/service/{{ .GoV1Package }}" - "github.com/hashicorp/terraform-plugin-log/tflog" - {{- end }} - {{- if .ClientSDKV2 }} - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - {{ .GoV2Package }}_sdkv2 "github.com/aws/aws-sdk-go-v2/service/{{ .GoV2Package }}" - {{- end }} + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/{{ .GoV2Package }}" {{- end }} "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" @@ -129,37 +121,15 @@ func (p *servicePackage) ServicePackageName() string { } {{- if .GenerateClient }} - {{ if .ClientSDKV1 }} -// NewConn returns a new AWS SDK for Go v1 client for this service package's AWS API. -func (p *servicePackage) NewConn(ctx context.Context, config map[string]any) (*{{ .GoV1Package }}_sdkv1.{{ .GoV1ClientTypeName }}, error) { - sess := config[names.AttrSession].(*session_sdkv1.Session) - - cfg := aws_sdkv1.Config{} - - if endpoint := config[names.AttrEndpoint].(string); endpoint != "" { - tflog.Debug(ctx, "setting endpoint", map[string]any{ - "tf_aws.endpoint": endpoint, - }) - cfg.Endpoint = aws_sdkv1.String(endpoint) - } else { - cfg.EndpointResolver = newEndpointResolverSDKv1(ctx) - } - - return {{ .GoV1Package }}_sdkv1.New(sess.Copy(&cfg)), nil -} - {{- end }} - - {{ if .ClientSDKV2 }} // 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) (*{{ .GoV2Package }}_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*{{ .GoV2Package }}.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return {{ .GoV2Package }}_sdkv2.NewFromConfig(cfg, - {{ .GoV2Package }}_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return {{ .GoV2Package }}.NewFromConfig(cfg, + {{ .GoV2Package }}.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } - {{- end }} {{- end }} func ServicePackage(ctx context.Context) conns.ServicePackage { diff --git a/internal/generate/servicepackage/main.go b/internal/generate/servicepackage/main.go index 9d2400a0eba..0ce8754ce06 100644 --- a/internal/generate/servicepackage/main.go +++ b/internal/generate/servicepackage/main.go @@ -26,8 +26,8 @@ import ( func main() { const ( - filename = `service_package_gen.go` - endpointResolverFilenamne = `service_endpoint_resolver_gen.go` + filename = `service_package_gen.go` + endpointResolverFilename = `service_endpoint_resolver_gen.go` ) g := common.NewGenerator() @@ -49,6 +49,10 @@ func main() { continue } + if l.IsClientSDKV1() && l.GenerateClient() { + g.Fatalf("cannot generate AWS SDK for Go v1 client") + } + // Look for Terraform Plugin Framework and SDK resource and data source annotations. // These annotations are implemented as comments on factory functions. v := &visitor{ @@ -68,8 +72,6 @@ func main() { s := ServiceDatum{ GenerateClient: l.GenerateClient(), - ClientSDKV1: l.IsClientSDKV1(), - GoV1Package: l.GoV1Package(), ClientSDKV2: l.IsClientSDKV2(), GoV2Package: l.GoV2Package(), ProviderPackage: p, @@ -80,10 +82,6 @@ func main() { SDKResources: v.sdkResources, } - if l.IsClientSDKV1() { - s.GoV1ClientTypeName = l.GoV1ClientTypeName() - } - sort.SliceStable(s.FrameworkDataSources, func(i, j int) bool { return s.FrameworkDataSources[i].FactoryName < s.FrameworkDataSources[j].FactoryName }) @@ -94,24 +92,24 @@ func main() { d := g.NewGoFileDestination(filename) if err := d.WriteTemplate("servicepackagedata", tmpl, s); err != nil { - g.Fatalf("error generating %s service package data: %s", p, err) + g.Fatalf("generating %s service package data: %s", p, err) } if err := d.Write(); err != nil { g.Fatalf("generating file (%s): %s", filename, err) } - if p != "meta" { - g.Infof("Generating internal/service/%s/%s", servicePackage, endpointResolverFilenamne) + if p != "meta" && !l.IsClientSDKV1() { + g.Infof("Generating internal/service/%s/%s", servicePackage, endpointResolverFilename) - d = g.NewGoFileDestination(endpointResolverFilenamne) + d = g.NewGoFileDestination(endpointResolverFilename) if err := d.WriteTemplate("endpointresolver", endpointResolverTmpl, s); err != nil { - g.Fatalf("error generating %s endpoint resolver: %s", p, err) + g.Fatalf("generating %s endpoint resolver: %s", p, err) } if err := d.Write(); err != nil { - g.Fatalf("generating file (%s): %s", endpointResolverFilenamne, err) + g.Fatalf("generating file (%s): %s", endpointResolverFilename, err) } } @@ -129,9 +127,6 @@ type ResourceDatum struct { type ServiceDatum struct { GenerateClient bool - ClientSDKV1 bool - GoV1Package string // AWS SDK for Go v1 package name - GoV1ClientTypeName string // AWS SDK for Go v1 client type name ClientSDKV2 bool GoV2Package string // AWS SDK for Go v2 package name ProviderPackage string diff --git a/internal/provider/provider_acc_test.go b/internal/provider/provider_acc_test.go index 7c9747ed922..333b8519ae4 100644 --- a/internal/provider/provider_acc_test.go +++ b/internal/provider/provider_acc_test.go @@ -13,7 +13,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - sts_sdkv2 "github.com/aws/aws-sdk-go-v2/service/sts" + "github.com/aws/aws-sdk-go-v2/service/sts" "github.com/aws/smithy-go/middleware" "github.com/hashicorp/terraform-plugin-go/tfprotov5" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" @@ -734,8 +734,8 @@ func testAccCheckSTSRegion(ctx context.Context, t *testing.T, p **schema.Provide var stsRegion string stsClient := (*p).Meta().(*conns.AWSClient).STSClient(ctx) - _, err := stsClient.GetCallerIdentity(ctx, &sts_sdkv2.GetCallerIdentityInput{}, - func(opts *sts_sdkv2.Options) { + _, err := stsClient.GetCallerIdentity(ctx, &sts.GetCallerIdentityInput{}, + func(opts *sts.Options) { opts.APIOptions = append(opts.APIOptions, addRegionRetrieverMiddleware(&stsRegion), addCancelRequestMiddleware(), diff --git a/internal/service/accessanalyzer/service_endpoint_resolver_gen.go b/internal/service/accessanalyzer/service_endpoint_resolver_gen.go index e79f9750e15..4faed4295d8 100644 --- a/internal/service/accessanalyzer/service_endpoint_resolver_gen.go +++ b/internal/service/accessanalyzer/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - accessanalyzer_sdkv2 "github.com/aws/aws-sdk-go-v2/service/accessanalyzer" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/accessanalyzer" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ accessanalyzer_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ accessanalyzer.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver accessanalyzer_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver accessanalyzer.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: accessanalyzer_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: accessanalyzer.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params accessanalyzer_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params accessanalyzer.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params accessanalyze tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up accessanalyzer endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params accessanalyze return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*accessanalyzer_sdkv2.Options) { - return func(o *accessanalyzer_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*accessanalyzer.Options) { + return func(o *accessanalyzer.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/accessanalyzer/service_endpoints_gen_test.go b/internal/service/accessanalyzer/service_endpoints_gen_test.go index 23816ec8b96..3492eed5f79 100644 --- a/internal/service/accessanalyzer/service_endpoints_gen_test.go +++ b/internal/service/accessanalyzer/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - accessanalyzer_sdkv2 "github.com/aws/aws-sdk-go-v2/service/accessanalyzer" + "github.com/aws/aws-sdk-go-v2/service/accessanalyzer" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := accessanalyzer_sdkv2.NewDefaultEndpointResolverV2() + r := accessanalyzer.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), accessanalyzer_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), accessanalyzer.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := accessanalyzer_sdkv2.NewDefaultEndpointResolverV2() + r := accessanalyzer.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), accessanalyzer_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), accessanalyzer.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListAnalyzers(ctx, &accessanalyzer_sdkv2.ListAnalyzersInput{}, - func(opts *accessanalyzer_sdkv2.Options) { + _, err := client.ListAnalyzers(ctx, &accessanalyzer.ListAnalyzersInput{}, + func(opts *accessanalyzer.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/accessanalyzer/service_package_gen.go b/internal/service/accessanalyzer/service_package_gen.go index 15dbaba5022..9e63a0d828f 100644 --- a/internal/service/accessanalyzer/service_package_gen.go +++ b/internal/service/accessanalyzer/service_package_gen.go @@ -5,8 +5,8 @@ package accessanalyzer import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - accessanalyzer_sdkv2 "github.com/aws/aws-sdk-go-v2/service/accessanalyzer" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/accessanalyzer" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -48,11 +48,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*accessanalyzer_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*accessanalyzer.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return accessanalyzer_sdkv2.NewFromConfig(cfg, - accessanalyzer_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return accessanalyzer.NewFromConfig(cfg, + accessanalyzer.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/account/service_endpoint_resolver_gen.go b/internal/service/account/service_endpoint_resolver_gen.go index 72cf9078368..55e9cb6c98f 100644 --- a/internal/service/account/service_endpoint_resolver_gen.go +++ b/internal/service/account/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - account_sdkv2 "github.com/aws/aws-sdk-go-v2/service/account" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/account" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ account_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ account.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver account_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver account.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: account_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: account.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params account_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params account.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params account_sdkv2 tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up account endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params account_sdkv2 return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*account_sdkv2.Options) { - return func(o *account_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*account.Options) { + return func(o *account.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/account/service_endpoints_gen_test.go b/internal/service/account/service_endpoints_gen_test.go index 4a5ab66d531..4607523fa19 100644 --- a/internal/service/account/service_endpoints_gen_test.go +++ b/internal/service/account/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - account_sdkv2 "github.com/aws/aws-sdk-go-v2/service/account" + "github.com/aws/aws-sdk-go-v2/service/account" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := account_sdkv2.NewDefaultEndpointResolverV2() + r := account.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), account_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), account.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := account_sdkv2.NewDefaultEndpointResolverV2() + r := account.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), account_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), account.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListRegions(ctx, &account_sdkv2.ListRegionsInput{}, - func(opts *account_sdkv2.Options) { + _, err := client.ListRegions(ctx, &account.ListRegionsInput{}, + func(opts *account.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/account/service_package_gen.go b/internal/service/account/service_package_gen.go index 56a0e7b1589..b65ea6af0c7 100644 --- a/internal/service/account/service_package_gen.go +++ b/internal/service/account/service_package_gen.go @@ -5,8 +5,8 @@ package account import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - account_sdkv2 "github.com/aws/aws-sdk-go-v2/service/account" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/account" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -49,11 +49,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*account_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*account.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return account_sdkv2.NewFromConfig(cfg, - account_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return account.NewFromConfig(cfg, + account.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/acm/service_endpoint_resolver_gen.go b/internal/service/acm/service_endpoint_resolver_gen.go index 7480d799fe9..464025a8ed4 100644 --- a/internal/service/acm/service_endpoint_resolver_gen.go +++ b/internal/service/acm/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - acm_sdkv2 "github.com/aws/aws-sdk-go-v2/service/acm" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/acm" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ acm_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ acm.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver acm_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver acm.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: acm_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: acm.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params acm_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params acm.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params acm_sdkv2.End tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up acm endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params acm_sdkv2.End return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*acm_sdkv2.Options) { - return func(o *acm_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*acm.Options) { + return func(o *acm.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/acm/service_endpoints_gen_test.go b/internal/service/acm/service_endpoints_gen_test.go index f269155c1a3..2ba1986e91c 100644 --- a/internal/service/acm/service_endpoints_gen_test.go +++ b/internal/service/acm/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - acm_sdkv2 "github.com/aws/aws-sdk-go-v2/service/acm" + "github.com/aws/aws-sdk-go-v2/service/acm" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := acm_sdkv2.NewDefaultEndpointResolverV2() + r := acm.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), acm_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), acm.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := acm_sdkv2.NewDefaultEndpointResolverV2() + r := acm.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), acm_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), acm.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListCertificates(ctx, &acm_sdkv2.ListCertificatesInput{}, - func(opts *acm_sdkv2.Options) { + _, err := client.ListCertificates(ctx, &acm.ListCertificatesInput{}, + func(opts *acm.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/acm/service_package_gen.go b/internal/service/acm/service_package_gen.go index d76d5533294..90c139864a7 100644 --- a/internal/service/acm/service_package_gen.go +++ b/internal/service/acm/service_package_gen.go @@ -5,8 +5,8 @@ package acm import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - acm_sdkv2 "github.com/aws/aws-sdk-go-v2/service/acm" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/acm" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -57,11 +57,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*acm_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*acm.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return acm_sdkv2.NewFromConfig(cfg, - acm_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return acm.NewFromConfig(cfg, + acm.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/acmpca/service_endpoint_resolver_gen.go b/internal/service/acmpca/service_endpoint_resolver_gen.go index 4b66c791a76..cb328c16cd2 100644 --- a/internal/service/acmpca/service_endpoint_resolver_gen.go +++ b/internal/service/acmpca/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - acmpca_sdkv2 "github.com/aws/aws-sdk-go-v2/service/acmpca" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/acmpca" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ acmpca_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ acmpca.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver acmpca_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver acmpca.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: acmpca_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: acmpca.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params acmpca_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params acmpca.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params acmpca_sdkv2. tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up acmpca endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params acmpca_sdkv2. return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*acmpca_sdkv2.Options) { - return func(o *acmpca_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*acmpca.Options) { + return func(o *acmpca.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/acmpca/service_endpoints_gen_test.go b/internal/service/acmpca/service_endpoints_gen_test.go index c954f203d45..8a4981b8fe6 100644 --- a/internal/service/acmpca/service_endpoints_gen_test.go +++ b/internal/service/acmpca/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - acmpca_sdkv2 "github.com/aws/aws-sdk-go-v2/service/acmpca" + "github.com/aws/aws-sdk-go-v2/service/acmpca" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := acmpca_sdkv2.NewDefaultEndpointResolverV2() + r := acmpca.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), acmpca_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), acmpca.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := acmpca_sdkv2.NewDefaultEndpointResolverV2() + r := acmpca.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), acmpca_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), acmpca.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListCertificateAuthorities(ctx, &acmpca_sdkv2.ListCertificateAuthoritiesInput{}, - func(opts *acmpca_sdkv2.Options) { + _, err := client.ListCertificateAuthorities(ctx, &acmpca.ListCertificateAuthoritiesInput{}, + func(opts *acmpca.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/acmpca/service_package_gen.go b/internal/service/acmpca/service_package_gen.go index 0673ef94f28..c2b374e3a64 100644 --- a/internal/service/acmpca/service_package_gen.go +++ b/internal/service/acmpca/service_package_gen.go @@ -5,8 +5,8 @@ package acmpca import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - acmpca_sdkv2 "github.com/aws/aws-sdk-go-v2/service/acmpca" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/acmpca" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -78,11 +78,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*acmpca_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*acmpca.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return acmpca_sdkv2.NewFromConfig(cfg, - acmpca_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return acmpca.NewFromConfig(cfg, + acmpca.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/amp/service_endpoint_resolver_gen.go b/internal/service/amp/service_endpoint_resolver_gen.go index 6f695368d70..3d710609ed7 100644 --- a/internal/service/amp/service_endpoint_resolver_gen.go +++ b/internal/service/amp/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - amp_sdkv2 "github.com/aws/aws-sdk-go-v2/service/amp" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/amp" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ amp_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ amp.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver amp_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver amp.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: amp_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: amp.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params amp_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params amp.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params amp_sdkv2.End tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up amp endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params amp_sdkv2.End return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*amp_sdkv2.Options) { - return func(o *amp_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*amp.Options) { + return func(o *amp.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/amp/service_endpoints_gen_test.go b/internal/service/amp/service_endpoints_gen_test.go index 9e287f49e73..0d8e8290dee 100644 --- a/internal/service/amp/service_endpoints_gen_test.go +++ b/internal/service/amp/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - amp_sdkv2 "github.com/aws/aws-sdk-go-v2/service/amp" + "github.com/aws/aws-sdk-go-v2/service/amp" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -355,10 +355,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := amp_sdkv2.NewDefaultEndpointResolverV2() + r := amp.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), amp_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), amp.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -372,11 +372,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := amp_sdkv2.NewDefaultEndpointResolverV2() + r := amp.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), amp_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), amp.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -396,8 +396,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListScrapers(ctx, &_sdkv2.ListScrapersInput{}, - func(opts *amp_sdkv2.Options) { + _, err := client.ListScrapers(ctx, &.ListScrapersInput{}, + func(opts *amp.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/amp/service_package_gen.go b/internal/service/amp/service_package_gen.go index 8c8000a7063..5c926df82eb 100644 --- a/internal/service/amp/service_package_gen.go +++ b/internal/service/amp/service_package_gen.go @@ -5,8 +5,8 @@ package amp import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - amp_sdkv2 "github.com/aws/aws-sdk-go-v2/service/amp" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/amp" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -79,11 +79,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*amp_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*amp.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return amp_sdkv2.NewFromConfig(cfg, - amp_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return amp.NewFromConfig(cfg, + amp.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/amplify/service_endpoint_resolver_gen.go b/internal/service/amplify/service_endpoint_resolver_gen.go index e9240af9bec..3c59ee3b2f4 100644 --- a/internal/service/amplify/service_endpoint_resolver_gen.go +++ b/internal/service/amplify/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - amplify_sdkv2 "github.com/aws/aws-sdk-go-v2/service/amplify" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/amplify" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ amplify_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ amplify.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver amplify_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver amplify.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: amplify_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: amplify.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params amplify_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params amplify.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params amplify_sdkv2 tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up amplify endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params amplify_sdkv2 return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*amplify_sdkv2.Options) { - return func(o *amplify_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*amplify.Options) { + return func(o *amplify.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/amplify/service_endpoints_gen_test.go b/internal/service/amplify/service_endpoints_gen_test.go index d18c6d68363..489787ff1c3 100644 --- a/internal/service/amplify/service_endpoints_gen_test.go +++ b/internal/service/amplify/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - amplify_sdkv2 "github.com/aws/aws-sdk-go-v2/service/amplify" + "github.com/aws/aws-sdk-go-v2/service/amplify" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := amplify_sdkv2.NewDefaultEndpointResolverV2() + r := amplify.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), amplify_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), amplify.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := amplify_sdkv2.NewDefaultEndpointResolverV2() + r := amplify.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), amplify_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), amplify.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListApps(ctx, &lify_sdkv2.ListAppsInput{}, - func(opts *amplify_sdkv2.Options) { + _, err := client.ListApps(ctx, &lify.ListAppsInput{}, + func(opts *amplify.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/amplify/service_package_gen.go b/internal/service/amplify/service_package_gen.go index 8031aa179ce..8957bf34285 100644 --- a/internal/service/amplify/service_package_gen.go +++ b/internal/service/amplify/service_package_gen.go @@ -5,8 +5,8 @@ package amplify import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - amplify_sdkv2 "github.com/aws/aws-sdk-go-v2/service/amplify" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/amplify" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -67,11 +67,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*amplify_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*amplify.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return amplify_sdkv2.NewFromConfig(cfg, - amplify_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return amplify.NewFromConfig(cfg, + amplify.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/apigateway/service_endpoint_resolver_gen.go b/internal/service/apigateway/service_endpoint_resolver_gen.go index ef2fdd642c0..d936de2594e 100644 --- a/internal/service/apigateway/service_endpoint_resolver_gen.go +++ b/internal/service/apigateway/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - apigateway_sdkv2 "github.com/aws/aws-sdk-go-v2/service/apigateway" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/apigateway" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ apigateway_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ apigateway.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver apigateway_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver apigateway.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: apigateway_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: apigateway.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params apigateway_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params apigateway.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params apigateway_sd tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up apigateway endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params apigateway_sd return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*apigateway_sdkv2.Options) { - return func(o *apigateway_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*apigateway.Options) { + return func(o *apigateway.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/apigateway/service_endpoints_gen_test.go b/internal/service/apigateway/service_endpoints_gen_test.go index 81aea62d05a..8e711a643e8 100644 --- a/internal/service/apigateway/service_endpoints_gen_test.go +++ b/internal/service/apigateway/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - apigateway_sdkv2 "github.com/aws/aws-sdk-go-v2/service/apigateway" + "github.com/aws/aws-sdk-go-v2/service/apigateway" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := apigateway_sdkv2.NewDefaultEndpointResolverV2() + r := apigateway.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), apigateway_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), apigateway.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := apigateway_sdkv2.NewDefaultEndpointResolverV2() + r := apigateway.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), apigateway_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), apigateway.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.GetAccount(ctx, &apigateway_sdkv2.GetAccountInput{}, - func(opts *apigateway_sdkv2.Options) { + _, err := client.GetAccount(ctx, &apigateway.GetAccountInput{}, + func(opts *apigateway.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/apigateway/service_package.go b/internal/service/apigateway/service_package.go index cbc956a44bb..b4ba9f660ce 100644 --- a/internal/service/apigateway/service_package.go +++ b/internal/service/apigateway/service_package.go @@ -20,7 +20,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return apigateway.NewFromConfig(cfg, - apigateway.WithEndpointResolverV2(newEndpointResolverSDKv2()), + apigateway.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), func(o *apigateway.Options) { o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(func(err error) aws.Ternary { diff --git a/internal/service/apigatewayv2/service_endpoint_resolver_gen.go b/internal/service/apigatewayv2/service_endpoint_resolver_gen.go index 17adefe840e..b82d77e3be6 100644 --- a/internal/service/apigatewayv2/service_endpoint_resolver_gen.go +++ b/internal/service/apigatewayv2/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - apigatewayv2_sdkv2 "github.com/aws/aws-sdk-go-v2/service/apigatewayv2" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/apigatewayv2" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ apigatewayv2_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ apigatewayv2.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver apigatewayv2_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver apigatewayv2.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: apigatewayv2_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: apigatewayv2.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params apigatewayv2_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params apigatewayv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params apigatewayv2_ tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up apigatewayv2 endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params apigatewayv2_ return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*apigatewayv2_sdkv2.Options) { - return func(o *apigatewayv2_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*apigatewayv2.Options) { + return func(o *apigatewayv2.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/apigatewayv2/service_endpoints_gen_test.go b/internal/service/apigatewayv2/service_endpoints_gen_test.go index 4367e1b7898..9d11714f220 100644 --- a/internal/service/apigatewayv2/service_endpoints_gen_test.go +++ b/internal/service/apigatewayv2/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - apigatewayv2_sdkv2 "github.com/aws/aws-sdk-go-v2/service/apigatewayv2" + "github.com/aws/aws-sdk-go-v2/service/apigatewayv2" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := apigatewayv2_sdkv2.NewDefaultEndpointResolverV2() + r := apigatewayv2.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), apigatewayv2_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), apigatewayv2.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := apigatewayv2_sdkv2.NewDefaultEndpointResolverV2() + r := apigatewayv2.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), apigatewayv2_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), apigatewayv2.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.GetApis(ctx, &apigatewayv2_sdkv2.GetApisInput{}, - func(opts *apigatewayv2_sdkv2.Options) { + _, err := client.GetApis(ctx, &apigatewayv2.GetApisInput{}, + func(opts *apigatewayv2.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/apigatewayv2/service_package.go b/internal/service/apigatewayv2/service_package.go index 2eeade0b917..da6f2488467 100644 --- a/internal/service/apigatewayv2/service_package.go +++ b/internal/service/apigatewayv2/service_package.go @@ -20,7 +20,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return apigatewayv2.NewFromConfig(cfg, - apigatewayv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + apigatewayv2.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), func(o *apigatewayv2.Options) { o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(func(err error) aws.Ternary { diff --git a/internal/service/appautoscaling/service_endpoint_resolver_gen.go b/internal/service/appautoscaling/service_endpoint_resolver_gen.go index 2cf14a255e7..c5ef078ea28 100644 --- a/internal/service/appautoscaling/service_endpoint_resolver_gen.go +++ b/internal/service/appautoscaling/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - applicationautoscaling_sdkv2 "github.com/aws/aws-sdk-go-v2/service/applicationautoscaling" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/applicationautoscaling" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ applicationautoscaling_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ applicationautoscaling.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver applicationautoscaling_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver applicationautoscaling.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: applicationautoscaling_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: applicationautoscaling.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params applicationautoscaling_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params applicationautoscaling.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params applicationau tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up applicationautoscaling endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params applicationau return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*applicationautoscaling_sdkv2.Options) { - return func(o *applicationautoscaling_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*applicationautoscaling.Options) { + return func(o *applicationautoscaling.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/appautoscaling/service_endpoints_gen_test.go b/internal/service/appautoscaling/service_endpoints_gen_test.go index 414364f4412..20fbb93c7c5 100644 --- a/internal/service/appautoscaling/service_endpoints_gen_test.go +++ b/internal/service/appautoscaling/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - applicationautoscaling_sdkv2 "github.com/aws/aws-sdk-go-v2/service/applicationautoscaling" + "github.com/aws/aws-sdk-go-v2/service/applicationautoscaling" awstypes "github.com/aws/aws-sdk-go-v2/service/applicationautoscaling/types" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" @@ -297,10 +297,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := applicationautoscaling_sdkv2.NewDefaultEndpointResolverV2() + r := applicationautoscaling.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), applicationautoscaling_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), applicationautoscaling.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -314,11 +314,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := applicationautoscaling_sdkv2.NewDefaultEndpointResolverV2() + r := applicationautoscaling.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), applicationautoscaling_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), applicationautoscaling.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -338,10 +338,10 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.DescribeScalableTargets(ctx, &applicationautoscaling_sdkv2.DescribeScalableTargetsInput{ + _, err := client.DescribeScalableTargets(ctx, &applicationautoscaling.DescribeScalableTargetsInput{ ServiceNamespace: awstypes.ServiceNamespaceEcs, }, - func(opts *applicationautoscaling_sdkv2.Options) { + func(opts *applicationautoscaling.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/appautoscaling/service_package_gen.go b/internal/service/appautoscaling/service_package_gen.go index ff76ed4fb5c..89fe97d1f1a 100644 --- a/internal/service/appautoscaling/service_package_gen.go +++ b/internal/service/appautoscaling/service_package_gen.go @@ -5,8 +5,8 @@ package appautoscaling import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - applicationautoscaling_sdkv2 "github.com/aws/aws-sdk-go-v2/service/applicationautoscaling" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/applicationautoscaling" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -53,11 +53,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*applicationautoscaling_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*applicationautoscaling.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return applicationautoscaling_sdkv2.NewFromConfig(cfg, - applicationautoscaling_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return applicationautoscaling.NewFromConfig(cfg, + applicationautoscaling.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/appconfig/service_endpoint_resolver_gen.go b/internal/service/appconfig/service_endpoint_resolver_gen.go index b4d977b4c89..8c47518f9d8 100644 --- a/internal/service/appconfig/service_endpoint_resolver_gen.go +++ b/internal/service/appconfig/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - appconfig_sdkv2 "github.com/aws/aws-sdk-go-v2/service/appconfig" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/appconfig" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ appconfig_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ appconfig.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver appconfig_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver appconfig.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: appconfig_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: appconfig.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params appconfig_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params appconfig.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params appconfig_sdk tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up appconfig endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params appconfig_sdk return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*appconfig_sdkv2.Options) { - return func(o *appconfig_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*appconfig.Options) { + return func(o *appconfig.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/appconfig/service_endpoints_gen_test.go b/internal/service/appconfig/service_endpoints_gen_test.go index 0a8c8d9b903..13fb79a7ec2 100644 --- a/internal/service/appconfig/service_endpoints_gen_test.go +++ b/internal/service/appconfig/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - appconfig_sdkv2 "github.com/aws/aws-sdk-go-v2/service/appconfig" + "github.com/aws/aws-sdk-go-v2/service/appconfig" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := appconfig_sdkv2.NewDefaultEndpointResolverV2() + r := appconfig.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), appconfig_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), appconfig.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := appconfig_sdkv2.NewDefaultEndpointResolverV2() + r := appconfig.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), appconfig_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), appconfig.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListApplications(ctx, &appconfig_sdkv2.ListApplicationsInput{}, - func(opts *appconfig_sdkv2.Options) { + _, err := client.ListApplications(ctx, &appconfig.ListApplicationsInput{}, + func(opts *appconfig.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/appconfig/service_package_gen.go b/internal/service/appconfig/service_package_gen.go index eb833c78857..c69c970f4c4 100644 --- a/internal/service/appconfig/service_package_gen.go +++ b/internal/service/appconfig/service_package_gen.go @@ -5,8 +5,8 @@ package appconfig import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - appconfig_sdkv2 "github.com/aws/aws-sdk-go-v2/service/appconfig" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/appconfig" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -119,11 +119,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*appconfig_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*appconfig.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return appconfig_sdkv2.NewFromConfig(cfg, - appconfig_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return appconfig.NewFromConfig(cfg, + appconfig.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/appfabric/service_endpoint_resolver_gen.go b/internal/service/appfabric/service_endpoint_resolver_gen.go index 9fd29f6066c..6d8411d2afd 100644 --- a/internal/service/appfabric/service_endpoint_resolver_gen.go +++ b/internal/service/appfabric/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - appfabric_sdkv2 "github.com/aws/aws-sdk-go-v2/service/appfabric" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/appfabric" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ appfabric_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ appfabric.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver appfabric_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver appfabric.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: appfabric_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: appfabric.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params appfabric_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params appfabric.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params appfabric_sdk tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up appfabric endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params appfabric_sdk return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*appfabric_sdkv2.Options) { - return func(o *appfabric_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*appfabric.Options) { + return func(o *appfabric.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/appfabric/service_endpoints_gen_test.go b/internal/service/appfabric/service_endpoints_gen_test.go index 5fe9886d30f..fd69829f6b2 100644 --- a/internal/service/appfabric/service_endpoints_gen_test.go +++ b/internal/service/appfabric/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - appfabric_sdkv2 "github.com/aws/aws-sdk-go-v2/service/appfabric" + "github.com/aws/aws-sdk-go-v2/service/appfabric" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := appfabric_sdkv2.NewDefaultEndpointResolverV2() + r := appfabric.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), appfabric_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), appfabric.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := appfabric_sdkv2.NewDefaultEndpointResolverV2() + r := appfabric.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), appfabric_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), appfabric.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListAppBundles(ctx, &appfabric_sdkv2.ListAppBundlesInput{}, - func(opts *appfabric_sdkv2.Options) { + _, err := client.ListAppBundles(ctx, &appfabric.ListAppBundlesInput{}, + func(opts *appfabric.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/appfabric/service_package_gen.go b/internal/service/appfabric/service_package_gen.go index 991cf4f9a11..09abc7fb232 100644 --- a/internal/service/appfabric/service_package_gen.go +++ b/internal/service/appfabric/service_package_gen.go @@ -5,8 +5,8 @@ package appfabric import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - appfabric_sdkv2 "github.com/aws/aws-sdk-go-v2/service/appfabric" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/appfabric" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -68,11 +68,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*appfabric_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*appfabric.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return appfabric_sdkv2.NewFromConfig(cfg, - appfabric_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return appfabric.NewFromConfig(cfg, + appfabric.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/appflow/service_endpoint_resolver_gen.go b/internal/service/appflow/service_endpoint_resolver_gen.go index ba1bddce5c4..166b2bbf49c 100644 --- a/internal/service/appflow/service_endpoint_resolver_gen.go +++ b/internal/service/appflow/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - appflow_sdkv2 "github.com/aws/aws-sdk-go-v2/service/appflow" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/appflow" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ appflow_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ appflow.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver appflow_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver appflow.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: appflow_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: appflow.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params appflow_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params appflow.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params appflow_sdkv2 tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up appflow endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params appflow_sdkv2 return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*appflow_sdkv2.Options) { - return func(o *appflow_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*appflow.Options) { + return func(o *appflow.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/appflow/service_endpoints_gen_test.go b/internal/service/appflow/service_endpoints_gen_test.go index 90e80ddec19..d32279f6e76 100644 --- a/internal/service/appflow/service_endpoints_gen_test.go +++ b/internal/service/appflow/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - appflow_sdkv2 "github.com/aws/aws-sdk-go-v2/service/appflow" + "github.com/aws/aws-sdk-go-v2/service/appflow" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := appflow_sdkv2.NewDefaultEndpointResolverV2() + r := appflow.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), appflow_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), appflow.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := appflow_sdkv2.NewDefaultEndpointResolverV2() + r := appflow.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), appflow_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), appflow.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListFlows(ctx, &appflow_sdkv2.ListFlowsInput{}, - func(opts *appflow_sdkv2.Options) { + _, err := client.ListFlows(ctx, &appflow.ListFlowsInput{}, + func(opts *appflow.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/appflow/service_package_gen.go b/internal/service/appflow/service_package_gen.go index d14b92a0eae..b0ca281652c 100644 --- a/internal/service/appflow/service_package_gen.go +++ b/internal/service/appflow/service_package_gen.go @@ -5,8 +5,8 @@ package appflow import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - appflow_sdkv2 "github.com/aws/aws-sdk-go-v2/service/appflow" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/appflow" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -49,11 +49,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*appflow_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*appflow.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return appflow_sdkv2.NewFromConfig(cfg, - appflow_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return appflow.NewFromConfig(cfg, + appflow.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/appintegrations/service_endpoint_resolver_gen.go b/internal/service/appintegrations/service_endpoint_resolver_gen.go index a0418374c30..d715dce688a 100644 --- a/internal/service/appintegrations/service_endpoint_resolver_gen.go +++ b/internal/service/appintegrations/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - appintegrations_sdkv2 "github.com/aws/aws-sdk-go-v2/service/appintegrations" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/appintegrations" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ appintegrations_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ appintegrations.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver appintegrations_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver appintegrations.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: appintegrations_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: appintegrations.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params appintegrations_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params appintegrations.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params appintegratio tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up appintegrations endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params appintegratio return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*appintegrations_sdkv2.Options) { - return func(o *appintegrations_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*appintegrations.Options) { + return func(o *appintegrations.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/appintegrations/service_endpoints_gen_test.go b/internal/service/appintegrations/service_endpoints_gen_test.go index cedf1057526..a3c1cd5a619 100644 --- a/internal/service/appintegrations/service_endpoints_gen_test.go +++ b/internal/service/appintegrations/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - appintegrations_sdkv2 "github.com/aws/aws-sdk-go-v2/service/appintegrations" + "github.com/aws/aws-sdk-go-v2/service/appintegrations" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -296,10 +296,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := appintegrations_sdkv2.NewDefaultEndpointResolverV2() + r := appintegrations.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), appintegrations_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), appintegrations.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -313,11 +313,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := appintegrations_sdkv2.NewDefaultEndpointResolverV2() + r := appintegrations.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), appintegrations_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), appintegrations.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -337,8 +337,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListApplications(ctx, &appintegrations_sdkv2.ListApplicationsInput{}, - func(opts *appintegrations_sdkv2.Options) { + _, err := client.ListApplications(ctx, &appintegrations.ListApplicationsInput{}, + func(opts *appintegrations.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/appintegrations/service_package_gen.go b/internal/service/appintegrations/service_package_gen.go index 471282a19b1..f468e19a2b5 100644 --- a/internal/service/appintegrations/service_package_gen.go +++ b/internal/service/appintegrations/service_package_gen.go @@ -5,8 +5,8 @@ package appintegrations import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - appintegrations_sdkv2 "github.com/aws/aws-sdk-go-v2/service/appintegrations" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/appintegrations" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -59,11 +59,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*appintegrations_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*appintegrations.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return appintegrations_sdkv2.NewFromConfig(cfg, - appintegrations_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return appintegrations.NewFromConfig(cfg, + appintegrations.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/applicationinsights/service_endpoint_resolver_gen.go b/internal/service/applicationinsights/service_endpoint_resolver_gen.go index 9d2d60447ae..36f65e3254b 100644 --- a/internal/service/applicationinsights/service_endpoint_resolver_gen.go +++ b/internal/service/applicationinsights/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - applicationinsights_sdkv2 "github.com/aws/aws-sdk-go-v2/service/applicationinsights" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/applicationinsights" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ applicationinsights_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ applicationinsights.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver applicationinsights_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver applicationinsights.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: applicationinsights_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: applicationinsights.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params applicationinsights_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params applicationinsights.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params applicationin tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up applicationinsights endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params applicationin return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*applicationinsights_sdkv2.Options) { - return func(o *applicationinsights_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*applicationinsights.Options) { + return func(o *applicationinsights.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/applicationinsights/service_endpoints_gen_test.go b/internal/service/applicationinsights/service_endpoints_gen_test.go index 42fccf661cd..45651ead4af 100644 --- a/internal/service/applicationinsights/service_endpoints_gen_test.go +++ b/internal/service/applicationinsights/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - applicationinsights_sdkv2 "github.com/aws/aws-sdk-go-v2/service/applicationinsights" + "github.com/aws/aws-sdk-go-v2/service/applicationinsights" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := applicationinsights_sdkv2.NewDefaultEndpointResolverV2() + r := applicationinsights.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), applicationinsights_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), applicationinsights.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := applicationinsights_sdkv2.NewDefaultEndpointResolverV2() + r := applicationinsights.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), applicationinsights_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), applicationinsights.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.CreateApplication(ctx, &applicationinsights_sdkv2.CreateApplicationInput{}, - func(opts *applicationinsights_sdkv2.Options) { + _, err := client.CreateApplication(ctx, &applicationinsights.CreateApplicationInput{}, + func(opts *applicationinsights.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/applicationinsights/service_package_gen.go b/internal/service/applicationinsights/service_package_gen.go index e6692a10ee4..d0e5ac3670b 100644 --- a/internal/service/applicationinsights/service_package_gen.go +++ b/internal/service/applicationinsights/service_package_gen.go @@ -5,8 +5,8 @@ package applicationinsights import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - applicationinsights_sdkv2 "github.com/aws/aws-sdk-go-v2/service/applicationinsights" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/applicationinsights" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -44,11 +44,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*applicationinsights_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*applicationinsights.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return applicationinsights_sdkv2.NewFromConfig(cfg, - applicationinsights_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return applicationinsights.NewFromConfig(cfg, + applicationinsights.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/applicationsignals/service_endpoint_resolver_gen.go b/internal/service/applicationsignals/service_endpoint_resolver_gen.go index 1cce75da679..07ec75d8062 100644 --- a/internal/service/applicationsignals/service_endpoint_resolver_gen.go +++ b/internal/service/applicationsignals/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - applicationsignals_sdkv2 "github.com/aws/aws-sdk-go-v2/service/applicationsignals" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/applicationsignals" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ applicationsignals_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ applicationsignals.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver applicationsignals_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver applicationsignals.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: applicationsignals_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: applicationsignals.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params applicationsignals_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params applicationsignals.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params applicationsi tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up applicationsignals endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params applicationsi return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*applicationsignals_sdkv2.Options) { - return func(o *applicationsignals_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*applicationsignals.Options) { + return func(o *applicationsignals.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/applicationsignals/service_endpoints_gen_test.go b/internal/service/applicationsignals/service_endpoints_gen_test.go index 6e5b5c6e390..42948cb0c99 100644 --- a/internal/service/applicationsignals/service_endpoints_gen_test.go +++ b/internal/service/applicationsignals/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - applicationsignals_sdkv2 "github.com/aws/aws-sdk-go-v2/service/applicationsignals" + "github.com/aws/aws-sdk-go-v2/service/applicationsignals" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := applicationsignals_sdkv2.NewDefaultEndpointResolverV2() + r := applicationsignals.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), applicationsignals_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), applicationsignals.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := applicationsignals_sdkv2.NewDefaultEndpointResolverV2() + r := applicationsignals.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), applicationsignals_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), applicationsignals.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListServiceLevelObjectives(ctx, &applicationsignals_sdkv2.ListServiceLevelObjectivesInput{}, - func(opts *applicationsignals_sdkv2.Options) { + _, err := client.ListServiceLevelObjectives(ctx, &applicationsignals.ListServiceLevelObjectivesInput{}, + func(opts *applicationsignals.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/applicationsignals/service_package_gen.go b/internal/service/applicationsignals/service_package_gen.go index de55458f7c8..edba302f39e 100644 --- a/internal/service/applicationsignals/service_package_gen.go +++ b/internal/service/applicationsignals/service_package_gen.go @@ -5,8 +5,8 @@ package applicationsignals import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - applicationsignals_sdkv2 "github.com/aws/aws-sdk-go-v2/service/applicationsignals" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/applicationsignals" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -35,11 +35,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*applicationsignals_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*applicationsignals.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return applicationsignals_sdkv2.NewFromConfig(cfg, - applicationsignals_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return applicationsignals.NewFromConfig(cfg, + applicationsignals.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/appmesh/service_endpoint_resolver_gen.go b/internal/service/appmesh/service_endpoint_resolver_gen.go index a11a9b231c3..78f11cbea77 100644 --- a/internal/service/appmesh/service_endpoint_resolver_gen.go +++ b/internal/service/appmesh/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - appmesh_sdkv2 "github.com/aws/aws-sdk-go-v2/service/appmesh" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/appmesh" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ appmesh_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ appmesh.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver appmesh_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver appmesh.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: appmesh_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: appmesh.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params appmesh_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params appmesh.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params appmesh_sdkv2 tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up appmesh endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params appmesh_sdkv2 return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*appmesh_sdkv2.Options) { - return func(o *appmesh_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*appmesh.Options) { + return func(o *appmesh.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/appmesh/service_endpoints_gen_test.go b/internal/service/appmesh/service_endpoints_gen_test.go index 128bf6f8fc3..0cf8492581f 100644 --- a/internal/service/appmesh/service_endpoints_gen_test.go +++ b/internal/service/appmesh/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - appmesh_sdkv2 "github.com/aws/aws-sdk-go-v2/service/appmesh" + "github.com/aws/aws-sdk-go-v2/service/appmesh" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := appmesh_sdkv2.NewDefaultEndpointResolverV2() + r := appmesh.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), appmesh_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), appmesh.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := appmesh_sdkv2.NewDefaultEndpointResolverV2() + r := appmesh.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), appmesh_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), appmesh.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListMeshes(ctx, &appmesh_sdkv2.ListMeshesInput{}, - func(opts *appmesh_sdkv2.Options) { + _, err := client.ListMeshes(ctx, &appmesh.ListMeshesInput{}, + func(opts *appmesh.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/appmesh/service_package_gen.go b/internal/service/appmesh/service_package_gen.go index f50857157a1..c74789750f9 100644 --- a/internal/service/appmesh/service_package_gen.go +++ b/internal/service/appmesh/service_package_gen.go @@ -5,8 +5,8 @@ package appmesh import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - appmesh_sdkv2 "github.com/aws/aws-sdk-go-v2/service/appmesh" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/appmesh" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -135,11 +135,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*appmesh_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*appmesh.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return appmesh_sdkv2.NewFromConfig(cfg, - appmesh_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return appmesh.NewFromConfig(cfg, + appmesh.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/apprunner/service_endpoint_resolver_gen.go b/internal/service/apprunner/service_endpoint_resolver_gen.go index af87f59ac6a..cb153b853ab 100644 --- a/internal/service/apprunner/service_endpoint_resolver_gen.go +++ b/internal/service/apprunner/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - apprunner_sdkv2 "github.com/aws/aws-sdk-go-v2/service/apprunner" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/apprunner" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ apprunner_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ apprunner.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver apprunner_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver apprunner.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: apprunner_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: apprunner.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params apprunner_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params apprunner.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params apprunner_sdk tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up apprunner endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params apprunner_sdk return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*apprunner_sdkv2.Options) { - return func(o *apprunner_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*apprunner.Options) { + return func(o *apprunner.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/apprunner/service_endpoints_gen_test.go b/internal/service/apprunner/service_endpoints_gen_test.go index 70efb684a2d..d941d44fef9 100644 --- a/internal/service/apprunner/service_endpoints_gen_test.go +++ b/internal/service/apprunner/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - apprunner_sdkv2 "github.com/aws/aws-sdk-go-v2/service/apprunner" + "github.com/aws/aws-sdk-go-v2/service/apprunner" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := apprunner_sdkv2.NewDefaultEndpointResolverV2() + r := apprunner.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), apprunner_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), apprunner.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := apprunner_sdkv2.NewDefaultEndpointResolverV2() + r := apprunner.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), apprunner_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), apprunner.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListConnections(ctx, &apprunner_sdkv2.ListConnectionsInput{}, - func(opts *apprunner_sdkv2.Options) { + _, err := client.ListConnections(ctx, &apprunner.ListConnectionsInput{}, + func(opts *apprunner.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/apprunner/service_package_gen.go b/internal/service/apprunner/service_package_gen.go index f4476eece9b..2e5cda74c30 100644 --- a/internal/service/apprunner/service_package_gen.go +++ b/internal/service/apprunner/service_package_gen.go @@ -5,8 +5,8 @@ package apprunner import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - apprunner_sdkv2 "github.com/aws/aws-sdk-go-v2/service/apprunner" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/apprunner" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -103,11 +103,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*apprunner_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*apprunner.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return apprunner_sdkv2.NewFromConfig(cfg, - apprunner_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return apprunner.NewFromConfig(cfg, + apprunner.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/appstream/service_endpoint_resolver_gen.go b/internal/service/appstream/service_endpoint_resolver_gen.go index 3514cc65271..4937a6a51bc 100644 --- a/internal/service/appstream/service_endpoint_resolver_gen.go +++ b/internal/service/appstream/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - appstream_sdkv2 "github.com/aws/aws-sdk-go-v2/service/appstream" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/appstream" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ appstream_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ appstream.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver appstream_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver appstream.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: appstream_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: appstream.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params appstream_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params appstream.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params appstream_sdk tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up appstream endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params appstream_sdk return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*appstream_sdkv2.Options) { - return func(o *appstream_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*appstream.Options) { + return func(o *appstream.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/appstream/service_endpoints_gen_test.go b/internal/service/appstream/service_endpoints_gen_test.go index fb1ffc89e95..a4daf567c52 100644 --- a/internal/service/appstream/service_endpoints_gen_test.go +++ b/internal/service/appstream/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - appstream_sdkv2 "github.com/aws/aws-sdk-go-v2/service/appstream" + "github.com/aws/aws-sdk-go-v2/service/appstream" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := appstream_sdkv2.NewDefaultEndpointResolverV2() + r := appstream.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), appstream_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), appstream.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := appstream_sdkv2.NewDefaultEndpointResolverV2() + r := appstream.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), appstream_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), appstream.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,10 +283,10 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListAssociatedFleets(ctx, &appstream_sdkv2.ListAssociatedFleetsInput{ - StackName: aws_sdkv2.String("test"), + _, err := client.ListAssociatedFleets(ctx, &appstream.ListAssociatedFleetsInput{ + StackName: aws.String("test"), }, - func(opts *appstream_sdkv2.Options) { + func(opts *appstream.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/appstream/service_package_gen.go b/internal/service/appstream/service_package_gen.go index 8e004b4841a..c540613b969 100644 --- a/internal/service/appstream/service_package_gen.go +++ b/internal/service/appstream/service_package_gen.go @@ -5,8 +5,8 @@ package appstream import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - appstream_sdkv2 "github.com/aws/aws-sdk-go-v2/service/appstream" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/appstream" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -81,11 +81,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*appstream_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*appstream.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return appstream_sdkv2.NewFromConfig(cfg, - appstream_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return appstream.NewFromConfig(cfg, + appstream.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/appsync/service_endpoint_resolver_gen.go b/internal/service/appsync/service_endpoint_resolver_gen.go index b05d35ea7d2..e079e6f8177 100644 --- a/internal/service/appsync/service_endpoint_resolver_gen.go +++ b/internal/service/appsync/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - appsync_sdkv2 "github.com/aws/aws-sdk-go-v2/service/appsync" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/appsync" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ appsync_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ appsync.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver appsync_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver appsync.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: appsync_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: appsync.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params appsync_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params appsync.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params appsync_sdkv2 tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up appsync endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params appsync_sdkv2 return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*appsync_sdkv2.Options) { - return func(o *appsync_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*appsync.Options) { + return func(o *appsync.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/appsync/service_endpoints_gen_test.go b/internal/service/appsync/service_endpoints_gen_test.go index 88c7ee064aa..24404b45c8c 100644 --- a/internal/service/appsync/service_endpoints_gen_test.go +++ b/internal/service/appsync/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - appsync_sdkv2 "github.com/aws/aws-sdk-go-v2/service/appsync" + "github.com/aws/aws-sdk-go-v2/service/appsync" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := appsync_sdkv2.NewDefaultEndpointResolverV2() + r := appsync.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), appsync_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), appsync.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := appsync_sdkv2.NewDefaultEndpointResolverV2() + r := appsync.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), appsync_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), appsync.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListDomainNames(ctx, &appsync_sdkv2.ListDomainNamesInput{}, - func(opts *appsync_sdkv2.Options) { + _, err := client.ListDomainNames(ctx, &appsync.ListDomainNamesInput{}, + func(opts *appsync.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/appsync/service_package.go b/internal/service/appsync/service_package.go index 2242dc1175b..67b5bf7fc04 100644 --- a/internal/service/appsync/service_package.go +++ b/internal/service/appsync/service_package.go @@ -20,7 +20,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return appsync.NewFromConfig(cfg, - appsync.WithEndpointResolverV2(newEndpointResolverSDKv2()), + appsync.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), func(o *appsync.Options) { o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(func(err error) aws.Ternary { diff --git a/internal/service/athena/service_endpoint_resolver_gen.go b/internal/service/athena/service_endpoint_resolver_gen.go index 6bb495fdaae..6b32c8f767f 100644 --- a/internal/service/athena/service_endpoint_resolver_gen.go +++ b/internal/service/athena/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - athena_sdkv2 "github.com/aws/aws-sdk-go-v2/service/athena" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/athena" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ athena_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ athena.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver athena_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver athena.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: athena_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: athena.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params athena_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params athena.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params athena_sdkv2. tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up athena endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params athena_sdkv2. return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*athena_sdkv2.Options) { - return func(o *athena_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*athena.Options) { + return func(o *athena.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/athena/service_endpoints_gen_test.go b/internal/service/athena/service_endpoints_gen_test.go index c0ddd30a89d..3131e21d2e2 100644 --- a/internal/service/athena/service_endpoints_gen_test.go +++ b/internal/service/athena/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - athena_sdkv2 "github.com/aws/aws-sdk-go-v2/service/athena" + "github.com/aws/aws-sdk-go-v2/service/athena" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := athena_sdkv2.NewDefaultEndpointResolverV2() + r := athena.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), athena_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), athena.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := athena_sdkv2.NewDefaultEndpointResolverV2() + r := athena.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), athena_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), athena.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListDataCatalogs(ctx, &athena_sdkv2.ListDataCatalogsInput{}, - func(opts *athena_sdkv2.Options) { + _, err := client.ListDataCatalogs(ctx, &athena.ListDataCatalogsInput{}, + func(opts *athena.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/athena/service_package_gen.go b/internal/service/athena/service_package_gen.go index c35211a04fa..55978fa0c40 100644 --- a/internal/service/athena/service_package_gen.go +++ b/internal/service/athena/service_package_gen.go @@ -5,8 +5,8 @@ package athena import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - athena_sdkv2 "github.com/aws/aws-sdk-go-v2/service/athena" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/athena" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -70,11 +70,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*athena_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*athena.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return athena_sdkv2.NewFromConfig(cfg, - athena_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return athena.NewFromConfig(cfg, + athena.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/auditmanager/service_endpoint_resolver_gen.go b/internal/service/auditmanager/service_endpoint_resolver_gen.go index 5694d8436b9..69264740bc5 100644 --- a/internal/service/auditmanager/service_endpoint_resolver_gen.go +++ b/internal/service/auditmanager/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - auditmanager_sdkv2 "github.com/aws/aws-sdk-go-v2/service/auditmanager" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/auditmanager" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ auditmanager_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ auditmanager.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver auditmanager_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver auditmanager.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: auditmanager_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: auditmanager.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params auditmanager_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params auditmanager.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params auditmanager_ tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up auditmanager endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params auditmanager_ return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*auditmanager_sdkv2.Options) { - return func(o *auditmanager_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*auditmanager.Options) { + return func(o *auditmanager.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/auditmanager/service_endpoints_gen_test.go b/internal/service/auditmanager/service_endpoints_gen_test.go index af7cf9a1146..5bc33b78269 100644 --- a/internal/service/auditmanager/service_endpoints_gen_test.go +++ b/internal/service/auditmanager/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - auditmanager_sdkv2 "github.com/aws/aws-sdk-go-v2/service/auditmanager" + "github.com/aws/aws-sdk-go-v2/service/auditmanager" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := auditmanager_sdkv2.NewDefaultEndpointResolverV2() + r := auditmanager.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), auditmanager_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), auditmanager.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := auditmanager_sdkv2.NewDefaultEndpointResolverV2() + r := auditmanager.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), auditmanager_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), auditmanager.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.GetAccountStatus(ctx, &auditmanager_sdkv2.GetAccountStatusInput{}, - func(opts *auditmanager_sdkv2.Options) { + _, err := client.GetAccountStatus(ctx, &auditmanager.GetAccountStatusInput{}, + func(opts *auditmanager.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/auditmanager/service_package_gen.go b/internal/service/auditmanager/service_package_gen.go index 99ead68abd5..251cac1b893 100644 --- a/internal/service/auditmanager/service_package_gen.go +++ b/internal/service/auditmanager/service_package_gen.go @@ -5,8 +5,8 @@ package auditmanager import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - auditmanager_sdkv2 "github.com/aws/aws-sdk-go-v2/service/auditmanager" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/auditmanager" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -79,11 +79,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*auditmanager_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*auditmanager.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return auditmanager_sdkv2.NewFromConfig(cfg, - auditmanager_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return auditmanager.NewFromConfig(cfg, + auditmanager.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/autoscaling/service_endpoint_resolver_gen.go b/internal/service/autoscaling/service_endpoint_resolver_gen.go index 7957c8ce8dd..2bc2ceb136e 100644 --- a/internal/service/autoscaling/service_endpoint_resolver_gen.go +++ b/internal/service/autoscaling/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - autoscaling_sdkv2 "github.com/aws/aws-sdk-go-v2/service/autoscaling" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/autoscaling" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ autoscaling_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ autoscaling.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver autoscaling_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver autoscaling.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: autoscaling_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: autoscaling.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params autoscaling_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params autoscaling.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params autoscaling_s tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up autoscaling endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params autoscaling_s return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*autoscaling_sdkv2.Options) { - return func(o *autoscaling_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*autoscaling.Options) { + return func(o *autoscaling.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/autoscaling/service_endpoints_gen_test.go b/internal/service/autoscaling/service_endpoints_gen_test.go index 6091ee446e4..2053b029063 100644 --- a/internal/service/autoscaling/service_endpoints_gen_test.go +++ b/internal/service/autoscaling/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - autoscaling_sdkv2 "github.com/aws/aws-sdk-go-v2/service/autoscaling" + "github.com/aws/aws-sdk-go-v2/service/autoscaling" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := autoscaling_sdkv2.NewDefaultEndpointResolverV2() + r := autoscaling.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), autoscaling_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), autoscaling.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := autoscaling_sdkv2.NewDefaultEndpointResolverV2() + r := autoscaling.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), autoscaling_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), autoscaling.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.DescribeAutoScalingGroups(ctx, &autoscaling_sdkv2.DescribeAutoScalingGroupsInput{}, - func(opts *autoscaling_sdkv2.Options) { + _, err := client.DescribeAutoScalingGroups(ctx, &autoscaling.DescribeAutoScalingGroupsInput{}, + func(opts *autoscaling.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/autoscaling/service_package_gen.go b/internal/service/autoscaling/service_package_gen.go index 3eca5059adb..b4f52e69d11 100644 --- a/internal/service/autoscaling/service_package_gen.go +++ b/internal/service/autoscaling/service_package_gen.go @@ -5,8 +5,8 @@ package autoscaling import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - autoscaling_sdkv2 "github.com/aws/aws-sdk-go-v2/service/autoscaling" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/autoscaling" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -97,11 +97,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*autoscaling_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*autoscaling.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return autoscaling_sdkv2.NewFromConfig(cfg, - autoscaling_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return autoscaling.NewFromConfig(cfg, + autoscaling.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/autoscalingplans/service_endpoint_resolver_gen.go b/internal/service/autoscalingplans/service_endpoint_resolver_gen.go index 8c35b996615..321a5ef5400 100644 --- a/internal/service/autoscalingplans/service_endpoint_resolver_gen.go +++ b/internal/service/autoscalingplans/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - autoscalingplans_sdkv2 "github.com/aws/aws-sdk-go-v2/service/autoscalingplans" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/autoscalingplans" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ autoscalingplans_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ autoscalingplans.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver autoscalingplans_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver autoscalingplans.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: autoscalingplans_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: autoscalingplans.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params autoscalingplans_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params autoscalingplans.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params autoscalingpl tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up autoscalingplans endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params autoscalingpl return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*autoscalingplans_sdkv2.Options) { - return func(o *autoscalingplans_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*autoscalingplans.Options) { + return func(o *autoscalingplans.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/autoscalingplans/service_endpoints_gen_test.go b/internal/service/autoscalingplans/service_endpoints_gen_test.go index d2270b7ff35..255cb6b423b 100644 --- a/internal/service/autoscalingplans/service_endpoints_gen_test.go +++ b/internal/service/autoscalingplans/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - autoscalingplans_sdkv2 "github.com/aws/aws-sdk-go-v2/service/autoscalingplans" + "github.com/aws/aws-sdk-go-v2/service/autoscalingplans" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := autoscalingplans_sdkv2.NewDefaultEndpointResolverV2() + r := autoscalingplans.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), autoscalingplans_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), autoscalingplans.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := autoscalingplans_sdkv2.NewDefaultEndpointResolverV2() + r := autoscalingplans.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), autoscalingplans_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), autoscalingplans.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.DescribeScalingPlans(ctx, &autoscalingplans_sdkv2.DescribeScalingPlansInput{}, - func(opts *autoscalingplans_sdkv2.Options) { + _, err := client.DescribeScalingPlans(ctx, &autoscalingplans.DescribeScalingPlansInput{}, + func(opts *autoscalingplans.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/autoscalingplans/service_package_gen.go b/internal/service/autoscalingplans/service_package_gen.go index f7153419f7c..a404320210d 100644 --- a/internal/service/autoscalingplans/service_package_gen.go +++ b/internal/service/autoscalingplans/service_package_gen.go @@ -5,8 +5,8 @@ package autoscalingplans import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - autoscalingplans_sdkv2 "github.com/aws/aws-sdk-go-v2/service/autoscalingplans" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/autoscalingplans" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -40,11 +40,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*autoscalingplans_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*autoscalingplans.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return autoscalingplans_sdkv2.NewFromConfig(cfg, - autoscalingplans_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return autoscalingplans.NewFromConfig(cfg, + autoscalingplans.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/backup/service_endpoint_resolver_gen.go b/internal/service/backup/service_endpoint_resolver_gen.go index f858b73d3da..3c3173a9d90 100644 --- a/internal/service/backup/service_endpoint_resolver_gen.go +++ b/internal/service/backup/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - backup_sdkv2 "github.com/aws/aws-sdk-go-v2/service/backup" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/backup" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ backup_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ backup.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver backup_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver backup.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: backup_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: backup.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params backup_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params backup.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params backup_sdkv2. tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up backup endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params backup_sdkv2. return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*backup_sdkv2.Options) { - return func(o *backup_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*backup.Options) { + return func(o *backup.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/backup/service_endpoints_gen_test.go b/internal/service/backup/service_endpoints_gen_test.go index d08cbd1a10f..a233c7cb97b 100644 --- a/internal/service/backup/service_endpoints_gen_test.go +++ b/internal/service/backup/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - backup_sdkv2 "github.com/aws/aws-sdk-go-v2/service/backup" + "github.com/aws/aws-sdk-go-v2/service/backup" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := backup_sdkv2.NewDefaultEndpointResolverV2() + r := backup.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), backup_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), backup.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := backup_sdkv2.NewDefaultEndpointResolverV2() + r := backup.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), backup_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), backup.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListBackupPlans(ctx, &backup_sdkv2.ListBackupPlansInput{}, - func(opts *backup_sdkv2.Options) { + _, err := client.ListBackupPlans(ctx, &backup.ListBackupPlansInput{}, + func(opts *backup.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/backup/service_package_gen.go b/internal/service/backup/service_package_gen.go index 1423904c269..08508d1b2e1 100644 --- a/internal/service/backup/service_package_gen.go +++ b/internal/service/backup/service_package_gen.go @@ -5,8 +5,8 @@ package backup import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - backup_sdkv2 "github.com/aws/aws-sdk-go-v2/service/backup" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/backup" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -155,11 +155,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*backup_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*backup.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return backup_sdkv2.NewFromConfig(cfg, - backup_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return backup.NewFromConfig(cfg, + backup.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/batch/service_endpoint_resolver_gen.go b/internal/service/batch/service_endpoint_resolver_gen.go index 19487e33495..7120a8c0d05 100644 --- a/internal/service/batch/service_endpoint_resolver_gen.go +++ b/internal/service/batch/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - batch_sdkv2 "github.com/aws/aws-sdk-go-v2/service/batch" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/batch" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ batch_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ batch.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver batch_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver batch.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: batch_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: batch.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params batch_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params batch.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params batch_sdkv2.E tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up batch endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params batch_sdkv2.E return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*batch_sdkv2.Options) { - return func(o *batch_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*batch.Options) { + return func(o *batch.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/batch/service_endpoints_gen_test.go b/internal/service/batch/service_endpoints_gen_test.go index d66e4c1e4e5..764f65d6809 100644 --- a/internal/service/batch/service_endpoints_gen_test.go +++ b/internal/service/batch/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - batch_sdkv2 "github.com/aws/aws-sdk-go-v2/service/batch" + "github.com/aws/aws-sdk-go-v2/service/batch" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := batch_sdkv2.NewDefaultEndpointResolverV2() + r := batch.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), batch_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), batch.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := batch_sdkv2.NewDefaultEndpointResolverV2() + r := batch.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), batch_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), batch.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListJobs(ctx, &batch_sdkv2.ListJobsInput{}, - func(opts *batch_sdkv2.Options) { + _, err := client.ListJobs(ctx, &batch.ListJobsInput{}, + func(opts *batch.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/batch/service_package_gen.go b/internal/service/batch/service_package_gen.go index e94aa165d8e..00e1b5ab7bb 100644 --- a/internal/service/batch/service_package_gen.go +++ b/internal/service/batch/service_package_gen.go @@ -5,8 +5,8 @@ package batch import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - batch_sdkv2 "github.com/aws/aws-sdk-go-v2/service/batch" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/batch" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -92,11 +92,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*batch_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*batch.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return batch_sdkv2.NewFromConfig(cfg, - batch_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return batch.NewFromConfig(cfg, + batch.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/bcmdataexports/service_endpoint_resolver_gen.go b/internal/service/bcmdataexports/service_endpoint_resolver_gen.go index f50188abbe5..ff004f03d34 100644 --- a/internal/service/bcmdataexports/service_endpoint_resolver_gen.go +++ b/internal/service/bcmdataexports/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - bcmdataexports_sdkv2 "github.com/aws/aws-sdk-go-v2/service/bcmdataexports" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/bcmdataexports" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ bcmdataexports_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ bcmdataexports.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver bcmdataexports_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver bcmdataexports.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: bcmdataexports_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: bcmdataexports.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params bcmdataexports_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params bcmdataexports.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params bcmdataexport tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up bcmdataexports endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params bcmdataexport return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*bcmdataexports_sdkv2.Options) { - return func(o *bcmdataexports_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*bcmdataexports.Options) { + return func(o *bcmdataexports.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/bcmdataexports/service_endpoints_gen_test.go b/internal/service/bcmdataexports/service_endpoints_gen_test.go index ef7611571b1..0800718081b 100644 --- a/internal/service/bcmdataexports/service_endpoints_gen_test.go +++ b/internal/service/bcmdataexports/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - bcmdataexports_sdkv2 "github.com/aws/aws-sdk-go-v2/service/bcmdataexports" + "github.com/aws/aws-sdk-go-v2/service/bcmdataexports" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := bcmdataexports_sdkv2.NewDefaultEndpointResolverV2() + r := bcmdataexports.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), bcmdataexports_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), bcmdataexports.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := bcmdataexports_sdkv2.NewDefaultEndpointResolverV2() + r := bcmdataexports.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), bcmdataexports_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), bcmdataexports.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListExports(ctx, &bcmdataexports_sdkv2.ListExportsInput{}, - func(opts *bcmdataexports_sdkv2.Options) { + _, err := client.ListExports(ctx, &bcmdataexports.ListExportsInput{}, + func(opts *bcmdataexports.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/bcmdataexports/service_package_gen.go b/internal/service/bcmdataexports/service_package_gen.go index 8d4ce2ea1e1..7d1c63aa14b 100644 --- a/internal/service/bcmdataexports/service_package_gen.go +++ b/internal/service/bcmdataexports/service_package_gen.go @@ -5,8 +5,8 @@ package bcmdataexports import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - bcmdataexports_sdkv2 "github.com/aws/aws-sdk-go-v2/service/bcmdataexports" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/bcmdataexports" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -43,11 +43,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*bcmdataexports_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*bcmdataexports.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return bcmdataexports_sdkv2.NewFromConfig(cfg, - bcmdataexports_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return bcmdataexports.NewFromConfig(cfg, + bcmdataexports.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/bedrock/service_endpoint_resolver_gen.go b/internal/service/bedrock/service_endpoint_resolver_gen.go index d6fea1353f1..bb9ed437716 100644 --- a/internal/service/bedrock/service_endpoint_resolver_gen.go +++ b/internal/service/bedrock/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - bedrock_sdkv2 "github.com/aws/aws-sdk-go-v2/service/bedrock" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/bedrock" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ bedrock_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ bedrock.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver bedrock_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver bedrock.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: bedrock_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: bedrock.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params bedrock_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params bedrock.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params bedrock_sdkv2 tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up bedrock endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params bedrock_sdkv2 return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*bedrock_sdkv2.Options) { - return func(o *bedrock_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*bedrock.Options) { + return func(o *bedrock.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/bedrock/service_endpoints_gen_test.go b/internal/service/bedrock/service_endpoints_gen_test.go index 66fd7d4523e..ef142654060 100644 --- a/internal/service/bedrock/service_endpoints_gen_test.go +++ b/internal/service/bedrock/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - bedrock_sdkv2 "github.com/aws/aws-sdk-go-v2/service/bedrock" + "github.com/aws/aws-sdk-go-v2/service/bedrock" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := bedrock_sdkv2.NewDefaultEndpointResolverV2() + r := bedrock.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), bedrock_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), bedrock.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := bedrock_sdkv2.NewDefaultEndpointResolverV2() + r := bedrock.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), bedrock_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), bedrock.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListFoundationModels(ctx, &bedrock_sdkv2.ListFoundationModelsInput{}, - func(opts *bedrock_sdkv2.Options) { + _, err := client.ListFoundationModels(ctx, &bedrock.ListFoundationModelsInput{}, + func(opts *bedrock.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/bedrock/service_package_gen.go b/internal/service/bedrock/service_package_gen.go index a1edc6ece06..f4899cbe9ea 100644 --- a/internal/service/bedrock/service_package_gen.go +++ b/internal/service/bedrock/service_package_gen.go @@ -5,8 +5,8 @@ package bedrock import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - bedrock_sdkv2 "github.com/aws/aws-sdk-go-v2/service/bedrock" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/bedrock" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -90,11 +90,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*bedrock_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*bedrock.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return bedrock_sdkv2.NewFromConfig(cfg, - bedrock_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return bedrock.NewFromConfig(cfg, + bedrock.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/bedrockagent/service_endpoint_resolver_gen.go b/internal/service/bedrockagent/service_endpoint_resolver_gen.go index 60e5a6f7fc2..850cef4a6aa 100644 --- a/internal/service/bedrockagent/service_endpoint_resolver_gen.go +++ b/internal/service/bedrockagent/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - bedrockagent_sdkv2 "github.com/aws/aws-sdk-go-v2/service/bedrockagent" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/bedrockagent" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ bedrockagent_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ bedrockagent.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver bedrockagent_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver bedrockagent.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: bedrockagent_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: bedrockagent.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params bedrockagent_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params bedrockagent.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params bedrockagent_ tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up bedrockagent endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params bedrockagent_ return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*bedrockagent_sdkv2.Options) { - return func(o *bedrockagent_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*bedrockagent.Options) { + return func(o *bedrockagent.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/bedrockagent/service_endpoints_gen_test.go b/internal/service/bedrockagent/service_endpoints_gen_test.go index 7676a459e6d..dd93710cafd 100644 --- a/internal/service/bedrockagent/service_endpoints_gen_test.go +++ b/internal/service/bedrockagent/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - bedrockagent_sdkv2 "github.com/aws/aws-sdk-go-v2/service/bedrockagent" + "github.com/aws/aws-sdk-go-v2/service/bedrockagent" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := bedrockagent_sdkv2.NewDefaultEndpointResolverV2() + r := bedrockagent.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), bedrockagent_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), bedrockagent.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := bedrockagent_sdkv2.NewDefaultEndpointResolverV2() + r := bedrockagent.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), bedrockagent_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), bedrockagent.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListAgents(ctx, &bedrockagent_sdkv2.ListAgentsInput{}, - func(opts *bedrockagent_sdkv2.Options) { + _, err := client.ListAgents(ctx, &bedrockagent.ListAgentsInput{}, + func(opts *bedrockagent.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/bedrockagent/service_package_gen.go b/internal/service/bedrockagent/service_package_gen.go index eb90a11d2cf..2fa8121da9a 100644 --- a/internal/service/bedrockagent/service_package_gen.go +++ b/internal/service/bedrockagent/service_package_gen.go @@ -5,8 +5,8 @@ package bedrockagent import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - bedrockagent_sdkv2 "github.com/aws/aws-sdk-go-v2/service/bedrockagent" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/bedrockagent" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -74,11 +74,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*bedrockagent_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*bedrockagent.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return bedrockagent_sdkv2.NewFromConfig(cfg, - bedrockagent_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return bedrockagent.NewFromConfig(cfg, + bedrockagent.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/budgets/service_endpoint_resolver_gen.go b/internal/service/budgets/service_endpoint_resolver_gen.go index 57ad8f67282..6bf3f2bc6a3 100644 --- a/internal/service/budgets/service_endpoint_resolver_gen.go +++ b/internal/service/budgets/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - budgets_sdkv2 "github.com/aws/aws-sdk-go-v2/service/budgets" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/budgets" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ budgets_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ budgets.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver budgets_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver budgets.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: budgets_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: budgets.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params budgets_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params budgets.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params budgets_sdkv2 tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up budgets endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params budgets_sdkv2 return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*budgets_sdkv2.Options) { - return func(o *budgets_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*budgets.Options) { + return func(o *budgets.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/budgets/service_endpoints_gen_test.go b/internal/service/budgets/service_endpoints_gen_test.go index 77c2ed2bd31..13d1f0527bf 100644 --- a/internal/service/budgets/service_endpoints_gen_test.go +++ b/internal/service/budgets/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - budgets_sdkv2 "github.com/aws/aws-sdk-go-v2/service/budgets" + "github.com/aws/aws-sdk-go-v2/service/budgets" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := budgets_sdkv2.NewDefaultEndpointResolverV2() + r := budgets.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), budgets_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), budgets.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := budgets_sdkv2.NewDefaultEndpointResolverV2() + r := budgets.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), budgets_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), budgets.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,10 +283,10 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.DescribeBudgets(ctx, &budgets_sdkv2.DescribeBudgetsInput{ - AccountId: aws_sdkv2.String("012345678901"), + _, err := client.DescribeBudgets(ctx, &budgets.DescribeBudgetsInput{ + AccountId: aws.String("012345678901"), }, - func(opts *budgets_sdkv2.Options) { + func(opts *budgets.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/budgets/service_package_gen.go b/internal/service/budgets/service_package_gen.go index aeb0e93b1d1..cf321a8e7e4 100644 --- a/internal/service/budgets/service_package_gen.go +++ b/internal/service/budgets/service_package_gen.go @@ -5,8 +5,8 @@ package budgets import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - budgets_sdkv2 "github.com/aws/aws-sdk-go-v2/service/budgets" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/budgets" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -60,11 +60,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*budgets_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*budgets.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return budgets_sdkv2.NewFromConfig(cfg, - budgets_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return budgets.NewFromConfig(cfg, + budgets.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/ce/service_endpoint_resolver_gen.go b/internal/service/ce/service_endpoint_resolver_gen.go index ec2655a1f54..0dfbcce2992 100644 --- a/internal/service/ce/service_endpoint_resolver_gen.go +++ b/internal/service/ce/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - costexplorer_sdkv2 "github.com/aws/aws-sdk-go-v2/service/costexplorer" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/costexplorer" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ costexplorer_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ costexplorer.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver costexplorer_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver costexplorer.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: costexplorer_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: costexplorer.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params costexplorer_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params costexplorer.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params costexplorer_ tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up costexplorer endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params costexplorer_ return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*costexplorer_sdkv2.Options) { - return func(o *costexplorer_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*costexplorer.Options) { + return func(o *costexplorer.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/ce/service_endpoints_gen_test.go b/internal/service/ce/service_endpoints_gen_test.go index 140caf4fcbf..ab49d3c6d65 100644 --- a/internal/service/ce/service_endpoints_gen_test.go +++ b/internal/service/ce/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - costexplorer_sdkv2 "github.com/aws/aws-sdk-go-v2/service/costexplorer" + "github.com/aws/aws-sdk-go-v2/service/costexplorer" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -296,10 +296,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := costexplorer_sdkv2.NewDefaultEndpointResolverV2() + r := costexplorer.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), costexplorer_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), costexplorer.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -313,11 +313,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := costexplorer_sdkv2.NewDefaultEndpointResolverV2() + r := costexplorer.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), costexplorer_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), costexplorer.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -337,8 +337,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListCostCategoryDefinitions(ctx, &costexplorer_sdkv2.ListCostCategoryDefinitionsInput{}, - func(opts *costexplorer_sdkv2.Options) { + _, err := client.ListCostCategoryDefinitions(ctx, &costexplorer.ListCostCategoryDefinitionsInput{}, + func(opts *costexplorer.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/ce/service_package_gen.go b/internal/service/ce/service_package_gen.go index 482009bfad6..4d08451699b 100644 --- a/internal/service/ce/service_package_gen.go +++ b/internal/service/ce/service_package_gen.go @@ -5,8 +5,8 @@ package ce import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - costexplorer_sdkv2 "github.com/aws/aws-sdk-go-v2/service/costexplorer" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/costexplorer" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -76,11 +76,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*costexplorer_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*costexplorer.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return costexplorer_sdkv2.NewFromConfig(cfg, - costexplorer_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return costexplorer.NewFromConfig(cfg, + costexplorer.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/chatbot/service_endpoint_resolver_gen.go b/internal/service/chatbot/service_endpoint_resolver_gen.go index 97545a9c42f..b6a7aaa0bc5 100644 --- a/internal/service/chatbot/service_endpoint_resolver_gen.go +++ b/internal/service/chatbot/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - chatbot_sdkv2 "github.com/aws/aws-sdk-go-v2/service/chatbot" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/chatbot" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ chatbot_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ chatbot.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver chatbot_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver chatbot.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: chatbot_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: chatbot.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params chatbot_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params chatbot.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params chatbot_sdkv2 tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up chatbot endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params chatbot_sdkv2 return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*chatbot_sdkv2.Options) { - return func(o *chatbot_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*chatbot.Options) { + return func(o *chatbot.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/chatbot/service_endpoints_gen_test.go b/internal/service/chatbot/service_endpoints_gen_test.go index e19d23d9418..4e5a0262510 100644 --- a/internal/service/chatbot/service_endpoints_gen_test.go +++ b/internal/service/chatbot/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - chatbot_sdkv2 "github.com/aws/aws-sdk-go-v2/service/chatbot" + "github.com/aws/aws-sdk-go-v2/service/chatbot" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -244,10 +244,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := chatbot_sdkv2.NewDefaultEndpointResolverV2() + r := chatbot.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), chatbot_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), chatbot.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -261,11 +261,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := chatbot_sdkv2.NewDefaultEndpointResolverV2() + r := chatbot.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), chatbot_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), chatbot.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -285,8 +285,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.GetAccountPreferences(ctx, &chatbot_sdkv2.GetAccountPreferencesInput{}, - func(opts *chatbot_sdkv2.Options) { + _, err := client.GetAccountPreferences(ctx, &chatbot.GetAccountPreferencesInput{}, + func(opts *chatbot.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/chatbot/service_package.go b/internal/service/chatbot/service_package.go index f7f994d91bd..3e2466dce00 100644 --- a/internal/service/chatbot/service_package.go +++ b/internal/service/chatbot/service_package.go @@ -18,7 +18,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return chatbot.NewFromConfig(cfg, - chatbot.WithEndpointResolverV2(newEndpointResolverSDKv2()), + chatbot.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), func(o *chatbot.Options) { if config["partition"].(string) == names.StandardPartitionID { diff --git a/internal/service/chime/service_endpoint_resolver_gen.go b/internal/service/chime/service_endpoint_resolver_gen.go index 91792ee1acd..c1547bf192d 100644 --- a/internal/service/chime/service_endpoint_resolver_gen.go +++ b/internal/service/chime/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - chime_sdkv2 "github.com/aws/aws-sdk-go-v2/service/chime" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/chime" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ chime_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ chime.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver chime_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver chime.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: chime_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: chime.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params chime_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params chime.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params chime_sdkv2.E tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up chime endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params chime_sdkv2.E return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*chime_sdkv2.Options) { - return func(o *chime_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*chime.Options) { + return func(o *chime.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/chime/service_endpoints_gen_test.go b/internal/service/chime/service_endpoints_gen_test.go index 21abf3c4815..c6d659ae472 100644 --- a/internal/service/chime/service_endpoints_gen_test.go +++ b/internal/service/chime/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - chime_sdkv2 "github.com/aws/aws-sdk-go-v2/service/chime" + "github.com/aws/aws-sdk-go-v2/service/chime" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := chime_sdkv2.NewDefaultEndpointResolverV2() + r := chime.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), chime_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), chime.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := chime_sdkv2.NewDefaultEndpointResolverV2() + r := chime.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), chime_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), chime.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListAccounts(ctx, &chime_sdkv2.ListAccountsInput{}, - func(opts *chime_sdkv2.Options) { + _, err := client.ListAccounts(ctx, &chime.ListAccountsInput{}, + func(opts *chime.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/chime/service_package_gen.go b/internal/service/chime/service_package_gen.go index e4c7d19dbf8..ee06654b1ce 100644 --- a/internal/service/chime/service_package_gen.go +++ b/internal/service/chime/service_package_gen.go @@ -5,8 +5,8 @@ package chime import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - chime_sdkv2 "github.com/aws/aws-sdk-go-v2/service/chime" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/chime" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -68,11 +68,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*chime_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*chime.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return chime_sdkv2.NewFromConfig(cfg, - chime_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return chime.NewFromConfig(cfg, + chime.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/chimesdkmediapipelines/service_endpoint_resolver_gen.go b/internal/service/chimesdkmediapipelines/service_endpoint_resolver_gen.go index f41b43341cc..ff3d66a2a6d 100644 --- a/internal/service/chimesdkmediapipelines/service_endpoint_resolver_gen.go +++ b/internal/service/chimesdkmediapipelines/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - chimesdkmediapipelines_sdkv2 "github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ chimesdkmediapipelines_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ chimesdkmediapipelines.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver chimesdkmediapipelines_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver chimesdkmediapipelines.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: chimesdkmediapipelines_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: chimesdkmediapipelines.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params chimesdkmediapipelines_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params chimesdkmediapipelines.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params chimesdkmedia tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up chimesdkmediapipelines endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params chimesdkmedia return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*chimesdkmediapipelines_sdkv2.Options) { - return func(o *chimesdkmediapipelines_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*chimesdkmediapipelines.Options) { + return func(o *chimesdkmediapipelines.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/chimesdkmediapipelines/service_endpoints_gen_test.go b/internal/service/chimesdkmediapipelines/service_endpoints_gen_test.go index 745c7f80230..ea8e9eef360 100644 --- a/internal/service/chimesdkmediapipelines/service_endpoints_gen_test.go +++ b/internal/service/chimesdkmediapipelines/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - chimesdkmediapipelines_sdkv2 "github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines" + "github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := chimesdkmediapipelines_sdkv2.NewDefaultEndpointResolverV2() + r := chimesdkmediapipelines.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), chimesdkmediapipelines_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), chimesdkmediapipelines.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := chimesdkmediapipelines_sdkv2.NewDefaultEndpointResolverV2() + r := chimesdkmediapipelines.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), chimesdkmediapipelines_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), chimesdkmediapipelines.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListMediaPipelines(ctx, &chimesdkmediapipelines_sdkv2.ListMediaPipelinesInput{}, - func(opts *chimesdkmediapipelines_sdkv2.Options) { + _, err := client.ListMediaPipelines(ctx, &chimesdkmediapipelines.ListMediaPipelinesInput{}, + func(opts *chimesdkmediapipelines.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/chimesdkmediapipelines/service_package_gen.go b/internal/service/chimesdkmediapipelines/service_package_gen.go index 9ce8ac0b2d5..f3c0f28badc 100644 --- a/internal/service/chimesdkmediapipelines/service_package_gen.go +++ b/internal/service/chimesdkmediapipelines/service_package_gen.go @@ -5,8 +5,8 @@ package chimesdkmediapipelines import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - chimesdkmediapipelines_sdkv2 "github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -44,11 +44,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*chimesdkmediapipelines_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*chimesdkmediapipelines.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return chimesdkmediapipelines_sdkv2.NewFromConfig(cfg, - chimesdkmediapipelines_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return chimesdkmediapipelines.NewFromConfig(cfg, + chimesdkmediapipelines.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/chimesdkvoice/service_endpoint_resolver_gen.go b/internal/service/chimesdkvoice/service_endpoint_resolver_gen.go index f05b10fd2bb..bfa91a8bc12 100644 --- a/internal/service/chimesdkvoice/service_endpoint_resolver_gen.go +++ b/internal/service/chimesdkvoice/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - chimesdkvoice_sdkv2 "github.com/aws/aws-sdk-go-v2/service/chimesdkvoice" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/chimesdkvoice" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ chimesdkvoice_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ chimesdkvoice.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver chimesdkvoice_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver chimesdkvoice.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: chimesdkvoice_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: chimesdkvoice.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params chimesdkvoice_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params chimesdkvoice.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params chimesdkvoice tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up chimesdkvoice endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params chimesdkvoice return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*chimesdkvoice_sdkv2.Options) { - return func(o *chimesdkvoice_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*chimesdkvoice.Options) { + return func(o *chimesdkvoice.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/chimesdkvoice/service_endpoints_gen_test.go b/internal/service/chimesdkvoice/service_endpoints_gen_test.go index 07440d8077b..18a7981417a 100644 --- a/internal/service/chimesdkvoice/service_endpoints_gen_test.go +++ b/internal/service/chimesdkvoice/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - chimesdkvoice_sdkv2 "github.com/aws/aws-sdk-go-v2/service/chimesdkvoice" + "github.com/aws/aws-sdk-go-v2/service/chimesdkvoice" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := chimesdkvoice_sdkv2.NewDefaultEndpointResolverV2() + r := chimesdkvoice.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), chimesdkvoice_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), chimesdkvoice.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := chimesdkvoice_sdkv2.NewDefaultEndpointResolverV2() + r := chimesdkvoice.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), chimesdkvoice_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), chimesdkvoice.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListPhoneNumbers(ctx, &chimesdkvoice_sdkv2.ListPhoneNumbersInput{}, - func(opts *chimesdkvoice_sdkv2.Options) { + _, err := client.ListPhoneNumbers(ctx, &chimesdkvoice.ListPhoneNumbersInput{}, + func(opts *chimesdkvoice.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/chimesdkvoice/service_package_gen.go b/internal/service/chimesdkvoice/service_package_gen.go index 40ba76b8aae..390ffc4d76f 100644 --- a/internal/service/chimesdkvoice/service_package_gen.go +++ b/internal/service/chimesdkvoice/service_package_gen.go @@ -5,8 +5,8 @@ package chimesdkvoice import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - chimesdkvoice_sdkv2 "github.com/aws/aws-sdk-go-v2/service/chimesdkvoice" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/chimesdkvoice" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -61,11 +61,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*chimesdkvoice_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*chimesdkvoice.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return chimesdkvoice_sdkv2.NewFromConfig(cfg, - chimesdkvoice_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return chimesdkvoice.NewFromConfig(cfg, + chimesdkvoice.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/cleanrooms/service_endpoint_resolver_gen.go b/internal/service/cleanrooms/service_endpoint_resolver_gen.go index 85d8ecfde4b..4e95202f948 100644 --- a/internal/service/cleanrooms/service_endpoint_resolver_gen.go +++ b/internal/service/cleanrooms/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - cleanrooms_sdkv2 "github.com/aws/aws-sdk-go-v2/service/cleanrooms" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/cleanrooms" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ cleanrooms_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ cleanrooms.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver cleanrooms_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver cleanrooms.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: cleanrooms_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: cleanrooms.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params cleanrooms_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params cleanrooms.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params cleanrooms_sd tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up cleanrooms endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params cleanrooms_sd return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*cleanrooms_sdkv2.Options) { - return func(o *cleanrooms_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*cleanrooms.Options) { + return func(o *cleanrooms.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/cleanrooms/service_endpoints_gen_test.go b/internal/service/cleanrooms/service_endpoints_gen_test.go index 5dcdbafcc6b..1720ad4fe3d 100644 --- a/internal/service/cleanrooms/service_endpoints_gen_test.go +++ b/internal/service/cleanrooms/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - cleanrooms_sdkv2 "github.com/aws/aws-sdk-go-v2/service/cleanrooms" + "github.com/aws/aws-sdk-go-v2/service/cleanrooms" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := cleanrooms_sdkv2.NewDefaultEndpointResolverV2() + r := cleanrooms.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), cleanrooms_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), cleanrooms.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := cleanrooms_sdkv2.NewDefaultEndpointResolverV2() + r := cleanrooms.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), cleanrooms_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), cleanrooms.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListCollaborations(ctx, &cleanrooms_sdkv2.ListCollaborationsInput{}, - func(opts *cleanrooms_sdkv2.Options) { + _, err := client.ListCollaborations(ctx, &cleanrooms.ListCollaborationsInput{}, + func(opts *cleanrooms.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/cleanrooms/service_package_gen.go b/internal/service/cleanrooms/service_package_gen.go index 2e32cee494b..86d064391ef 100644 --- a/internal/service/cleanrooms/service_package_gen.go +++ b/internal/service/cleanrooms/service_package_gen.go @@ -5,8 +5,8 @@ package cleanrooms import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - cleanrooms_sdkv2 "github.com/aws/aws-sdk-go-v2/service/cleanrooms" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/cleanrooms" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -50,11 +50,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*cleanrooms_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*cleanrooms.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return cleanrooms_sdkv2.NewFromConfig(cfg, - cleanrooms_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return cleanrooms.NewFromConfig(cfg, + cleanrooms.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/cloud9/service_endpoint_resolver_gen.go b/internal/service/cloud9/service_endpoint_resolver_gen.go index c84a54f62bf..cd6e259f288 100644 --- a/internal/service/cloud9/service_endpoint_resolver_gen.go +++ b/internal/service/cloud9/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - cloud9_sdkv2 "github.com/aws/aws-sdk-go-v2/service/cloud9" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/cloud9" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ cloud9_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ cloud9.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver cloud9_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver cloud9.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: cloud9_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: cloud9.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params cloud9_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params cloud9.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params cloud9_sdkv2. tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up cloud9 endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params cloud9_sdkv2. return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*cloud9_sdkv2.Options) { - return func(o *cloud9_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*cloud9.Options) { + return func(o *cloud9.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/cloud9/service_endpoints_gen_test.go b/internal/service/cloud9/service_endpoints_gen_test.go index 5e688cdd906..aa962dedf3a 100644 --- a/internal/service/cloud9/service_endpoints_gen_test.go +++ b/internal/service/cloud9/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - cloud9_sdkv2 "github.com/aws/aws-sdk-go-v2/service/cloud9" + "github.com/aws/aws-sdk-go-v2/service/cloud9" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := cloud9_sdkv2.NewDefaultEndpointResolverV2() + r := cloud9.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), cloud9_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), cloud9.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := cloud9_sdkv2.NewDefaultEndpointResolverV2() + r := cloud9.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), cloud9_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), cloud9.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListEnvironments(ctx, &cloud9_sdkv2.ListEnvironmentsInput{}, - func(opts *cloud9_sdkv2.Options) { + _, err := client.ListEnvironments(ctx, &cloud9.ListEnvironmentsInput{}, + func(opts *cloud9.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/cloud9/service_package_gen.go b/internal/service/cloud9/service_package_gen.go index a0f0c583f6f..3c49e9c8a41 100644 --- a/internal/service/cloud9/service_package_gen.go +++ b/internal/service/cloud9/service_package_gen.go @@ -5,8 +5,8 @@ package cloud9 import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - cloud9_sdkv2 "github.com/aws/aws-sdk-go-v2/service/cloud9" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/cloud9" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -49,11 +49,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*cloud9_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*cloud9.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return cloud9_sdkv2.NewFromConfig(cfg, - cloud9_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return cloud9.NewFromConfig(cfg, + cloud9.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/cloudcontrol/service_endpoint_resolver_gen.go b/internal/service/cloudcontrol/service_endpoint_resolver_gen.go index 320a69e3193..d1bec3b0eac 100644 --- a/internal/service/cloudcontrol/service_endpoint_resolver_gen.go +++ b/internal/service/cloudcontrol/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - cloudcontrol_sdkv2 "github.com/aws/aws-sdk-go-v2/service/cloudcontrol" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/cloudcontrol" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ cloudcontrol_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ cloudcontrol.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver cloudcontrol_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver cloudcontrol.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: cloudcontrol_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: cloudcontrol.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params cloudcontrol_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params cloudcontrol.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params cloudcontrol_ tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up cloudcontrol endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params cloudcontrol_ return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*cloudcontrol_sdkv2.Options) { - return func(o *cloudcontrol_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*cloudcontrol.Options) { + return func(o *cloudcontrol.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/cloudcontrol/service_endpoints_gen_test.go b/internal/service/cloudcontrol/service_endpoints_gen_test.go index 8f997d3ffd8..709501221b1 100644 --- a/internal/service/cloudcontrol/service_endpoints_gen_test.go +++ b/internal/service/cloudcontrol/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - cloudcontrol_sdkv2 "github.com/aws/aws-sdk-go-v2/service/cloudcontrol" + "github.com/aws/aws-sdk-go-v2/service/cloudcontrol" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -296,10 +296,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := cloudcontrol_sdkv2.NewDefaultEndpointResolverV2() + r := cloudcontrol.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), cloudcontrol_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), cloudcontrol.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -313,11 +313,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := cloudcontrol_sdkv2.NewDefaultEndpointResolverV2() + r := cloudcontrol.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), cloudcontrol_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), cloudcontrol.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -337,8 +337,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListResourceRequests(ctx, &cloudcontrol_sdkv2.ListResourceRequestsInput{}, - func(opts *cloudcontrol_sdkv2.Options) { + _, err := client.ListResourceRequests(ctx, &cloudcontrol.ListResourceRequestsInput{}, + func(opts *cloudcontrol.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/cloudcontrol/service_package_gen.go b/internal/service/cloudcontrol/service_package_gen.go index f6ec831ebf0..fadcc38fe5c 100644 --- a/internal/service/cloudcontrol/service_package_gen.go +++ b/internal/service/cloudcontrol/service_package_gen.go @@ -5,8 +5,8 @@ package cloudcontrol import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - cloudcontrol_sdkv2 "github.com/aws/aws-sdk-go-v2/service/cloudcontrol" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/cloudcontrol" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -47,11 +47,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*cloudcontrol_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*cloudcontrol.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return cloudcontrol_sdkv2.NewFromConfig(cfg, - cloudcontrol_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return cloudcontrol.NewFromConfig(cfg, + cloudcontrol.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/cloudformation/service_endpoint_resolver_gen.go b/internal/service/cloudformation/service_endpoint_resolver_gen.go index 441c8f8b889..dc5167c44bb 100644 --- a/internal/service/cloudformation/service_endpoint_resolver_gen.go +++ b/internal/service/cloudformation/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - cloudformation_sdkv2 "github.com/aws/aws-sdk-go-v2/service/cloudformation" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/cloudformation" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ cloudformation_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ cloudformation.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver cloudformation_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver cloudformation.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: cloudformation_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: cloudformation.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params cloudformation_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params cloudformation.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params cloudformatio tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up cloudformation endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params cloudformatio return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*cloudformation_sdkv2.Options) { - return func(o *cloudformation_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*cloudformation.Options) { + return func(o *cloudformation.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/cloudformation/service_endpoints_gen_test.go b/internal/service/cloudformation/service_endpoints_gen_test.go index 62b2e30a098..f35a0e39a32 100644 --- a/internal/service/cloudformation/service_endpoints_gen_test.go +++ b/internal/service/cloudformation/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - cloudformation_sdkv2 "github.com/aws/aws-sdk-go-v2/service/cloudformation" + "github.com/aws/aws-sdk-go-v2/service/cloudformation" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := cloudformation_sdkv2.NewDefaultEndpointResolverV2() + r := cloudformation.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), cloudformation_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), cloudformation.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := cloudformation_sdkv2.NewDefaultEndpointResolverV2() + r := cloudformation.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), cloudformation_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), cloudformation.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,10 +283,10 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListStackInstances(ctx, &cloudformation_sdkv2.ListStackInstancesInput{ - StackSetName: aws_sdkv2.String("test"), + _, err := client.ListStackInstances(ctx, &cloudformation.ListStackInstancesInput{ + StackSetName: aws.String("test"), }, - func(opts *cloudformation_sdkv2.Options) { + func(opts *cloudformation.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/cloudformation/service_package.go b/internal/service/cloudformation/service_package.go index 08663bb7d2a..58e9a64d276 100644 --- a/internal/service/cloudformation/service_package.go +++ b/internal/service/cloudformation/service_package.go @@ -20,7 +20,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return cloudformation.NewFromConfig(cfg, - cloudformation.WithEndpointResolverV2(newEndpointResolverSDKv2()), + cloudformation.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), func(o *cloudformation.Options) { o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(func(err error) aws.Ternary { diff --git a/internal/service/cloudfront/service_endpoint_resolver_gen.go b/internal/service/cloudfront/service_endpoint_resolver_gen.go index ecb4e95c031..6aecb5c2857 100644 --- a/internal/service/cloudfront/service_endpoint_resolver_gen.go +++ b/internal/service/cloudfront/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - cloudfront_sdkv2 "github.com/aws/aws-sdk-go-v2/service/cloudfront" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/cloudfront" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ cloudfront_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ cloudfront.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver cloudfront_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver cloudfront.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: cloudfront_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: cloudfront.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params cloudfront_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params cloudfront.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params cloudfront_sd tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up cloudfront endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params cloudfront_sd return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*cloudfront_sdkv2.Options) { - return func(o *cloudfront_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*cloudfront.Options) { + return func(o *cloudfront.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/cloudfront/service_endpoints_gen_test.go b/internal/service/cloudfront/service_endpoints_gen_test.go index 4486514f4ef..f7fa1821c77 100644 --- a/internal/service/cloudfront/service_endpoints_gen_test.go +++ b/internal/service/cloudfront/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - cloudfront_sdkv2 "github.com/aws/aws-sdk-go-v2/service/cloudfront" + "github.com/aws/aws-sdk-go-v2/service/cloudfront" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := cloudfront_sdkv2.NewDefaultEndpointResolverV2() + r := cloudfront.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), cloudfront_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), cloudfront.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := cloudfront_sdkv2.NewDefaultEndpointResolverV2() + r := cloudfront.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), cloudfront_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), cloudfront.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListDistributions(ctx, &cloudfront_sdkv2.ListDistributionsInput{}, - func(opts *cloudfront_sdkv2.Options) { + _, err := client.ListDistributions(ctx, &cloudfront.ListDistributionsInput{}, + func(opts *cloudfront.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/cloudfront/service_package_gen.go b/internal/service/cloudfront/service_package_gen.go index 3f8995858ab..52b5f8c7f82 100644 --- a/internal/service/cloudfront/service_package_gen.go +++ b/internal/service/cloudfront/service_package_gen.go @@ -5,8 +5,8 @@ package cloudfront import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - cloudfront_sdkv2 "github.com/aws/aws-sdk-go-v2/service/cloudfront" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/cloudfront" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -167,11 +167,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*cloudfront_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*cloudfront.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return cloudfront_sdkv2.NewFromConfig(cfg, - cloudfront_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return cloudfront.NewFromConfig(cfg, + cloudfront.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/cloudfrontkeyvaluestore/service_endpoint_resolver_gen.go b/internal/service/cloudfrontkeyvaluestore/service_endpoint_resolver_gen.go index 620ffba3694..6081c3ff4f5 100644 --- a/internal/service/cloudfrontkeyvaluestore/service_endpoint_resolver_gen.go +++ b/internal/service/cloudfrontkeyvaluestore/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - cloudfrontkeyvaluestore_sdkv2 "github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ cloudfrontkeyvaluestore_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ cloudfrontkeyvaluestore.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver cloudfrontkeyvaluestore_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver cloudfrontkeyvaluestore.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: cloudfrontkeyvaluestore_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: cloudfrontkeyvaluestore.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params cloudfrontkeyvaluestore_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params cloudfrontkeyvaluestore.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params cloudfrontkey tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up cloudfrontkeyvaluestore endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params cloudfrontkey return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*cloudfrontkeyvaluestore_sdkv2.Options) { - return func(o *cloudfrontkeyvaluestore_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*cloudfrontkeyvaluestore.Options) { + return func(o *cloudfrontkeyvaluestore.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/cloudfrontkeyvaluestore/service_package_gen.go b/internal/service/cloudfrontkeyvaluestore/service_package_gen.go index 3411f7c1329..ae78942fa7a 100644 --- a/internal/service/cloudfrontkeyvaluestore/service_package_gen.go +++ b/internal/service/cloudfrontkeyvaluestore/service_package_gen.go @@ -5,8 +5,8 @@ package cloudfrontkeyvaluestore import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - cloudfrontkeyvaluestore_sdkv2 "github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -40,11 +40,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*cloudfrontkeyvaluestore_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*cloudfrontkeyvaluestore.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return cloudfrontkeyvaluestore_sdkv2.NewFromConfig(cfg, - cloudfrontkeyvaluestore_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return cloudfrontkeyvaluestore.NewFromConfig(cfg, + cloudfrontkeyvaluestore.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/cloudhsmv2/service_endpoint_resolver_gen.go b/internal/service/cloudhsmv2/service_endpoint_resolver_gen.go index da2305dd18d..9e96cdb3d5a 100644 --- a/internal/service/cloudhsmv2/service_endpoint_resolver_gen.go +++ b/internal/service/cloudhsmv2/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - cloudhsmv2_sdkv2 "github.com/aws/aws-sdk-go-v2/service/cloudhsmv2" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/cloudhsmv2" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ cloudhsmv2_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ cloudhsmv2.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver cloudhsmv2_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver cloudhsmv2.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: cloudhsmv2_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: cloudhsmv2.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params cloudhsmv2_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params cloudhsmv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params cloudhsmv2_sd tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up cloudhsmv2 endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params cloudhsmv2_sd return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*cloudhsmv2_sdkv2.Options) { - return func(o *cloudhsmv2_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*cloudhsmv2.Options) { + return func(o *cloudhsmv2.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/cloudhsmv2/service_endpoints_gen_test.go b/internal/service/cloudhsmv2/service_endpoints_gen_test.go index 315c60e64e0..811d32dac27 100644 --- a/internal/service/cloudhsmv2/service_endpoints_gen_test.go +++ b/internal/service/cloudhsmv2/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - cloudhsmv2_sdkv2 "github.com/aws/aws-sdk-go-v2/service/cloudhsmv2" + "github.com/aws/aws-sdk-go-v2/service/cloudhsmv2" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -296,10 +296,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := cloudhsmv2_sdkv2.NewDefaultEndpointResolverV2() + r := cloudhsmv2.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), cloudhsmv2_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), cloudhsmv2.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -313,11 +313,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := cloudhsmv2_sdkv2.NewDefaultEndpointResolverV2() + r := cloudhsmv2.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), cloudhsmv2_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), cloudhsmv2.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -337,8 +337,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.DescribeClusters(ctx, &cloudhsmv2_sdkv2.DescribeClustersInput{}, - func(opts *cloudhsmv2_sdkv2.Options) { + _, err := client.DescribeClusters(ctx, &cloudhsmv2.DescribeClustersInput{}, + func(opts *cloudhsmv2.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/cloudhsmv2/service_package.go b/internal/service/cloudhsmv2/service_package.go index 674210e94d2..b82bb143073 100644 --- a/internal/service/cloudhsmv2/service_package.go +++ b/internal/service/cloudhsmv2/service_package.go @@ -20,7 +20,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return cloudhsmv2.NewFromConfig(cfg, - cloudhsmv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + cloudhsmv2.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), func(o *cloudhsmv2.Options) { o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(func(err error) aws.Ternary { diff --git a/internal/service/cloudsearch/service_endpoint_resolver_gen.go b/internal/service/cloudsearch/service_endpoint_resolver_gen.go index 8231ab82f37..9b46d750eb0 100644 --- a/internal/service/cloudsearch/service_endpoint_resolver_gen.go +++ b/internal/service/cloudsearch/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - cloudsearch_sdkv2 "github.com/aws/aws-sdk-go-v2/service/cloudsearch" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/cloudsearch" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ cloudsearch_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ cloudsearch.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver cloudsearch_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver cloudsearch.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: cloudsearch_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: cloudsearch.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params cloudsearch_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params cloudsearch.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params cloudsearch_s tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up cloudsearch endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params cloudsearch_s return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*cloudsearch_sdkv2.Options) { - return func(o *cloudsearch_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*cloudsearch.Options) { + return func(o *cloudsearch.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/cloudsearch/service_endpoints_gen_test.go b/internal/service/cloudsearch/service_endpoints_gen_test.go index a3d9a745528..d8500ca39d7 100644 --- a/internal/service/cloudsearch/service_endpoints_gen_test.go +++ b/internal/service/cloudsearch/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - cloudsearch_sdkv2 "github.com/aws/aws-sdk-go-v2/service/cloudsearch" + "github.com/aws/aws-sdk-go-v2/service/cloudsearch" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := cloudsearch_sdkv2.NewDefaultEndpointResolverV2() + r := cloudsearch.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), cloudsearch_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), cloudsearch.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := cloudsearch_sdkv2.NewDefaultEndpointResolverV2() + r := cloudsearch.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), cloudsearch_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), cloudsearch.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListDomainNames(ctx, &cloudsearch_sdkv2.ListDomainNamesInput{}, - func(opts *cloudsearch_sdkv2.Options) { + _, err := client.ListDomainNames(ctx, &cloudsearch.ListDomainNamesInput{}, + func(opts *cloudsearch.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/cloudsearch/service_package_gen.go b/internal/service/cloudsearch/service_package_gen.go index 4a2aba2be6e..f931957f0c8 100644 --- a/internal/service/cloudsearch/service_package_gen.go +++ b/internal/service/cloudsearch/service_package_gen.go @@ -5,8 +5,8 @@ package cloudsearch import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - cloudsearch_sdkv2 "github.com/aws/aws-sdk-go-v2/service/cloudsearch" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/cloudsearch" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -46,11 +46,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*cloudsearch_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*cloudsearch.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return cloudsearch_sdkv2.NewFromConfig(cfg, - cloudsearch_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return cloudsearch.NewFromConfig(cfg, + cloudsearch.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/cloudtrail/service_endpoint_resolver_gen.go b/internal/service/cloudtrail/service_endpoint_resolver_gen.go index 4def6ac6f8d..9658d09eb2d 100644 --- a/internal/service/cloudtrail/service_endpoint_resolver_gen.go +++ b/internal/service/cloudtrail/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - cloudtrail_sdkv2 "github.com/aws/aws-sdk-go-v2/service/cloudtrail" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/cloudtrail" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ cloudtrail_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ cloudtrail.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver cloudtrail_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver cloudtrail.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: cloudtrail_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: cloudtrail.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params cloudtrail_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params cloudtrail.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params cloudtrail_sd tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up cloudtrail endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params cloudtrail_sd return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*cloudtrail_sdkv2.Options) { - return func(o *cloudtrail_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*cloudtrail.Options) { + return func(o *cloudtrail.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/cloudtrail/service_endpoints_gen_test.go b/internal/service/cloudtrail/service_endpoints_gen_test.go index e1e26b4495c..2973c41a286 100644 --- a/internal/service/cloudtrail/service_endpoints_gen_test.go +++ b/internal/service/cloudtrail/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - cloudtrail_sdkv2 "github.com/aws/aws-sdk-go-v2/service/cloudtrail" + "github.com/aws/aws-sdk-go-v2/service/cloudtrail" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := cloudtrail_sdkv2.NewDefaultEndpointResolverV2() + r := cloudtrail.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), cloudtrail_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), cloudtrail.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := cloudtrail_sdkv2.NewDefaultEndpointResolverV2() + r := cloudtrail.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), cloudtrail_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), cloudtrail.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListChannels(ctx, &cloudtrail_sdkv2.ListChannelsInput{}, - func(opts *cloudtrail_sdkv2.Options) { + _, err := client.ListChannels(ctx, &cloudtrail.ListChannelsInput{}, + func(opts *cloudtrail.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/cloudtrail/service_package_gen.go b/internal/service/cloudtrail/service_package_gen.go index cf15b49f77a..b8a0d8abbc4 100644 --- a/internal/service/cloudtrail/service_package_gen.go +++ b/internal/service/cloudtrail/service_package_gen.go @@ -5,8 +5,8 @@ package cloudtrail import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - cloudtrail_sdkv2 "github.com/aws/aws-sdk-go-v2/service/cloudtrail" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/cloudtrail" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -63,11 +63,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*cloudtrail_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*cloudtrail.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return cloudtrail_sdkv2.NewFromConfig(cfg, - cloudtrail_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return cloudtrail.NewFromConfig(cfg, + cloudtrail.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/cloudwatch/service_endpoint_resolver_gen.go b/internal/service/cloudwatch/service_endpoint_resolver_gen.go index ef81ebe7107..2430cfac6f3 100644 --- a/internal/service/cloudwatch/service_endpoint_resolver_gen.go +++ b/internal/service/cloudwatch/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - cloudwatch_sdkv2 "github.com/aws/aws-sdk-go-v2/service/cloudwatch" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/cloudwatch" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ cloudwatch_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ cloudwatch.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver cloudwatch_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver cloudwatch.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: cloudwatch_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: cloudwatch.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params cloudwatch_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params cloudwatch.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params cloudwatch_sd tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up cloudwatch endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params cloudwatch_sd return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*cloudwatch_sdkv2.Options) { - return func(o *cloudwatch_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*cloudwatch.Options) { + return func(o *cloudwatch.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/cloudwatch/service_endpoints_gen_test.go b/internal/service/cloudwatch/service_endpoints_gen_test.go index 7beedb48092..c95c2e415b7 100644 --- a/internal/service/cloudwatch/service_endpoints_gen_test.go +++ b/internal/service/cloudwatch/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - cloudwatch_sdkv2 "github.com/aws/aws-sdk-go-v2/service/cloudwatch" + "github.com/aws/aws-sdk-go-v2/service/cloudwatch" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := cloudwatch_sdkv2.NewDefaultEndpointResolverV2() + r := cloudwatch.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), cloudwatch_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), cloudwatch.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := cloudwatch_sdkv2.NewDefaultEndpointResolverV2() + r := cloudwatch.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), cloudwatch_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), cloudwatch.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListDashboards(ctx, &cloudwatch_sdkv2.ListDashboardsInput{}, - func(opts *cloudwatch_sdkv2.Options) { + _, err := client.ListDashboards(ctx, &cloudwatch.ListDashboardsInput{}, + func(opts *cloudwatch.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/cloudwatch/service_package_gen.go b/internal/service/cloudwatch/service_package_gen.go index 9a13c354e3d..173bb0c0094 100644 --- a/internal/service/cloudwatch/service_package_gen.go +++ b/internal/service/cloudwatch/service_package_gen.go @@ -5,8 +5,8 @@ package cloudwatch import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - cloudwatch_sdkv2 "github.com/aws/aws-sdk-go-v2/service/cloudwatch" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/cloudwatch" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -65,11 +65,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*cloudwatch_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*cloudwatch.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return cloudwatch_sdkv2.NewFromConfig(cfg, - cloudwatch_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return cloudwatch.NewFromConfig(cfg, + cloudwatch.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/codeartifact/service_endpoint_resolver_gen.go b/internal/service/codeartifact/service_endpoint_resolver_gen.go index f6d18561c7e..0dbf8a6633e 100644 --- a/internal/service/codeartifact/service_endpoint_resolver_gen.go +++ b/internal/service/codeartifact/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - codeartifact_sdkv2 "github.com/aws/aws-sdk-go-v2/service/codeartifact" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/codeartifact" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ codeartifact_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ codeartifact.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver codeartifact_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver codeartifact.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: codeartifact_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: codeartifact.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params codeartifact_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params codeartifact.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params codeartifact_ tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up codeartifact endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params codeartifact_ return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*codeartifact_sdkv2.Options) { - return func(o *codeartifact_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*codeartifact.Options) { + return func(o *codeartifact.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/codeartifact/service_endpoints_gen_test.go b/internal/service/codeartifact/service_endpoints_gen_test.go index 14260369441..a9f103d38d1 100644 --- a/internal/service/codeartifact/service_endpoints_gen_test.go +++ b/internal/service/codeartifact/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - codeartifact_sdkv2 "github.com/aws/aws-sdk-go-v2/service/codeartifact" + "github.com/aws/aws-sdk-go-v2/service/codeartifact" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := codeartifact_sdkv2.NewDefaultEndpointResolverV2() + r := codeartifact.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), codeartifact_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), codeartifact.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := codeartifact_sdkv2.NewDefaultEndpointResolverV2() + r := codeartifact.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), codeartifact_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), codeartifact.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListDomains(ctx, &codeartifact_sdkv2.ListDomainsInput{}, - func(opts *codeartifact_sdkv2.Options) { + _, err := client.ListDomains(ctx, &codeartifact.ListDomainsInput{}, + func(opts *codeartifact.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/codeartifact/service_package_gen.go b/internal/service/codeartifact/service_package_gen.go index 168cacaca52..48848e0fc95 100644 --- a/internal/service/codeartifact/service_package_gen.go +++ b/internal/service/codeartifact/service_package_gen.go @@ -5,8 +5,8 @@ package codeartifact import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - codeartifact_sdkv2 "github.com/aws/aws-sdk-go-v2/service/codeartifact" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/codeartifact" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -73,11 +73,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*codeartifact_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*codeartifact.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return codeartifact_sdkv2.NewFromConfig(cfg, - codeartifact_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return codeartifact.NewFromConfig(cfg, + codeartifact.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/codebuild/service_endpoint_resolver_gen.go b/internal/service/codebuild/service_endpoint_resolver_gen.go index 3e7182c0523..6d53d631f81 100644 --- a/internal/service/codebuild/service_endpoint_resolver_gen.go +++ b/internal/service/codebuild/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - codebuild_sdkv2 "github.com/aws/aws-sdk-go-v2/service/codebuild" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/codebuild" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ codebuild_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ codebuild.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver codebuild_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver codebuild.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: codebuild_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: codebuild.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params codebuild_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params codebuild.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params codebuild_sdk tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up codebuild endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params codebuild_sdk return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*codebuild_sdkv2.Options) { - return func(o *codebuild_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*codebuild.Options) { + return func(o *codebuild.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/codebuild/service_endpoints_gen_test.go b/internal/service/codebuild/service_endpoints_gen_test.go index 4870e21550b..177bbeaf0dc 100644 --- a/internal/service/codebuild/service_endpoints_gen_test.go +++ b/internal/service/codebuild/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - codebuild_sdkv2 "github.com/aws/aws-sdk-go-v2/service/codebuild" + "github.com/aws/aws-sdk-go-v2/service/codebuild" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := codebuild_sdkv2.NewDefaultEndpointResolverV2() + r := codebuild.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), codebuild_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), codebuild.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := codebuild_sdkv2.NewDefaultEndpointResolverV2() + r := codebuild.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), codebuild_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), codebuild.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListBuildBatches(ctx, &codebuild_sdkv2.ListBuildBatchesInput{}, - func(opts *codebuild_sdkv2.Options) { + _, err := client.ListBuildBatches(ctx, &codebuild.ListBuildBatchesInput{}, + func(opts *codebuild.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/codebuild/service_package_gen.go b/internal/service/codebuild/service_package_gen.go index ee483570cdb..1790cbf446e 100644 --- a/internal/service/codebuild/service_package_gen.go +++ b/internal/service/codebuild/service_package_gen.go @@ -5,8 +5,8 @@ package codebuild import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - codebuild_sdkv2 "github.com/aws/aws-sdk-go-v2/service/codebuild" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/codebuild" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -77,11 +77,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*codebuild_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*codebuild.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return codebuild_sdkv2.NewFromConfig(cfg, - codebuild_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return codebuild.NewFromConfig(cfg, + codebuild.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/codecatalyst/service_endpoint_resolver_gen.go b/internal/service/codecatalyst/service_endpoint_resolver_gen.go index 43b6ef1eae4..b872e775e92 100644 --- a/internal/service/codecatalyst/service_endpoint_resolver_gen.go +++ b/internal/service/codecatalyst/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - codecatalyst_sdkv2 "github.com/aws/aws-sdk-go-v2/service/codecatalyst" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/codecatalyst" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ codecatalyst_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ codecatalyst.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver codecatalyst_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver codecatalyst.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: codecatalyst_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: codecatalyst.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params codecatalyst_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params codecatalyst.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params codecatalyst_ tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up codecatalyst endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params codecatalyst_ return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*codecatalyst_sdkv2.Options) { - return func(o *codecatalyst_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*codecatalyst.Options) { + return func(o *codecatalyst.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/codecatalyst/service_package_gen.go b/internal/service/codecatalyst/service_package_gen.go index 255fb7a8bc2..ba9e30a0f22 100644 --- a/internal/service/codecatalyst/service_package_gen.go +++ b/internal/service/codecatalyst/service_package_gen.go @@ -5,8 +5,8 @@ package codecatalyst import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - codecatalyst_sdkv2 "github.com/aws/aws-sdk-go-v2/service/codecatalyst" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/codecatalyst" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -57,11 +57,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*codecatalyst_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*codecatalyst.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return codecatalyst_sdkv2.NewFromConfig(cfg, - codecatalyst_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return codecatalyst.NewFromConfig(cfg, + codecatalyst.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/codecommit/service_endpoint_resolver_gen.go b/internal/service/codecommit/service_endpoint_resolver_gen.go index afb73a1e822..cebee387ec6 100644 --- a/internal/service/codecommit/service_endpoint_resolver_gen.go +++ b/internal/service/codecommit/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - codecommit_sdkv2 "github.com/aws/aws-sdk-go-v2/service/codecommit" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/codecommit" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ codecommit_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ codecommit.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver codecommit_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver codecommit.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: codecommit_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: codecommit.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params codecommit_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params codecommit.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params codecommit_sd tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up codecommit endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params codecommit_sd return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*codecommit_sdkv2.Options) { - return func(o *codecommit_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*codecommit.Options) { + return func(o *codecommit.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/codecommit/service_endpoints_gen_test.go b/internal/service/codecommit/service_endpoints_gen_test.go index beace358730..247aa61c725 100644 --- a/internal/service/codecommit/service_endpoints_gen_test.go +++ b/internal/service/codecommit/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - codecommit_sdkv2 "github.com/aws/aws-sdk-go-v2/service/codecommit" + "github.com/aws/aws-sdk-go-v2/service/codecommit" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := codecommit_sdkv2.NewDefaultEndpointResolverV2() + r := codecommit.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), codecommit_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), codecommit.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := codecommit_sdkv2.NewDefaultEndpointResolverV2() + r := codecommit.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), codecommit_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), codecommit.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListRepositories(ctx, &codecommit_sdkv2.ListRepositoriesInput{}, - func(opts *codecommit_sdkv2.Options) { + _, err := client.ListRepositories(ctx, &codecommit.ListRepositoriesInput{}, + func(opts *codecommit.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/codecommit/service_package_gen.go b/internal/service/codecommit/service_package_gen.go index 9a6c2d5f8de..3c4754bf18e 100644 --- a/internal/service/codecommit/service_package_gen.go +++ b/internal/service/codecommit/service_package_gen.go @@ -5,8 +5,8 @@ package codecommit import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - codecommit_sdkv2 "github.com/aws/aws-sdk-go-v2/service/codecommit" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/codecommit" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -70,11 +70,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*codecommit_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*codecommit.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return codecommit_sdkv2.NewFromConfig(cfg, - codecommit_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return codecommit.NewFromConfig(cfg, + codecommit.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/codeconnections/service_endpoint_resolver_gen.go b/internal/service/codeconnections/service_endpoint_resolver_gen.go index 1ad355f1109..9ee7a27a43a 100644 --- a/internal/service/codeconnections/service_endpoint_resolver_gen.go +++ b/internal/service/codeconnections/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - codeconnections_sdkv2 "github.com/aws/aws-sdk-go-v2/service/codeconnections" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/codeconnections" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ codeconnections_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ codeconnections.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver codeconnections_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver codeconnections.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: codeconnections_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: codeconnections.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params codeconnections_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params codeconnections.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params codeconnectio tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up codeconnections endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params codeconnectio return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*codeconnections_sdkv2.Options) { - return func(o *codeconnections_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*codeconnections.Options) { + return func(o *codeconnections.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/codeconnections/service_endpoints_gen_test.go b/internal/service/codeconnections/service_endpoints_gen_test.go index 6401d7d1878..297fa202382 100644 --- a/internal/service/codeconnections/service_endpoints_gen_test.go +++ b/internal/service/codeconnections/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - codeconnections_sdkv2 "github.com/aws/aws-sdk-go-v2/service/codeconnections" + "github.com/aws/aws-sdk-go-v2/service/codeconnections" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := codeconnections_sdkv2.NewDefaultEndpointResolverV2() + r := codeconnections.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), codeconnections_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), codeconnections.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := codeconnections_sdkv2.NewDefaultEndpointResolverV2() + r := codeconnections.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), codeconnections_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), codeconnections.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListConnections(ctx, &codeconnections_sdkv2.ListConnectionsInput{}, - func(opts *codeconnections_sdkv2.Options) { + _, err := client.ListConnections(ctx, &codeconnections.ListConnectionsInput{}, + func(opts *codeconnections.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/codeconnections/service_package_gen.go b/internal/service/codeconnections/service_package_gen.go index 611dbef1be6..7cfb8922be4 100644 --- a/internal/service/codeconnections/service_package_gen.go +++ b/internal/service/codeconnections/service_package_gen.go @@ -5,8 +5,8 @@ package codeconnections import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - codeconnections_sdkv2 "github.com/aws/aws-sdk-go-v2/service/codeconnections" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/codeconnections" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -35,11 +35,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*codeconnections_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*codeconnections.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return codeconnections_sdkv2.NewFromConfig(cfg, - codeconnections_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return codeconnections.NewFromConfig(cfg, + codeconnections.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/codeguruprofiler/service_endpoint_resolver_gen.go b/internal/service/codeguruprofiler/service_endpoint_resolver_gen.go index 5de7eba5e10..6f115a1df58 100644 --- a/internal/service/codeguruprofiler/service_endpoint_resolver_gen.go +++ b/internal/service/codeguruprofiler/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - codeguruprofiler_sdkv2 "github.com/aws/aws-sdk-go-v2/service/codeguruprofiler" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/codeguruprofiler" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ codeguruprofiler_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ codeguruprofiler.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver codeguruprofiler_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver codeguruprofiler.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: codeguruprofiler_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: codeguruprofiler.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params codeguruprofiler_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params codeguruprofiler.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params codeguruprofi tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up codeguruprofiler endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params codeguruprofi return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*codeguruprofiler_sdkv2.Options) { - return func(o *codeguruprofiler_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*codeguruprofiler.Options) { + return func(o *codeguruprofiler.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/codeguruprofiler/service_endpoints_gen_test.go b/internal/service/codeguruprofiler/service_endpoints_gen_test.go index 921b1c71b18..8d997899d37 100644 --- a/internal/service/codeguruprofiler/service_endpoints_gen_test.go +++ b/internal/service/codeguruprofiler/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - codeguruprofiler_sdkv2 "github.com/aws/aws-sdk-go-v2/service/codeguruprofiler" + "github.com/aws/aws-sdk-go-v2/service/codeguruprofiler" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := codeguruprofiler_sdkv2.NewDefaultEndpointResolverV2() + r := codeguruprofiler.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), codeguruprofiler_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), codeguruprofiler.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := codeguruprofiler_sdkv2.NewDefaultEndpointResolverV2() + r := codeguruprofiler.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), codeguruprofiler_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), codeguruprofiler.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListProfilingGroups(ctx, &codeguruprofiler_sdkv2.ListProfilingGroupsInput{}, - func(opts *codeguruprofiler_sdkv2.Options) { + _, err := client.ListProfilingGroups(ctx, &codeguruprofiler.ListProfilingGroupsInput{}, + func(opts *codeguruprofiler.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/codeguruprofiler/service_package_gen.go b/internal/service/codeguruprofiler/service_package_gen.go index 636daad2c35..6d4493fb63b 100644 --- a/internal/service/codeguruprofiler/service_package_gen.go +++ b/internal/service/codeguruprofiler/service_package_gen.go @@ -5,8 +5,8 @@ package codeguruprofiler import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - codeguruprofiler_sdkv2 "github.com/aws/aws-sdk-go-v2/service/codeguruprofiler" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/codeguruprofiler" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -48,11 +48,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*codeguruprofiler_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*codeguruprofiler.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return codeguruprofiler_sdkv2.NewFromConfig(cfg, - codeguruprofiler_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return codeguruprofiler.NewFromConfig(cfg, + codeguruprofiler.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/codegurureviewer/service_endpoint_resolver_gen.go b/internal/service/codegurureviewer/service_endpoint_resolver_gen.go index 6ca17a9a960..0d7e0ab38a2 100644 --- a/internal/service/codegurureviewer/service_endpoint_resolver_gen.go +++ b/internal/service/codegurureviewer/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - codegurureviewer_sdkv2 "github.com/aws/aws-sdk-go-v2/service/codegurureviewer" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/codegurureviewer" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ codegurureviewer_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ codegurureviewer.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver codegurureviewer_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver codegurureviewer.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: codegurureviewer_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: codegurureviewer.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params codegurureviewer_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params codegurureviewer.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params codegururevie tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up codegurureviewer endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params codegururevie return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*codegurureviewer_sdkv2.Options) { - return func(o *codegurureviewer_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*codegurureviewer.Options) { + return func(o *codegurureviewer.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/codegurureviewer/service_endpoints_gen_test.go b/internal/service/codegurureviewer/service_endpoints_gen_test.go index 2b558f1bfc0..f50f0bbc096 100644 --- a/internal/service/codegurureviewer/service_endpoints_gen_test.go +++ b/internal/service/codegurureviewer/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - codegurureviewer_sdkv2 "github.com/aws/aws-sdk-go-v2/service/codegurureviewer" + "github.com/aws/aws-sdk-go-v2/service/codegurureviewer" awstypes "github.com/aws/aws-sdk-go-v2/service/codegurureviewer/types" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" @@ -243,10 +243,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := codegurureviewer_sdkv2.NewDefaultEndpointResolverV2() + r := codegurureviewer.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), codegurureviewer_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), codegurureviewer.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -260,11 +260,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := codegurureviewer_sdkv2.NewDefaultEndpointResolverV2() + r := codegurureviewer.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), codegurureviewer_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), codegurureviewer.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -284,10 +284,10 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListCodeReviews(ctx, &codegurureviewer_sdkv2.ListCodeReviewsInput{ + _, err := client.ListCodeReviews(ctx, &codegurureviewer.ListCodeReviewsInput{ Type: awstypes.TypePullRequest, }, - func(opts *codegurureviewer_sdkv2.Options) { + func(opts *codegurureviewer.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/codegurureviewer/service_package_gen.go b/internal/service/codegurureviewer/service_package_gen.go index 711ad2f4cfc..ba93b2250be 100644 --- a/internal/service/codegurureviewer/service_package_gen.go +++ b/internal/service/codegurureviewer/service_package_gen.go @@ -5,8 +5,8 @@ package codegurureviewer import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - codegurureviewer_sdkv2 "github.com/aws/aws-sdk-go-v2/service/codegurureviewer" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/codegurureviewer" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -44,11 +44,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*codegurureviewer_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*codegurureviewer.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return codegurureviewer_sdkv2.NewFromConfig(cfg, - codegurureviewer_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return codegurureviewer.NewFromConfig(cfg, + codegurureviewer.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/codepipeline/service_endpoint_resolver_gen.go b/internal/service/codepipeline/service_endpoint_resolver_gen.go index b1ee40353db..c0b3834345d 100644 --- a/internal/service/codepipeline/service_endpoint_resolver_gen.go +++ b/internal/service/codepipeline/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - codepipeline_sdkv2 "github.com/aws/aws-sdk-go-v2/service/codepipeline" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/codepipeline" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ codepipeline_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ codepipeline.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver codepipeline_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver codepipeline.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: codepipeline_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: codepipeline.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params codepipeline_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params codepipeline.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params codepipeline_ tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up codepipeline endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params codepipeline_ return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*codepipeline_sdkv2.Options) { - return func(o *codepipeline_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*codepipeline.Options) { + return func(o *codepipeline.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/codepipeline/service_endpoints_gen_test.go b/internal/service/codepipeline/service_endpoints_gen_test.go index 677a277b3c8..a8fdaf433c5 100644 --- a/internal/service/codepipeline/service_endpoints_gen_test.go +++ b/internal/service/codepipeline/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - codepipeline_sdkv2 "github.com/aws/aws-sdk-go-v2/service/codepipeline" + "github.com/aws/aws-sdk-go-v2/service/codepipeline" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := codepipeline_sdkv2.NewDefaultEndpointResolverV2() + r := codepipeline.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), codepipeline_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), codepipeline.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := codepipeline_sdkv2.NewDefaultEndpointResolverV2() + r := codepipeline.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), codepipeline_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), codepipeline.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListPipelines(ctx, &codepipeline_sdkv2.ListPipelinesInput{}, - func(opts *codepipeline_sdkv2.Options) { + _, err := client.ListPipelines(ctx, &codepipeline.ListPipelinesInput{}, + func(opts *codepipeline.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/codepipeline/service_package_gen.go b/internal/service/codepipeline/service_package_gen.go index 6689d01acf1..d91a2fcb9ff 100644 --- a/internal/service/codepipeline/service_package_gen.go +++ b/internal/service/codepipeline/service_package_gen.go @@ -5,8 +5,8 @@ package codepipeline import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - codepipeline_sdkv2 "github.com/aws/aws-sdk-go-v2/service/codepipeline" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/codepipeline" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -60,11 +60,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*codepipeline_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*codepipeline.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return codepipeline_sdkv2.NewFromConfig(cfg, - codepipeline_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return codepipeline.NewFromConfig(cfg, + codepipeline.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/codestarconnections/service_endpoint_resolver_gen.go b/internal/service/codestarconnections/service_endpoint_resolver_gen.go index ca67d0e38c4..0309b4aabb7 100644 --- a/internal/service/codestarconnections/service_endpoint_resolver_gen.go +++ b/internal/service/codestarconnections/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - codestarconnections_sdkv2 "github.com/aws/aws-sdk-go-v2/service/codestarconnections" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/codestarconnections" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ codestarconnections_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ codestarconnections.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver codestarconnections_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver codestarconnections.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: codestarconnections_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: codestarconnections.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params codestarconnections_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params codestarconnections.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params codestarconne tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up codestarconnections endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params codestarconne return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*codestarconnections_sdkv2.Options) { - return func(o *codestarconnections_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*codestarconnections.Options) { + return func(o *codestarconnections.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/codestarconnections/service_endpoints_gen_test.go b/internal/service/codestarconnections/service_endpoints_gen_test.go index 68559d53137..028ed58394a 100644 --- a/internal/service/codestarconnections/service_endpoints_gen_test.go +++ b/internal/service/codestarconnections/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - codestarconnections_sdkv2 "github.com/aws/aws-sdk-go-v2/service/codestarconnections" + "github.com/aws/aws-sdk-go-v2/service/codestarconnections" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := codestarconnections_sdkv2.NewDefaultEndpointResolverV2() + r := codestarconnections.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), codestarconnections_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), codestarconnections.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := codestarconnections_sdkv2.NewDefaultEndpointResolverV2() + r := codestarconnections.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), codestarconnections_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), codestarconnections.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListConnections(ctx, &codestarconnections_sdkv2.ListConnectionsInput{}, - func(opts *codestarconnections_sdkv2.Options) { + _, err := client.ListConnections(ctx, &codestarconnections.ListConnectionsInput{}, + func(opts *codestarconnections.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/codestarconnections/service_package_gen.go b/internal/service/codestarconnections/service_package_gen.go index d61c0f7a43a..3a34df3d751 100644 --- a/internal/service/codestarconnections/service_package_gen.go +++ b/internal/service/codestarconnections/service_package_gen.go @@ -5,8 +5,8 @@ package codestarconnections import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - codestarconnections_sdkv2 "github.com/aws/aws-sdk-go-v2/service/codestarconnections" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/codestarconnections" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -54,11 +54,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*codestarconnections_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*codestarconnections.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return codestarconnections_sdkv2.NewFromConfig(cfg, - codestarconnections_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return codestarconnections.NewFromConfig(cfg, + codestarconnections.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/codestarnotifications/service_endpoint_resolver_gen.go b/internal/service/codestarnotifications/service_endpoint_resolver_gen.go index c9c8379b45f..61b664d9643 100644 --- a/internal/service/codestarnotifications/service_endpoint_resolver_gen.go +++ b/internal/service/codestarnotifications/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - codestarnotifications_sdkv2 "github.com/aws/aws-sdk-go-v2/service/codestarnotifications" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/codestarnotifications" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ codestarnotifications_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ codestarnotifications.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver codestarnotifications_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver codestarnotifications.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: codestarnotifications_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: codestarnotifications.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params codestarnotifications_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params codestarnotifications.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params codestarnotif tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up codestarnotifications endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params codestarnotif return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*codestarnotifications_sdkv2.Options) { - return func(o *codestarnotifications_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*codestarnotifications.Options) { + return func(o *codestarnotifications.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/codestarnotifications/service_endpoints_gen_test.go b/internal/service/codestarnotifications/service_endpoints_gen_test.go index bf6543d1f34..e43aa97538f 100644 --- a/internal/service/codestarnotifications/service_endpoints_gen_test.go +++ b/internal/service/codestarnotifications/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - codestarnotifications_sdkv2 "github.com/aws/aws-sdk-go-v2/service/codestarnotifications" + "github.com/aws/aws-sdk-go-v2/service/codestarnotifications" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := codestarnotifications_sdkv2.NewDefaultEndpointResolverV2() + r := codestarnotifications.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), codestarnotifications_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), codestarnotifications.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := codestarnotifications_sdkv2.NewDefaultEndpointResolverV2() + r := codestarnotifications.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), codestarnotifications_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), codestarnotifications.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListTargets(ctx, &codestarnotifications_sdkv2.ListTargetsInput{}, - func(opts *codestarnotifications_sdkv2.Options) { + _, err := client.ListTargets(ctx, &codestarnotifications.ListTargetsInput{}, + func(opts *codestarnotifications.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/codestarnotifications/service_package_gen.go b/internal/service/codestarnotifications/service_package_gen.go index a63e77cce9a..ed806b6e031 100644 --- a/internal/service/codestarnotifications/service_package_gen.go +++ b/internal/service/codestarnotifications/service_package_gen.go @@ -5,8 +5,8 @@ package codestarnotifications import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - codestarnotifications_sdkv2 "github.com/aws/aws-sdk-go-v2/service/codestarnotifications" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/codestarnotifications" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -44,11 +44,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*codestarnotifications_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*codestarnotifications.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return codestarnotifications_sdkv2.NewFromConfig(cfg, - codestarnotifications_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return codestarnotifications.NewFromConfig(cfg, + codestarnotifications.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/cognitoidentity/service_endpoint_resolver_gen.go b/internal/service/cognitoidentity/service_endpoint_resolver_gen.go index 6b24b637ac8..c14463b14c5 100644 --- a/internal/service/cognitoidentity/service_endpoint_resolver_gen.go +++ b/internal/service/cognitoidentity/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - cognitoidentity_sdkv2 "github.com/aws/aws-sdk-go-v2/service/cognitoidentity" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/cognitoidentity" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ cognitoidentity_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ cognitoidentity.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver cognitoidentity_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver cognitoidentity.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: cognitoidentity_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: cognitoidentity.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params cognitoidentity_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params cognitoidentity.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params cognitoidenti tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up cognitoidentity endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params cognitoidenti return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*cognitoidentity_sdkv2.Options) { - return func(o *cognitoidentity_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*cognitoidentity.Options) { + return func(o *cognitoidentity.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/cognitoidentity/service_endpoints_gen_test.go b/internal/service/cognitoidentity/service_endpoints_gen_test.go index d591f7f93c4..c19bb621a26 100644 --- a/internal/service/cognitoidentity/service_endpoints_gen_test.go +++ b/internal/service/cognitoidentity/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - cognitoidentity_sdkv2 "github.com/aws/aws-sdk-go-v2/service/cognitoidentity" + "github.com/aws/aws-sdk-go-v2/service/cognitoidentity" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := cognitoidentity_sdkv2.NewDefaultEndpointResolverV2() + r := cognitoidentity.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), cognitoidentity_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), cognitoidentity.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := cognitoidentity_sdkv2.NewDefaultEndpointResolverV2() + r := cognitoidentity.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), cognitoidentity_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), cognitoidentity.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,10 +283,10 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListIdentityPools(ctx, &cognitoidentity_sdkv2.ListIdentityPoolsInput{ - MaxResults: aws_sdkv2.Int32(1), + _, err := client.ListIdentityPools(ctx, &cognitoidentity.ListIdentityPoolsInput{ + MaxResults: aws.Int32(1), }, - func(opts *cognitoidentity_sdkv2.Options) { + func(opts *cognitoidentity.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/cognitoidentity/service_package_gen.go b/internal/service/cognitoidentity/service_package_gen.go index 75fe8908a20..48c7e372e0a 100644 --- a/internal/service/cognitoidentity/service_package_gen.go +++ b/internal/service/cognitoidentity/service_package_gen.go @@ -5,8 +5,8 @@ package cognitoidentity import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - cognitoidentity_sdkv2 "github.com/aws/aws-sdk-go-v2/service/cognitoidentity" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/cognitoidentity" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -63,11 +63,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*cognitoidentity_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*cognitoidentity.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return cognitoidentity_sdkv2.NewFromConfig(cfg, - cognitoidentity_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return cognitoidentity.NewFromConfig(cfg, + cognitoidentity.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/cognitoidp/service_endpoint_resolver_gen.go b/internal/service/cognitoidp/service_endpoint_resolver_gen.go index 647eeb7dad3..703a68b75e7 100644 --- a/internal/service/cognitoidp/service_endpoint_resolver_gen.go +++ b/internal/service/cognitoidp/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - cognitoidentityprovider_sdkv2 "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ cognitoidentityprovider_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ cognitoidentityprovider.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver cognitoidentityprovider_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver cognitoidentityprovider.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: cognitoidentityprovider_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: cognitoidentityprovider.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params cognitoidentityprovider_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params cognitoidentityprovider.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params cognitoidenti tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up cognitoidentityprovider endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params cognitoidenti return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*cognitoidentityprovider_sdkv2.Options) { - return func(o *cognitoidentityprovider_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*cognitoidentityprovider.Options) { + return func(o *cognitoidentityprovider.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/cognitoidp/service_endpoints_gen_test.go b/internal/service/cognitoidp/service_endpoints_gen_test.go index ececd9786a9..389dbed44f0 100644 --- a/internal/service/cognitoidp/service_endpoints_gen_test.go +++ b/internal/service/cognitoidp/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - cognitoidentityprovider_sdkv2 "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider" + "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -296,10 +296,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := cognitoidentityprovider_sdkv2.NewDefaultEndpointResolverV2() + r := cognitoidentityprovider.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), cognitoidentityprovider_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), cognitoidentityprovider.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -313,11 +313,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := cognitoidentityprovider_sdkv2.NewDefaultEndpointResolverV2() + r := cognitoidentityprovider.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), cognitoidentityprovider_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), cognitoidentityprovider.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -337,10 +337,10 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListUserPools(ctx, &cognitoidentityprovider_sdkv2.ListUserPoolsInput{ - MaxResults: aws_sdkv2.Int32(1), + _, err := client.ListUserPools(ctx, &cognitoidentityprovider.ListUserPoolsInput{ + MaxResults: aws.Int32(1), }, - func(opts *cognitoidentityprovider_sdkv2.Options) { + func(opts *cognitoidentityprovider.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/cognitoidp/service_package_gen.go b/internal/service/cognitoidp/service_package_gen.go index 7eee60355d9..e3b426218a6 100644 --- a/internal/service/cognitoidp/service_package_gen.go +++ b/internal/service/cognitoidp/service_package_gen.go @@ -5,8 +5,8 @@ package cognitoidp import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - cognitoidentityprovider_sdkv2 "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -127,11 +127,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*cognitoidentityprovider_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*cognitoidentityprovider.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return cognitoidentityprovider_sdkv2.NewFromConfig(cfg, - cognitoidentityprovider_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return cognitoidentityprovider.NewFromConfig(cfg, + cognitoidentityprovider.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/comprehend/service_endpoint_resolver_gen.go b/internal/service/comprehend/service_endpoint_resolver_gen.go index 1d65e617e95..b0affcf9206 100644 --- a/internal/service/comprehend/service_endpoint_resolver_gen.go +++ b/internal/service/comprehend/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - comprehend_sdkv2 "github.com/aws/aws-sdk-go-v2/service/comprehend" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/comprehend" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ comprehend_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ comprehend.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver comprehend_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver comprehend.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: comprehend_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: comprehend.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params comprehend_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params comprehend.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params comprehend_sd tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up comprehend endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params comprehend_sd return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*comprehend_sdkv2.Options) { - return func(o *comprehend_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*comprehend.Options) { + return func(o *comprehend.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/comprehend/service_endpoints_gen_test.go b/internal/service/comprehend/service_endpoints_gen_test.go index 6ece418ebda..d46c3591c97 100644 --- a/internal/service/comprehend/service_endpoints_gen_test.go +++ b/internal/service/comprehend/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - comprehend_sdkv2 "github.com/aws/aws-sdk-go-v2/service/comprehend" + "github.com/aws/aws-sdk-go-v2/service/comprehend" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := comprehend_sdkv2.NewDefaultEndpointResolverV2() + r := comprehend.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), comprehend_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), comprehend.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := comprehend_sdkv2.NewDefaultEndpointResolverV2() + r := comprehend.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), comprehend_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), comprehend.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListDocumentClassifiers(ctx, &comprehend_sdkv2.ListDocumentClassifiersInput{}, - func(opts *comprehend_sdkv2.Options) { + _, err := client.ListDocumentClassifiers(ctx, &comprehend.ListDocumentClassifiersInput{}, + func(opts *comprehend.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/comprehend/service_package_gen.go b/internal/service/comprehend/service_package_gen.go index d2d1a692b49..dbb9a801246 100644 --- a/internal/service/comprehend/service_package_gen.go +++ b/internal/service/comprehend/service_package_gen.go @@ -5,8 +5,8 @@ package comprehend import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - comprehend_sdkv2 "github.com/aws/aws-sdk-go-v2/service/comprehend" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/comprehend" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -52,11 +52,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*comprehend_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*comprehend.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return comprehend_sdkv2.NewFromConfig(cfg, - comprehend_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return comprehend.NewFromConfig(cfg, + comprehend.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/computeoptimizer/service_endpoint_resolver_gen.go b/internal/service/computeoptimizer/service_endpoint_resolver_gen.go index ae76d51e24d..973c7333a38 100644 --- a/internal/service/computeoptimizer/service_endpoint_resolver_gen.go +++ b/internal/service/computeoptimizer/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - computeoptimizer_sdkv2 "github.com/aws/aws-sdk-go-v2/service/computeoptimizer" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/computeoptimizer" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ computeoptimizer_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ computeoptimizer.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver computeoptimizer_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver computeoptimizer.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: computeoptimizer_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: computeoptimizer.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params computeoptimizer_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params computeoptimizer.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params computeoptimi tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up computeoptimizer endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params computeoptimi return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*computeoptimizer_sdkv2.Options) { - return func(o *computeoptimizer_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*computeoptimizer.Options) { + return func(o *computeoptimizer.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/computeoptimizer/service_endpoints_gen_test.go b/internal/service/computeoptimizer/service_endpoints_gen_test.go index df5e6e5e0ce..063816f5658 100644 --- a/internal/service/computeoptimizer/service_endpoints_gen_test.go +++ b/internal/service/computeoptimizer/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - computeoptimizer_sdkv2 "github.com/aws/aws-sdk-go-v2/service/computeoptimizer" + "github.com/aws/aws-sdk-go-v2/service/computeoptimizer" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := computeoptimizer_sdkv2.NewDefaultEndpointResolverV2() + r := computeoptimizer.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), computeoptimizer_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), computeoptimizer.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := computeoptimizer_sdkv2.NewDefaultEndpointResolverV2() + r := computeoptimizer.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), computeoptimizer_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), computeoptimizer.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.GetEnrollmentStatus(ctx, &computeoptimizer_sdkv2.GetEnrollmentStatusInput{}, - func(opts *computeoptimizer_sdkv2.Options) { + _, err := client.GetEnrollmentStatus(ctx, &computeoptimizer.GetEnrollmentStatusInput{}, + func(opts *computeoptimizer.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/computeoptimizer/service_package_gen.go b/internal/service/computeoptimizer/service_package_gen.go index 3f7ba40be62..594947f7085 100644 --- a/internal/service/computeoptimizer/service_package_gen.go +++ b/internal/service/computeoptimizer/service_package_gen.go @@ -5,8 +5,8 @@ package computeoptimizer import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - computeoptimizer_sdkv2 "github.com/aws/aws-sdk-go-v2/service/computeoptimizer" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/computeoptimizer" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -44,11 +44,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*computeoptimizer_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*computeoptimizer.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return computeoptimizer_sdkv2.NewFromConfig(cfg, - computeoptimizer_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return computeoptimizer.NewFromConfig(cfg, + computeoptimizer.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/configservice/service_endpoint_resolver_gen.go b/internal/service/configservice/service_endpoint_resolver_gen.go index b4c40a3b13c..e01df606078 100644 --- a/internal/service/configservice/service_endpoint_resolver_gen.go +++ b/internal/service/configservice/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - configservice_sdkv2 "github.com/aws/aws-sdk-go-v2/service/configservice" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/configservice" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ configservice_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ configservice.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver configservice_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver configservice.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: configservice_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: configservice.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params configservice_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params configservice.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params configservice tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up configservice endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params configservice return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*configservice_sdkv2.Options) { - return func(o *configservice_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*configservice.Options) { + return func(o *configservice.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/configservice/service_endpoints_gen_test.go b/internal/service/configservice/service_endpoints_gen_test.go index b0bf970be78..a6980b8ed2f 100644 --- a/internal/service/configservice/service_endpoints_gen_test.go +++ b/internal/service/configservice/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - configservice_sdkv2 "github.com/aws/aws-sdk-go-v2/service/configservice" + "github.com/aws/aws-sdk-go-v2/service/configservice" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -296,10 +296,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := configservice_sdkv2.NewDefaultEndpointResolverV2() + r := configservice.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), configservice_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), configservice.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -313,11 +313,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := configservice_sdkv2.NewDefaultEndpointResolverV2() + r := configservice.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), configservice_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), configservice.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -337,8 +337,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListStoredQueries(ctx, &configservice_sdkv2.ListStoredQueriesInput{}, - func(opts *configservice_sdkv2.Options) { + _, err := client.ListStoredQueries(ctx, &configservice.ListStoredQueriesInput{}, + func(opts *configservice.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/configservice/service_package_gen.go b/internal/service/configservice/service_package_gen.go index fab6d043788..e132f46aeaa 100644 --- a/internal/service/configservice/service_package_gen.go +++ b/internal/service/configservice/service_package_gen.go @@ -5,8 +5,8 @@ package configservice import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - configservice_sdkv2 "github.com/aws/aws-sdk-go-v2/service/configservice" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/configservice" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -110,11 +110,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*configservice_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*configservice.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return configservice_sdkv2.NewFromConfig(cfg, - configservice_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return configservice.NewFromConfig(cfg, + configservice.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/connect/service_endpoint_resolver_gen.go b/internal/service/connect/service_endpoint_resolver_gen.go index 5da76c236b0..b4680b90f28 100644 --- a/internal/service/connect/service_endpoint_resolver_gen.go +++ b/internal/service/connect/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - connect_sdkv2 "github.com/aws/aws-sdk-go-v2/service/connect" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/connect" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ connect_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ connect.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver connect_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver connect.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: connect_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: connect.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params connect_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params connect.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params connect_sdkv2 tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up connect endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params connect_sdkv2 return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*connect_sdkv2.Options) { - return func(o *connect_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*connect.Options) { + return func(o *connect.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/connect/service_endpoints_gen_test.go b/internal/service/connect/service_endpoints_gen_test.go index d23b3d5de07..9481815b647 100644 --- a/internal/service/connect/service_endpoints_gen_test.go +++ b/internal/service/connect/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - connect_sdkv2 "github.com/aws/aws-sdk-go-v2/service/connect" + "github.com/aws/aws-sdk-go-v2/service/connect" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := connect_sdkv2.NewDefaultEndpointResolverV2() + r := connect.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), connect_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), connect.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := connect_sdkv2.NewDefaultEndpointResolverV2() + r := connect.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), connect_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), connect.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListInstances(ctx, &connect_sdkv2.ListInstancesInput{}, - func(opts *connect_sdkv2.Options) { + _, err := client.ListInstances(ctx, &connect.ListInstancesInput{}, + func(opts *connect.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/connect/service_package_gen.go b/internal/service/connect/service_package_gen.go index 78b67079c91..edfd18e3280 100644 --- a/internal/service/connect/service_package_gen.go +++ b/internal/service/connect/service_package_gen.go @@ -5,8 +5,8 @@ package connect import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - connect_sdkv2 "github.com/aws/aws-sdk-go-v2/service/connect" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/connect" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -243,11 +243,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*connect_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*connect.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return connect_sdkv2.NewFromConfig(cfg, - connect_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return connect.NewFromConfig(cfg, + connect.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/connectcases/service_endpoint_resolver_gen.go b/internal/service/connectcases/service_endpoint_resolver_gen.go index ecbe3728fc0..8cfc2cd3ab0 100644 --- a/internal/service/connectcases/service_endpoint_resolver_gen.go +++ b/internal/service/connectcases/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - connectcases_sdkv2 "github.com/aws/aws-sdk-go-v2/service/connectcases" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/connectcases" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ connectcases_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ connectcases.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver connectcases_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver connectcases.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: connectcases_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: connectcases.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params connectcases_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params connectcases.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params connectcases_ tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up connectcases endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params connectcases_ return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*connectcases_sdkv2.Options) { - return func(o *connectcases_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*connectcases.Options) { + return func(o *connectcases.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/connectcases/service_endpoints_gen_test.go b/internal/service/connectcases/service_endpoints_gen_test.go index 728e8ac4d1c..afff1f28e73 100644 --- a/internal/service/connectcases/service_endpoints_gen_test.go +++ b/internal/service/connectcases/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - connectcases_sdkv2 "github.com/aws/aws-sdk-go-v2/service/connectcases" + "github.com/aws/aws-sdk-go-v2/service/connectcases" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := connectcases_sdkv2.NewDefaultEndpointResolverV2() + r := connectcases.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), connectcases_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), connectcases.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := connectcases_sdkv2.NewDefaultEndpointResolverV2() + r := connectcases.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), connectcases_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), connectcases.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListDomains(ctx, &connectcases_sdkv2.ListDomainsInput{}, - func(opts *connectcases_sdkv2.Options) { + _, err := client.ListDomains(ctx, &connectcases.ListDomainsInput{}, + func(opts *connectcases.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/connectcases/service_package_gen.go b/internal/service/connectcases/service_package_gen.go index 71e95edfac4..d82959710b8 100644 --- a/internal/service/connectcases/service_package_gen.go +++ b/internal/service/connectcases/service_package_gen.go @@ -5,8 +5,8 @@ package connectcases import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - connectcases_sdkv2 "github.com/aws/aws-sdk-go-v2/service/connectcases" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/connectcases" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -35,11 +35,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*connectcases_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*connectcases.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return connectcases_sdkv2.NewFromConfig(cfg, - connectcases_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return connectcases.NewFromConfig(cfg, + connectcases.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/controltower/service_endpoint_resolver_gen.go b/internal/service/controltower/service_endpoint_resolver_gen.go index 845783a2ef3..f5c63b95e4a 100644 --- a/internal/service/controltower/service_endpoint_resolver_gen.go +++ b/internal/service/controltower/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - controltower_sdkv2 "github.com/aws/aws-sdk-go-v2/service/controltower" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/controltower" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ controltower_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ controltower.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver controltower_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver controltower.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: controltower_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: controltower.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params controltower_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params controltower.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params controltower_ tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up controltower endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params controltower_ return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*controltower_sdkv2.Options) { - return func(o *controltower_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*controltower.Options) { + return func(o *controltower.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/controltower/service_endpoints_gen_test.go b/internal/service/controltower/service_endpoints_gen_test.go index 7d053c4741a..abd6b6376f7 100644 --- a/internal/service/controltower/service_endpoints_gen_test.go +++ b/internal/service/controltower/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - controltower_sdkv2 "github.com/aws/aws-sdk-go-v2/service/controltower" + "github.com/aws/aws-sdk-go-v2/service/controltower" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := controltower_sdkv2.NewDefaultEndpointResolverV2() + r := controltower.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), controltower_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), controltower.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := controltower_sdkv2.NewDefaultEndpointResolverV2() + r := controltower.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), controltower_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), controltower.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListLandingZones(ctx, &controltower_sdkv2.ListLandingZonesInput{}, - func(opts *controltower_sdkv2.Options) { + _, err := client.ListLandingZones(ctx, &controltower.ListLandingZonesInput{}, + func(opts *controltower.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/controltower/service_package_gen.go b/internal/service/controltower/service_package_gen.go index f28e6f5de8c..1331ac1587e 100644 --- a/internal/service/controltower/service_package_gen.go +++ b/internal/service/controltower/service_package_gen.go @@ -5,8 +5,8 @@ package controltower import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - controltower_sdkv2 "github.com/aws/aws-sdk-go-v2/service/controltower" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/controltower" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -55,11 +55,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*controltower_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*controltower.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return controltower_sdkv2.NewFromConfig(cfg, - controltower_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return controltower.NewFromConfig(cfg, + controltower.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/costoptimizationhub/service_endpoint_resolver_gen.go b/internal/service/costoptimizationhub/service_endpoint_resolver_gen.go index 4b9d334a683..3a9ff94db75 100644 --- a/internal/service/costoptimizationhub/service_endpoint_resolver_gen.go +++ b/internal/service/costoptimizationhub/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - costoptimizationhub_sdkv2 "github.com/aws/aws-sdk-go-v2/service/costoptimizationhub" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/costoptimizationhub" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ costoptimizationhub_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ costoptimizationhub.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver costoptimizationhub_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver costoptimizationhub.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: costoptimizationhub_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: costoptimizationhub.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params costoptimizationhub_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params costoptimizationhub.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params costoptimizat tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up costoptimizationhub endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params costoptimizat return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*costoptimizationhub_sdkv2.Options) { - return func(o *costoptimizationhub_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*costoptimizationhub.Options) { + return func(o *costoptimizationhub.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/costoptimizationhub/service_endpoints_gen_test.go b/internal/service/costoptimizationhub/service_endpoints_gen_test.go index c166c0bd3a0..c5c18f17dab 100644 --- a/internal/service/costoptimizationhub/service_endpoints_gen_test.go +++ b/internal/service/costoptimizationhub/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - costoptimizationhub_sdkv2 "github.com/aws/aws-sdk-go-v2/service/costoptimizationhub" + "github.com/aws/aws-sdk-go-v2/service/costoptimizationhub" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -244,10 +244,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := costoptimizationhub_sdkv2.NewDefaultEndpointResolverV2() + r := costoptimizationhub.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), costoptimizationhub_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), costoptimizationhub.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -261,11 +261,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := costoptimizationhub_sdkv2.NewDefaultEndpointResolverV2() + r := costoptimizationhub.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), costoptimizationhub_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), costoptimizationhub.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -285,8 +285,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.GetPreferences(ctx, &costoptimizationhub_sdkv2.GetPreferencesInput{}, - func(opts *costoptimizationhub_sdkv2.Options) { + _, err := client.GetPreferences(ctx, &costoptimizationhub.GetPreferencesInput{}, + func(opts *costoptimizationhub.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/costoptimizationhub/service_package.go b/internal/service/costoptimizationhub/service_package.go index 54a63e556f6..84b08fb0178 100644 --- a/internal/service/costoptimizationhub/service_package.go +++ b/internal/service/costoptimizationhub/service_package.go @@ -17,7 +17,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return costoptimizationhub.NewFromConfig(cfg, - costoptimizationhub.WithEndpointResolverV2(newEndpointResolverSDKv2()), + costoptimizationhub.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), func(o *costoptimizationhub.Options) { if config["partition"].(string) == names.StandardPartitionID { diff --git a/internal/service/cur/service_endpoint_resolver_gen.go b/internal/service/cur/service_endpoint_resolver_gen.go index 25fbdce7659..c61e30369f0 100644 --- a/internal/service/cur/service_endpoint_resolver_gen.go +++ b/internal/service/cur/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - costandusagereportservice_sdkv2 "github.com/aws/aws-sdk-go-v2/service/costandusagereportservice" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/costandusagereportservice" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ costandusagereportservice_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ costandusagereportservice.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver costandusagereportservice_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver costandusagereportservice.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: costandusagereportservice_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: costandusagereportservice.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params costandusagereportservice_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params costandusagereportservice.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params costandusager tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up costandusagereportservice endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params costandusager return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*costandusagereportservice_sdkv2.Options) { - return func(o *costandusagereportservice_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*costandusagereportservice.Options) { + return func(o *costandusagereportservice.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/cur/service_endpoints_gen_test.go b/internal/service/cur/service_endpoints_gen_test.go index 206e4db5ab5..6e3afb756c3 100644 --- a/internal/service/cur/service_endpoints_gen_test.go +++ b/internal/service/cur/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - costandusagereportservice_sdkv2 "github.com/aws/aws-sdk-go-v2/service/costandusagereportservice" + "github.com/aws/aws-sdk-go-v2/service/costandusagereportservice" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -298,10 +298,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := costandusagereportservice_sdkv2.NewDefaultEndpointResolverV2() + r := costandusagereportservice.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), costandusagereportservice_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), costandusagereportservice.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -315,11 +315,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := costandusagereportservice_sdkv2.NewDefaultEndpointResolverV2() + r := costandusagereportservice.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), costandusagereportservice_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), costandusagereportservice.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -339,8 +339,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.DescribeReportDefinitions(ctx, &costandusagereportservice_sdkv2.DescribeReportDefinitionsInput{}, - func(opts *costandusagereportservice_sdkv2.Options) { + _, err := client.DescribeReportDefinitions(ctx, &costandusagereportservice.DescribeReportDefinitionsInput{}, + func(opts *costandusagereportservice.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/cur/service_package.go b/internal/service/cur/service_package.go index 8ad3ede742d..085157f67ab 100644 --- a/internal/service/cur/service_package.go +++ b/internal/service/cur/service_package.go @@ -17,7 +17,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return costandusagereportservice.NewFromConfig(cfg, - costandusagereportservice.WithEndpointResolverV2(newEndpointResolverSDKv2()), + costandusagereportservice.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), func(o *costandusagereportservice.Options) { if config["partition"].(string) == names.StandardPartitionID { diff --git a/internal/service/customerprofiles/service_endpoint_resolver_gen.go b/internal/service/customerprofiles/service_endpoint_resolver_gen.go index fede695c66d..e07d29c3a98 100644 --- a/internal/service/customerprofiles/service_endpoint_resolver_gen.go +++ b/internal/service/customerprofiles/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - customerprofiles_sdkv2 "github.com/aws/aws-sdk-go-v2/service/customerprofiles" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/customerprofiles" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ customerprofiles_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ customerprofiles.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver customerprofiles_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver customerprofiles.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: customerprofiles_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: customerprofiles.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params customerprofiles_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params customerprofiles.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params customerprofi tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up customerprofiles endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params customerprofi return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*customerprofiles_sdkv2.Options) { - return func(o *customerprofiles_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*customerprofiles.Options) { + return func(o *customerprofiles.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/customerprofiles/service_endpoints_gen_test.go b/internal/service/customerprofiles/service_endpoints_gen_test.go index fe439218c88..7b66076e114 100644 --- a/internal/service/customerprofiles/service_endpoints_gen_test.go +++ b/internal/service/customerprofiles/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - customerprofiles_sdkv2 "github.com/aws/aws-sdk-go-v2/service/customerprofiles" + "github.com/aws/aws-sdk-go-v2/service/customerprofiles" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := customerprofiles_sdkv2.NewDefaultEndpointResolverV2() + r := customerprofiles.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), customerprofiles_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), customerprofiles.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := customerprofiles_sdkv2.NewDefaultEndpointResolverV2() + r := customerprofiles.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), customerprofiles_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), customerprofiles.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListDomains(ctx, &customerprofiles_sdkv2.ListDomainsInput{}, - func(opts *customerprofiles_sdkv2.Options) { + _, err := client.ListDomains(ctx, &customerprofiles.ListDomainsInput{}, + func(opts *customerprofiles.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/customerprofiles/service_package_gen.go b/internal/service/customerprofiles/service_package_gen.go index 13a4c11bdac..b9c0233a5fa 100644 --- a/internal/service/customerprofiles/service_package_gen.go +++ b/internal/service/customerprofiles/service_package_gen.go @@ -5,8 +5,8 @@ package customerprofiles import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - customerprofiles_sdkv2 "github.com/aws/aws-sdk-go-v2/service/customerprofiles" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/customerprofiles" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -47,11 +47,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*customerprofiles_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*customerprofiles.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return customerprofiles_sdkv2.NewFromConfig(cfg, - customerprofiles_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return customerprofiles.NewFromConfig(cfg, + customerprofiles.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/databrew/service_endpoint_resolver_gen.go b/internal/service/databrew/service_endpoint_resolver_gen.go index 04cdf699416..1a5af3d567d 100644 --- a/internal/service/databrew/service_endpoint_resolver_gen.go +++ b/internal/service/databrew/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - databrew_sdkv2 "github.com/aws/aws-sdk-go-v2/service/databrew" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/databrew" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ databrew_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ databrew.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver databrew_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver databrew.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: databrew_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: databrew.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params databrew_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params databrew.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params databrew_sdkv tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up databrew endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params databrew_sdkv return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*databrew_sdkv2.Options) { - return func(o *databrew_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*databrew.Options) { + return func(o *databrew.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/databrew/service_endpoints_gen_test.go b/internal/service/databrew/service_endpoints_gen_test.go index 2c741846c61..51c659b54bb 100644 --- a/internal/service/databrew/service_endpoints_gen_test.go +++ b/internal/service/databrew/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - databrew_sdkv2 "github.com/aws/aws-sdk-go-v2/service/databrew" + "github.com/aws/aws-sdk-go-v2/service/databrew" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -296,10 +296,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := databrew_sdkv2.NewDefaultEndpointResolverV2() + r := databrew.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), databrew_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), databrew.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -313,11 +313,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := databrew_sdkv2.NewDefaultEndpointResolverV2() + r := databrew.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), databrew_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), databrew.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -337,8 +337,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListProjects(ctx, &databrew_sdkv2.ListProjectsInput{}, - func(opts *databrew_sdkv2.Options) { + _, err := client.ListProjects(ctx, &databrew.ListProjectsInput{}, + func(opts *databrew.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/databrew/service_package_gen.go b/internal/service/databrew/service_package_gen.go index 84f14e2ae69..8b5b8d5d162 100644 --- a/internal/service/databrew/service_package_gen.go +++ b/internal/service/databrew/service_package_gen.go @@ -5,8 +5,8 @@ package databrew import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - databrew_sdkv2 "github.com/aws/aws-sdk-go-v2/service/databrew" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/databrew" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -35,11 +35,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*databrew_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*databrew.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return databrew_sdkv2.NewFromConfig(cfg, - databrew_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return databrew.NewFromConfig(cfg, + databrew.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/dataexchange/service_endpoint_resolver_gen.go b/internal/service/dataexchange/service_endpoint_resolver_gen.go index 4f0136469fa..0ebda75769a 100644 --- a/internal/service/dataexchange/service_endpoint_resolver_gen.go +++ b/internal/service/dataexchange/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - dataexchange_sdkv2 "github.com/aws/aws-sdk-go-v2/service/dataexchange" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/dataexchange" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ dataexchange_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ dataexchange.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver dataexchange_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver dataexchange.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: dataexchange_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: dataexchange.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params dataexchange_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params dataexchange.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params dataexchange_ tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up dataexchange endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params dataexchange_ return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*dataexchange_sdkv2.Options) { - return func(o *dataexchange_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*dataexchange.Options) { + return func(o *dataexchange.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/dataexchange/service_endpoints_gen_test.go b/internal/service/dataexchange/service_endpoints_gen_test.go index 74b15a2ad62..e174eb195eb 100644 --- a/internal/service/dataexchange/service_endpoints_gen_test.go +++ b/internal/service/dataexchange/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - dataexchange_sdkv2 "github.com/aws/aws-sdk-go-v2/service/dataexchange" + "github.com/aws/aws-sdk-go-v2/service/dataexchange" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := dataexchange_sdkv2.NewDefaultEndpointResolverV2() + r := dataexchange.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), dataexchange_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), dataexchange.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := dataexchange_sdkv2.NewDefaultEndpointResolverV2() + r := dataexchange.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), dataexchange_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), dataexchange.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListDataSets(ctx, &dataexchange_sdkv2.ListDataSetsInput{}, - func(opts *dataexchange_sdkv2.Options) { + _, err := client.ListDataSets(ctx, &dataexchange.ListDataSetsInput{}, + func(opts *dataexchange.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/dataexchange/service_package_gen.go b/internal/service/dataexchange/service_package_gen.go index 08f1aa858f2..5c9a126bdb5 100644 --- a/internal/service/dataexchange/service_package_gen.go +++ b/internal/service/dataexchange/service_package_gen.go @@ -5,8 +5,8 @@ package dataexchange import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - dataexchange_sdkv2 "github.com/aws/aws-sdk-go-v2/service/dataexchange" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/dataexchange" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -52,11 +52,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*dataexchange_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*dataexchange.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return dataexchange_sdkv2.NewFromConfig(cfg, - dataexchange_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return dataexchange.NewFromConfig(cfg, + dataexchange.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/datapipeline/service_endpoint_resolver_gen.go b/internal/service/datapipeline/service_endpoint_resolver_gen.go index a5582b9422b..9ce33bd4e96 100644 --- a/internal/service/datapipeline/service_endpoint_resolver_gen.go +++ b/internal/service/datapipeline/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - datapipeline_sdkv2 "github.com/aws/aws-sdk-go-v2/service/datapipeline" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/datapipeline" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ datapipeline_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ datapipeline.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver datapipeline_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver datapipeline.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: datapipeline_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: datapipeline.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params datapipeline_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params datapipeline.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params datapipeline_ tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up datapipeline endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params datapipeline_ return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*datapipeline_sdkv2.Options) { - return func(o *datapipeline_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*datapipeline.Options) { + return func(o *datapipeline.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/datapipeline/service_endpoints_gen_test.go b/internal/service/datapipeline/service_endpoints_gen_test.go index 36b1a0f10b0..6ec7fe7bbff 100644 --- a/internal/service/datapipeline/service_endpoints_gen_test.go +++ b/internal/service/datapipeline/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - datapipeline_sdkv2 "github.com/aws/aws-sdk-go-v2/service/datapipeline" + "github.com/aws/aws-sdk-go-v2/service/datapipeline" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := datapipeline_sdkv2.NewDefaultEndpointResolverV2() + r := datapipeline.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), datapipeline_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), datapipeline.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := datapipeline_sdkv2.NewDefaultEndpointResolverV2() + r := datapipeline.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), datapipeline_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), datapipeline.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListPipelines(ctx, &datapipeline_sdkv2.ListPipelinesInput{}, - func(opts *datapipeline_sdkv2.Options) { + _, err := client.ListPipelines(ctx, &datapipeline.ListPipelinesInput{}, + func(opts *datapipeline.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/datapipeline/service_package_gen.go b/internal/service/datapipeline/service_package_gen.go index 1740c3f0aa0..e98566e74d8 100644 --- a/internal/service/datapipeline/service_package_gen.go +++ b/internal/service/datapipeline/service_package_gen.go @@ -5,8 +5,8 @@ package datapipeline import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - datapipeline_sdkv2 "github.com/aws/aws-sdk-go-v2/service/datapipeline" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/datapipeline" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -59,11 +59,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*datapipeline_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*datapipeline.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return datapipeline_sdkv2.NewFromConfig(cfg, - datapipeline_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return datapipeline.NewFromConfig(cfg, + datapipeline.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/datasync/service_endpoint_resolver_gen.go b/internal/service/datasync/service_endpoint_resolver_gen.go index b2f112f16df..307d27b963c 100644 --- a/internal/service/datasync/service_endpoint_resolver_gen.go +++ b/internal/service/datasync/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - datasync_sdkv2 "github.com/aws/aws-sdk-go-v2/service/datasync" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/datasync" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ datasync_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ datasync.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver datasync_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver datasync.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: datasync_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: datasync.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params datasync_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params datasync.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params datasync_sdkv tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up datasync endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params datasync_sdkv return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*datasync_sdkv2.Options) { - return func(o *datasync_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*datasync.Options) { + return func(o *datasync.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/datasync/service_endpoints_gen_test.go b/internal/service/datasync/service_endpoints_gen_test.go index 3d4302b5265..97bedbe9482 100644 --- a/internal/service/datasync/service_endpoints_gen_test.go +++ b/internal/service/datasync/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - datasync_sdkv2 "github.com/aws/aws-sdk-go-v2/service/datasync" + "github.com/aws/aws-sdk-go-v2/service/datasync" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := datasync_sdkv2.NewDefaultEndpointResolverV2() + r := datasync.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), datasync_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), datasync.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := datasync_sdkv2.NewDefaultEndpointResolverV2() + r := datasync.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), datasync_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), datasync.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListAgents(ctx, &datasync_sdkv2.ListAgentsInput{}, - func(opts *datasync_sdkv2.Options) { + _, err := client.ListAgents(ctx, &datasync.ListAgentsInput{}, + func(opts *datasync.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/datasync/service_package_gen.go b/internal/service/datasync/service_package_gen.go index 52a0f8e077f..8fdd2bd5882 100644 --- a/internal/service/datasync/service_package_gen.go +++ b/internal/service/datasync/service_package_gen.go @@ -5,8 +5,8 @@ package datasync import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - datasync_sdkv2 "github.com/aws/aws-sdk-go-v2/service/datasync" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/datasync" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -140,11 +140,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*datasync_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*datasync.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return datasync_sdkv2.NewFromConfig(cfg, - datasync_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return datasync.NewFromConfig(cfg, + datasync.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/datazone/service_endpoint_resolver_gen.go b/internal/service/datazone/service_endpoint_resolver_gen.go index 189bcbd6331..31347a04968 100644 --- a/internal/service/datazone/service_endpoint_resolver_gen.go +++ b/internal/service/datazone/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - datazone_sdkv2 "github.com/aws/aws-sdk-go-v2/service/datazone" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/datazone" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ datazone_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ datazone.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver datazone_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver datazone.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: datazone_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: datazone.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params datazone_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params datazone.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params datazone_sdkv tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up datazone endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params datazone_sdkv return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*datazone_sdkv2.Options) { - return func(o *datazone_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*datazone.Options) { + return func(o *datazone.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/datazone/service_endpoints_gen_test.go b/internal/service/datazone/service_endpoints_gen_test.go index 23374664523..d7d0f2730e8 100644 --- a/internal/service/datazone/service_endpoints_gen_test.go +++ b/internal/service/datazone/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - datazone_sdkv2 "github.com/aws/aws-sdk-go-v2/service/datazone" + "github.com/aws/aws-sdk-go-v2/service/datazone" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := datazone_sdkv2.NewDefaultEndpointResolverV2() + r := datazone.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), datazone_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), datazone.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := datazone_sdkv2.NewDefaultEndpointResolverV2() + r := datazone.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), datazone_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), datazone.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListDomains(ctx, &datazone_sdkv2.ListDomainsInput{}, - func(opts *datazone_sdkv2.Options) { + _, err := client.ListDomains(ctx, &datazone.ListDomainsInput{}, + func(opts *datazone.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/datazone/service_package_gen.go b/internal/service/datazone/service_package_gen.go index e0c9a319898..f9b98ad43f8 100644 --- a/internal/service/datazone/service_package_gen.go +++ b/internal/service/datazone/service_package_gen.go @@ -5,8 +5,8 @@ package datazone import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - datazone_sdkv2 "github.com/aws/aws-sdk-go-v2/service/datazone" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/datazone" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -84,11 +84,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*datazone_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*datazone.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return datazone_sdkv2.NewFromConfig(cfg, - datazone_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return datazone.NewFromConfig(cfg, + datazone.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/dax/service_endpoint_resolver_gen.go b/internal/service/dax/service_endpoint_resolver_gen.go index 669b613d31d..9f70e0fc675 100644 --- a/internal/service/dax/service_endpoint_resolver_gen.go +++ b/internal/service/dax/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - dax_sdkv2 "github.com/aws/aws-sdk-go-v2/service/dax" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/dax" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ dax_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ dax.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver dax_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver dax.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: dax_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: dax.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params dax_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params dax.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params dax_sdkv2.End tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up dax endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params dax_sdkv2.End return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*dax_sdkv2.Options) { - return func(o *dax_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*dax.Options) { + return func(o *dax.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/dax/service_endpoints_gen_test.go b/internal/service/dax/service_endpoints_gen_test.go index 58dda228878..f8fd2d90bb1 100644 --- a/internal/service/dax/service_endpoints_gen_test.go +++ b/internal/service/dax/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - dax_sdkv2 "github.com/aws/aws-sdk-go-v2/service/dax" + "github.com/aws/aws-sdk-go-v2/service/dax" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := dax_sdkv2.NewDefaultEndpointResolverV2() + r := dax.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), dax_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), dax.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := dax_sdkv2.NewDefaultEndpointResolverV2() + r := dax.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), dax_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), dax.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.DescribeClusters(ctx, &dax_sdkv2.DescribeClustersInput{}, - func(opts *dax_sdkv2.Options) { + _, err := client.DescribeClusters(ctx, &dax.DescribeClustersInput{}, + func(opts *dax.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/dax/service_package_gen.go b/internal/service/dax/service_package_gen.go index e944d854b4a..f6bbf10c1c2 100644 --- a/internal/service/dax/service_package_gen.go +++ b/internal/service/dax/service_package_gen.go @@ -5,8 +5,8 @@ package dax import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - dax_sdkv2 "github.com/aws/aws-sdk-go-v2/service/dax" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/dax" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -52,11 +52,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*dax_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*dax.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return dax_sdkv2.NewFromConfig(cfg, - dax_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return dax.NewFromConfig(cfg, + dax.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/deploy/service_endpoint_resolver_gen.go b/internal/service/deploy/service_endpoint_resolver_gen.go index adff12f265a..3561dea007c 100644 --- a/internal/service/deploy/service_endpoint_resolver_gen.go +++ b/internal/service/deploy/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - codedeploy_sdkv2 "github.com/aws/aws-sdk-go-v2/service/codedeploy" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/codedeploy" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ codedeploy_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ codedeploy.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver codedeploy_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver codedeploy.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: codedeploy_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: codedeploy.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params codedeploy_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params codedeploy.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params codedeploy_sd tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up codedeploy endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params codedeploy_sd return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*codedeploy_sdkv2.Options) { - return func(o *codedeploy_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*codedeploy.Options) { + return func(o *codedeploy.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/deploy/service_endpoints_gen_test.go b/internal/service/deploy/service_endpoints_gen_test.go index 7128ff5bfc3..2cf6c69e054 100644 --- a/internal/service/deploy/service_endpoints_gen_test.go +++ b/internal/service/deploy/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - codedeploy_sdkv2 "github.com/aws/aws-sdk-go-v2/service/codedeploy" + "github.com/aws/aws-sdk-go-v2/service/codedeploy" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -296,10 +296,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := codedeploy_sdkv2.NewDefaultEndpointResolverV2() + r := codedeploy.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), codedeploy_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), codedeploy.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -313,11 +313,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := codedeploy_sdkv2.NewDefaultEndpointResolverV2() + r := codedeploy.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), codedeploy_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), codedeploy.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -337,8 +337,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListApplications(ctx, &codedeploy_sdkv2.ListApplicationsInput{}, - func(opts *codedeploy_sdkv2.Options) { + _, err := client.ListApplications(ctx, &codedeploy.ListApplicationsInput{}, + func(opts *codedeploy.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/deploy/service_package_gen.go b/internal/service/deploy/service_package_gen.go index bee170a538f..f41d7892470 100644 --- a/internal/service/deploy/service_package_gen.go +++ b/internal/service/deploy/service_package_gen.go @@ -5,8 +5,8 @@ package deploy import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - codedeploy_sdkv2 "github.com/aws/aws-sdk-go-v2/service/codedeploy" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/codedeploy" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -57,11 +57,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*codedeploy_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*codedeploy.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return codedeploy_sdkv2.NewFromConfig(cfg, - codedeploy_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return codedeploy.NewFromConfig(cfg, + codedeploy.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/detective/service_endpoint_resolver_gen.go b/internal/service/detective/service_endpoint_resolver_gen.go index 10e73e73b3f..5bf3fbefadd 100644 --- a/internal/service/detective/service_endpoint_resolver_gen.go +++ b/internal/service/detective/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - detective_sdkv2 "github.com/aws/aws-sdk-go-v2/service/detective" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/detective" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ detective_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ detective.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver detective_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver detective.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: detective_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: detective.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params detective_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params detective.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params detective_sdk tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up detective endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params detective_sdk return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*detective_sdkv2.Options) { - return func(o *detective_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*detective.Options) { + return func(o *detective.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/detective/service_endpoints_gen_test.go b/internal/service/detective/service_endpoints_gen_test.go index 09ada86996a..f7e14ad1877 100644 --- a/internal/service/detective/service_endpoints_gen_test.go +++ b/internal/service/detective/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - detective_sdkv2 "github.com/aws/aws-sdk-go-v2/service/detective" + "github.com/aws/aws-sdk-go-v2/service/detective" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := detective_sdkv2.NewDefaultEndpointResolverV2() + r := detective.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), detective_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), detective.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := detective_sdkv2.NewDefaultEndpointResolverV2() + r := detective.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), detective_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), detective.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListGraphs(ctx, &detective_sdkv2.ListGraphsInput{}, - func(opts *detective_sdkv2.Options) { + _, err := client.ListGraphs(ctx, &detective.ListGraphsInput{}, + func(opts *detective.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/detective/service_package_gen.go b/internal/service/detective/service_package_gen.go index 62982d92d4f..a6d35f31b1f 100644 --- a/internal/service/detective/service_package_gen.go +++ b/internal/service/detective/service_package_gen.go @@ -5,8 +5,8 @@ package detective import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - detective_sdkv2 "github.com/aws/aws-sdk-go-v2/service/detective" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/detective" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -60,11 +60,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*detective_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*detective.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return detective_sdkv2.NewFromConfig(cfg, - detective_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return detective.NewFromConfig(cfg, + detective.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/devicefarm/service_endpoint_resolver_gen.go b/internal/service/devicefarm/service_endpoint_resolver_gen.go index 8407250ab33..093e86cec0f 100644 --- a/internal/service/devicefarm/service_endpoint_resolver_gen.go +++ b/internal/service/devicefarm/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - devicefarm_sdkv2 "github.com/aws/aws-sdk-go-v2/service/devicefarm" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/devicefarm" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ devicefarm_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ devicefarm.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver devicefarm_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver devicefarm.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: devicefarm_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: devicefarm.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params devicefarm_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params devicefarm.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params devicefarm_sd tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up devicefarm endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params devicefarm_sd return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*devicefarm_sdkv2.Options) { - return func(o *devicefarm_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*devicefarm.Options) { + return func(o *devicefarm.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/devicefarm/service_endpoints_gen_test.go b/internal/service/devicefarm/service_endpoints_gen_test.go index 7fe94a9d744..2e2c4e8562a 100644 --- a/internal/service/devicefarm/service_endpoints_gen_test.go +++ b/internal/service/devicefarm/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - devicefarm_sdkv2 "github.com/aws/aws-sdk-go-v2/service/devicefarm" + "github.com/aws/aws-sdk-go-v2/service/devicefarm" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := devicefarm_sdkv2.NewDefaultEndpointResolverV2() + r := devicefarm.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), devicefarm_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), devicefarm.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := devicefarm_sdkv2.NewDefaultEndpointResolverV2() + r := devicefarm.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), devicefarm_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), devicefarm.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListDeviceInstances(ctx, &devicefarm_sdkv2.ListDeviceInstancesInput{}, - func(opts *devicefarm_sdkv2.Options) { + _, err := client.ListDeviceInstances(ctx, &devicefarm.ListDeviceInstancesInput{}, + func(opts *devicefarm.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/devicefarm/service_package_gen.go b/internal/service/devicefarm/service_package_gen.go index c0aacd111c4..2e2fad363c5 100644 --- a/internal/service/devicefarm/service_package_gen.go +++ b/internal/service/devicefarm/service_package_gen.go @@ -5,8 +5,8 @@ package devicefarm import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - devicefarm_sdkv2 "github.com/aws/aws-sdk-go-v2/service/devicefarm" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/devicefarm" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -81,11 +81,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*devicefarm_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*devicefarm.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return devicefarm_sdkv2.NewFromConfig(cfg, - devicefarm_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return devicefarm.NewFromConfig(cfg, + devicefarm.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/devopsguru/service_endpoint_resolver_gen.go b/internal/service/devopsguru/service_endpoint_resolver_gen.go index 7d75a9544c1..2e3c105cb46 100644 --- a/internal/service/devopsguru/service_endpoint_resolver_gen.go +++ b/internal/service/devopsguru/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - devopsguru_sdkv2 "github.com/aws/aws-sdk-go-v2/service/devopsguru" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/devopsguru" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ devopsguru_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ devopsguru.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver devopsguru_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver devopsguru.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: devopsguru_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: devopsguru.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params devopsguru_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params devopsguru.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params devopsguru_sd tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up devopsguru endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params devopsguru_sd return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*devopsguru_sdkv2.Options) { - return func(o *devopsguru_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*devopsguru.Options) { + return func(o *devopsguru.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/devopsguru/service_endpoints_gen_test.go b/internal/service/devopsguru/service_endpoints_gen_test.go index 61214574eb1..668a2d21795 100644 --- a/internal/service/devopsguru/service_endpoints_gen_test.go +++ b/internal/service/devopsguru/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - devopsguru_sdkv2 "github.com/aws/aws-sdk-go-v2/service/devopsguru" + "github.com/aws/aws-sdk-go-v2/service/devopsguru" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := devopsguru_sdkv2.NewDefaultEndpointResolverV2() + r := devopsguru.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), devopsguru_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), devopsguru.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := devopsguru_sdkv2.NewDefaultEndpointResolverV2() + r := devopsguru.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), devopsguru_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), devopsguru.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.DescribeAccountHealth(ctx, &devopsguru_sdkv2.DescribeAccountHealthInput{}, - func(opts *devopsguru_sdkv2.Options) { + _, err := client.DescribeAccountHealth(ctx, &devopsguru.DescribeAccountHealthInput{}, + func(opts *devopsguru.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/devopsguru/service_package_gen.go b/internal/service/devopsguru/service_package_gen.go index 013da856af1..ff41666f99f 100644 --- a/internal/service/devopsguru/service_package_gen.go +++ b/internal/service/devopsguru/service_package_gen.go @@ -5,8 +5,8 @@ package devopsguru import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - devopsguru_sdkv2 "github.com/aws/aws-sdk-go-v2/service/devopsguru" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/devopsguru" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -61,11 +61,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*devopsguru_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*devopsguru.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return devopsguru_sdkv2.NewFromConfig(cfg, - devopsguru_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return devopsguru.NewFromConfig(cfg, + devopsguru.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/directconnect/service_endpoint_resolver_gen.go b/internal/service/directconnect/service_endpoint_resolver_gen.go index b7f99a26cf3..01356443ed8 100644 --- a/internal/service/directconnect/service_endpoint_resolver_gen.go +++ b/internal/service/directconnect/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - directconnect_sdkv2 "github.com/aws/aws-sdk-go-v2/service/directconnect" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/directconnect" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ directconnect_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ directconnect.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver directconnect_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver directconnect.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: directconnect_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: directconnect.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params directconnect_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params directconnect.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params directconnect tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up directconnect endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params directconnect return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*directconnect_sdkv2.Options) { - return func(o *directconnect_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*directconnect.Options) { + return func(o *directconnect.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/directconnect/service_endpoints_gen_test.go b/internal/service/directconnect/service_endpoints_gen_test.go index bf0501a5eee..90b0c2842b5 100644 --- a/internal/service/directconnect/service_endpoints_gen_test.go +++ b/internal/service/directconnect/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - directconnect_sdkv2 "github.com/aws/aws-sdk-go-v2/service/directconnect" + "github.com/aws/aws-sdk-go-v2/service/directconnect" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := directconnect_sdkv2.NewDefaultEndpointResolverV2() + r := directconnect.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), directconnect_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), directconnect.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := directconnect_sdkv2.NewDefaultEndpointResolverV2() + r := directconnect.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), directconnect_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), directconnect.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.DescribeConnections(ctx, &directconnect_sdkv2.DescribeConnectionsInput{}, - func(opts *directconnect_sdkv2.Options) { + _, err := client.DescribeConnections(ctx, &directconnect.DescribeConnectionsInput{}, + func(opts *directconnect.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/directconnect/service_package_gen.go b/internal/service/directconnect/service_package_gen.go index c8565890e3f..f32c41cbfbd 100644 --- a/internal/service/directconnect/service_package_gen.go +++ b/internal/service/directconnect/service_package_gen.go @@ -5,8 +5,8 @@ package directconnect import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - directconnect_sdkv2 "github.com/aws/aws-sdk-go-v2/service/directconnect" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/directconnect" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -181,11 +181,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*directconnect_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*directconnect.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return directconnect_sdkv2.NewFromConfig(cfg, - directconnect_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return directconnect.NewFromConfig(cfg, + directconnect.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/dlm/service_endpoint_resolver_gen.go b/internal/service/dlm/service_endpoint_resolver_gen.go index d2ecec96a2c..750643613da 100644 --- a/internal/service/dlm/service_endpoint_resolver_gen.go +++ b/internal/service/dlm/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - dlm_sdkv2 "github.com/aws/aws-sdk-go-v2/service/dlm" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/dlm" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ dlm_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ dlm.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver dlm_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver dlm.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: dlm_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: dlm.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params dlm_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params dlm.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params dlm_sdkv2.End tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up dlm endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params dlm_sdkv2.End return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*dlm_sdkv2.Options) { - return func(o *dlm_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*dlm.Options) { + return func(o *dlm.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/dlm/service_endpoints_gen_test.go b/internal/service/dlm/service_endpoints_gen_test.go index d2d0809135a..3295da2ebcc 100644 --- a/internal/service/dlm/service_endpoints_gen_test.go +++ b/internal/service/dlm/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - dlm_sdkv2 "github.com/aws/aws-sdk-go-v2/service/dlm" + "github.com/aws/aws-sdk-go-v2/service/dlm" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := dlm_sdkv2.NewDefaultEndpointResolverV2() + r := dlm.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), dlm_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), dlm.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := dlm_sdkv2.NewDefaultEndpointResolverV2() + r := dlm.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), dlm_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), dlm.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.GetLifecyclePolicies(ctx, &dlm_sdkv2.GetLifecyclePoliciesInput{}, - func(opts *dlm_sdkv2.Options) { + _, err := client.GetLifecyclePolicies(ctx, &dlm.GetLifecyclePoliciesInput{}, + func(opts *dlm.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/dlm/service_package_gen.go b/internal/service/dlm/service_package_gen.go index 6552b7c43d1..7135240dca6 100644 --- a/internal/service/dlm/service_package_gen.go +++ b/internal/service/dlm/service_package_gen.go @@ -5,8 +5,8 @@ package dlm import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - dlm_sdkv2 "github.com/aws/aws-sdk-go-v2/service/dlm" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/dlm" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -44,11 +44,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*dlm_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*dlm.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return dlm_sdkv2.NewFromConfig(cfg, - dlm_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return dlm.NewFromConfig(cfg, + dlm.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/dms/service_endpoint_resolver_gen.go b/internal/service/dms/service_endpoint_resolver_gen.go index efa8af3ae75..1a3d3746126 100644 --- a/internal/service/dms/service_endpoint_resolver_gen.go +++ b/internal/service/dms/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - databasemigrationservice_sdkv2 "github.com/aws/aws-sdk-go-v2/service/databasemigrationservice" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/databasemigrationservice" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ databasemigrationservice_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ databasemigrationservice.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver databasemigrationservice_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver databasemigrationservice.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: databasemigrationservice_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: databasemigrationservice.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params databasemigrationservice_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params databasemigrationservice.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params databasemigra tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up databasemigrationservice endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params databasemigra return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*databasemigrationservice_sdkv2.Options) { - return func(o *databasemigrationservice_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*databasemigrationservice.Options) { + return func(o *databasemigrationservice.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/dms/service_endpoints_gen_test.go b/internal/service/dms/service_endpoints_gen_test.go index bb2135b2070..d277409befe 100644 --- a/internal/service/dms/service_endpoints_gen_test.go +++ b/internal/service/dms/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - databasemigrationservice_sdkv2 "github.com/aws/aws-sdk-go-v2/service/databasemigrationservice" + "github.com/aws/aws-sdk-go-v2/service/databasemigrationservice" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -355,10 +355,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := databasemigrationservice_sdkv2.NewDefaultEndpointResolverV2() + r := databasemigrationservice.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), databasemigrationservice_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), databasemigrationservice.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -372,11 +372,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := databasemigrationservice_sdkv2.NewDefaultEndpointResolverV2() + r := databasemigrationservice.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), databasemigrationservice_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), databasemigrationservice.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -396,8 +396,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.DescribeCertificates(ctx, &databasemigrationservice_sdkv2.DescribeCertificatesInput{}, - func(opts *databasemigrationservice_sdkv2.Options) { + _, err := client.DescribeCertificates(ctx, &databasemigrationservice.DescribeCertificatesInput{}, + func(opts *databasemigrationservice.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/dms/service_package_gen.go b/internal/service/dms/service_package_gen.go index 8f31124dad9..afb9e2ede5f 100644 --- a/internal/service/dms/service_package_gen.go +++ b/internal/service/dms/service_package_gen.go @@ -5,8 +5,8 @@ package dms import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - databasemigrationservice_sdkv2 "github.com/aws/aws-sdk-go-v2/service/databasemigrationservice" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/databasemigrationservice" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -141,11 +141,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*databasemigrationservice_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*databasemigrationservice.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return databasemigrationservice_sdkv2.NewFromConfig(cfg, - databasemigrationservice_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return databasemigrationservice.NewFromConfig(cfg, + databasemigrationservice.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/docdb/service_endpoint_resolver_gen.go b/internal/service/docdb/service_endpoint_resolver_gen.go index 8d551cfd7b9..e8255189f57 100644 --- a/internal/service/docdb/service_endpoint_resolver_gen.go +++ b/internal/service/docdb/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - docdb_sdkv2 "github.com/aws/aws-sdk-go-v2/service/docdb" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/docdb" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ docdb_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ docdb.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver docdb_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver docdb.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: docdb_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: docdb.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params docdb_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params docdb.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params docdb_sdkv2.E tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up docdb endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params docdb_sdkv2.E return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*docdb_sdkv2.Options) { - return func(o *docdb_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*docdb.Options) { + return func(o *docdb.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/docdb/service_endpoints_gen_test.go b/internal/service/docdb/service_endpoints_gen_test.go index a8d137092f3..d113991d47f 100644 --- a/internal/service/docdb/service_endpoints_gen_test.go +++ b/internal/service/docdb/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - docdb_sdkv2 "github.com/aws/aws-sdk-go-v2/service/docdb" + "github.com/aws/aws-sdk-go-v2/service/docdb" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := docdb_sdkv2.NewDefaultEndpointResolverV2() + r := docdb.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), docdb_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), docdb.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := docdb_sdkv2.NewDefaultEndpointResolverV2() + r := docdb.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), docdb_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), docdb.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.DescribeDBClusters(ctx, &docdb_sdkv2.DescribeDBClustersInput{}, - func(opts *docdb_sdkv2.Options) { + _, err := client.DescribeDBClusters(ctx, &docdb.DescribeDBClustersInput{}, + func(opts *docdb.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/docdb/service_package_gen.go b/internal/service/docdb/service_package_gen.go index a6154e666ba..e28f93978b3 100644 --- a/internal/service/docdb/service_package_gen.go +++ b/internal/service/docdb/service_package_gen.go @@ -5,8 +5,8 @@ package docdb import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - docdb_sdkv2 "github.com/aws/aws-sdk-go-v2/service/docdb" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/docdb" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -93,11 +93,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*docdb_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*docdb.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return docdb_sdkv2.NewFromConfig(cfg, - docdb_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return docdb.NewFromConfig(cfg, + docdb.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/docdbelastic/service_endpoint_resolver_gen.go b/internal/service/docdbelastic/service_endpoint_resolver_gen.go index 2f0ca4f25f2..38a7dfa18d4 100644 --- a/internal/service/docdbelastic/service_endpoint_resolver_gen.go +++ b/internal/service/docdbelastic/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - docdbelastic_sdkv2 "github.com/aws/aws-sdk-go-v2/service/docdbelastic" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/docdbelastic" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ docdbelastic_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ docdbelastic.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver docdbelastic_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver docdbelastic.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: docdbelastic_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: docdbelastic.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params docdbelastic_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params docdbelastic.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params docdbelastic_ tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up docdbelastic endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params docdbelastic_ return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*docdbelastic_sdkv2.Options) { - return func(o *docdbelastic_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*docdbelastic.Options) { + return func(o *docdbelastic.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/docdbelastic/service_endpoints_gen_test.go b/internal/service/docdbelastic/service_endpoints_gen_test.go index c53daa1c6c3..25707f020e5 100644 --- a/internal/service/docdbelastic/service_endpoints_gen_test.go +++ b/internal/service/docdbelastic/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - docdbelastic_sdkv2 "github.com/aws/aws-sdk-go-v2/service/docdbelastic" + "github.com/aws/aws-sdk-go-v2/service/docdbelastic" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := docdbelastic_sdkv2.NewDefaultEndpointResolverV2() + r := docdbelastic.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), docdbelastic_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), docdbelastic.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := docdbelastic_sdkv2.NewDefaultEndpointResolverV2() + r := docdbelastic.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), docdbelastic_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), docdbelastic.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListClusters(ctx, &docdbelastic_sdkv2.ListClustersInput{}, - func(opts *docdbelastic_sdkv2.Options) { + _, err := client.ListClusters(ctx, &docdbelastic.ListClustersInput{}, + func(opts *docdbelastic.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/docdbelastic/service_package_gen.go b/internal/service/docdbelastic/service_package_gen.go index 4a9d0907313..864f4157222 100644 --- a/internal/service/docdbelastic/service_package_gen.go +++ b/internal/service/docdbelastic/service_package_gen.go @@ -5,8 +5,8 @@ package docdbelastic import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - docdbelastic_sdkv2 "github.com/aws/aws-sdk-go-v2/service/docdbelastic" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/docdbelastic" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -43,11 +43,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*docdbelastic_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*docdbelastic.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return docdbelastic_sdkv2.NewFromConfig(cfg, - docdbelastic_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return docdbelastic.NewFromConfig(cfg, + docdbelastic.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/drs/service_endpoint_resolver_gen.go b/internal/service/drs/service_endpoint_resolver_gen.go index 660ba2ba0d7..894ecaf255e 100644 --- a/internal/service/drs/service_endpoint_resolver_gen.go +++ b/internal/service/drs/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - drs_sdkv2 "github.com/aws/aws-sdk-go-v2/service/drs" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/drs" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ drs_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ drs.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver drs_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver drs.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: drs_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: drs.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params drs_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params drs.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params drs_sdkv2.End tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up drs endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params drs_sdkv2.End return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*drs_sdkv2.Options) { - return func(o *drs_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*drs.Options) { + return func(o *drs.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/drs/service_endpoints_gen_test.go b/internal/service/drs/service_endpoints_gen_test.go index e0456e32390..27959a892b6 100644 --- a/internal/service/drs/service_endpoints_gen_test.go +++ b/internal/service/drs/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - drs_sdkv2 "github.com/aws/aws-sdk-go-v2/service/drs" + "github.com/aws/aws-sdk-go-v2/service/drs" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := drs_sdkv2.NewDefaultEndpointResolverV2() + r := drs.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), drs_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), drs.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := drs_sdkv2.NewDefaultEndpointResolverV2() + r := drs.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), drs_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), drs.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.DescribeJobs(ctx, &drs_sdkv2.DescribeJobsInput{}, - func(opts *drs_sdkv2.Options) { + _, err := client.DescribeJobs(ctx, &drs.DescribeJobsInput{}, + func(opts *drs.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/drs/service_package_gen.go b/internal/service/drs/service_package_gen.go index bef76c21f67..f8a5561b03e 100644 --- a/internal/service/drs/service_package_gen.go +++ b/internal/service/drs/service_package_gen.go @@ -5,8 +5,8 @@ package drs import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - drs_sdkv2 "github.com/aws/aws-sdk-go-v2/service/drs" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/drs" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -43,11 +43,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*drs_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*drs.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return drs_sdkv2.NewFromConfig(cfg, - drs_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return drs.NewFromConfig(cfg, + drs.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/ds/service_endpoint_resolver_gen.go b/internal/service/ds/service_endpoint_resolver_gen.go index 971a5cd3e23..0c2d51f5a96 100644 --- a/internal/service/ds/service_endpoint_resolver_gen.go +++ b/internal/service/ds/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - directoryservice_sdkv2 "github.com/aws/aws-sdk-go-v2/service/directoryservice" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/directoryservice" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ directoryservice_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ directoryservice.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver directoryservice_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver directoryservice.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: directoryservice_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: directoryservice.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params directoryservice_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params directoryservice.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params directoryserv tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up directoryservice endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params directoryserv return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*directoryservice_sdkv2.Options) { - return func(o *directoryservice_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*directoryservice.Options) { + return func(o *directoryservice.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/ds/service_endpoints_gen_test.go b/internal/service/ds/service_endpoints_gen_test.go index 0660fbbdfca..c638b73886b 100644 --- a/internal/service/ds/service_endpoints_gen_test.go +++ b/internal/service/ds/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - directoryservice_sdkv2 "github.com/aws/aws-sdk-go-v2/service/directoryservice" + "github.com/aws/aws-sdk-go-v2/service/directoryservice" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -296,10 +296,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := directoryservice_sdkv2.NewDefaultEndpointResolverV2() + r := directoryservice.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), directoryservice_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), directoryservice.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -313,11 +313,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := directoryservice_sdkv2.NewDefaultEndpointResolverV2() + r := directoryservice.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), directoryservice_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), directoryservice.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -337,8 +337,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.DescribeDirectories(ctx, &directoryservice_sdkv2.DescribeDirectoriesInput{}, - func(opts *directoryservice_sdkv2.Options) { + _, err := client.DescribeDirectories(ctx, &directoryservice.DescribeDirectoriesInput{}, + func(opts *directoryservice.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/ds/service_package_gen.go b/internal/service/ds/service_package_gen.go index 22687b4f095..b139c7270f6 100644 --- a/internal/service/ds/service_package_gen.go +++ b/internal/service/ds/service_package_gen.go @@ -5,8 +5,8 @@ package ds import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - directoryservice_sdkv2 "github.com/aws/aws-sdk-go-v2/service/directoryservice" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/directoryservice" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -86,11 +86,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*directoryservice_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*directoryservice.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return directoryservice_sdkv2.NewFromConfig(cfg, - directoryservice_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return directoryservice.NewFromConfig(cfg, + directoryservice.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/dynamodb/service_endpoint_resolver_gen.go b/internal/service/dynamodb/service_endpoint_resolver_gen.go index 49fe698597c..191011ed05b 100644 --- a/internal/service/dynamodb/service_endpoint_resolver_gen.go +++ b/internal/service/dynamodb/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - dynamodb_sdkv2 "github.com/aws/aws-sdk-go-v2/service/dynamodb" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/dynamodb" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ dynamodb_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ dynamodb.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver dynamodb_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver dynamodb.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: dynamodb_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: dynamodb.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params dynamodb_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params dynamodb.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params dynamodb_sdkv tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up dynamodb endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params dynamodb_sdkv return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*dynamodb_sdkv2.Options) { - return func(o *dynamodb_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*dynamodb.Options) { + return func(o *dynamodb.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/dynamodb/service_endpoints_gen_test.go b/internal/service/dynamodb/service_endpoints_gen_test.go index 3741c3b8e41..5a5a82b299a 100644 --- a/internal/service/dynamodb/service_endpoints_gen_test.go +++ b/internal/service/dynamodb/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - dynamodb_sdkv2 "github.com/aws/aws-sdk-go-v2/service/dynamodb" + "github.com/aws/aws-sdk-go-v2/service/dynamodb" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -352,10 +352,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := dynamodb_sdkv2.NewDefaultEndpointResolverV2() + r := dynamodb.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), dynamodb_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), dynamodb.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -369,11 +369,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := dynamodb_sdkv2.NewDefaultEndpointResolverV2() + r := dynamodb.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), dynamodb_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), dynamodb.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -393,8 +393,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListTables(ctx, &dynamodb_sdkv2.ListTablesInput{}, - func(opts *dynamodb_sdkv2.Options) { + _, err := client.ListTables(ctx, &dynamodb.ListTablesInput{}, + func(opts *dynamodb.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/dynamodb/service_package.go b/internal/service/dynamodb/service_package.go index f9589244928..103adc9202c 100644 --- a/internal/service/dynamodb/service_package.go +++ b/internal/service/dynamodb/service_package.go @@ -20,7 +20,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return dynamodb.NewFromConfig(cfg, - dynamodb.WithEndpointResolverV2(newEndpointResolverSDKv2()), + dynamodb.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), func(o *dynamodb.Options) { o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(func(err error) aws.Ternary { diff --git a/internal/service/ec2/service_endpoint_resolver_gen.go b/internal/service/ec2/service_endpoint_resolver_gen.go index 05755fb2a09..f4b2a033bd3 100644 --- a/internal/service/ec2/service_endpoint_resolver_gen.go +++ b/internal/service/ec2/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - ec2_sdkv2 "github.com/aws/aws-sdk-go-v2/service/ec2" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/ec2" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ ec2_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ ec2.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver ec2_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver ec2.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: ec2_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: ec2.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params ec2_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params ec2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params ec2_sdkv2.End tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up ec2 endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params ec2_sdkv2.End return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*ec2_sdkv2.Options) { - return func(o *ec2_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*ec2.Options) { + return func(o *ec2.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/ec2/service_endpoints_gen_test.go b/internal/service/ec2/service_endpoints_gen_test.go index 8706c2caf7d..bc8c454f559 100644 --- a/internal/service/ec2/service_endpoints_gen_test.go +++ b/internal/service/ec2/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - ec2_sdkv2 "github.com/aws/aws-sdk-go-v2/service/ec2" + "github.com/aws/aws-sdk-go-v2/service/ec2" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := ec2_sdkv2.NewDefaultEndpointResolverV2() + r := ec2.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), ec2_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), ec2.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := ec2_sdkv2.NewDefaultEndpointResolverV2() + r := ec2.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), ec2_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), ec2.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.DescribeVpcs(ctx, &ec2_sdkv2.DescribeVpcsInput{}, - func(opts *ec2_sdkv2.Options) { + _, err := client.DescribeVpcs(ctx, &ec2.DescribeVpcsInput{}, + func(opts *ec2.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/ec2/service_package.go b/internal/service/ec2/service_package.go index a83c137dc10..db0a8b46193 100644 --- a/internal/service/ec2/service_package.go +++ b/internal/service/ec2/service_package.go @@ -6,48 +6,48 @@ package ec2 import ( "context" - 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" - tfawserr_sdkv2 "github.com/hashicorp/aws-sdk-go-base/v2/tfawserr" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws/retry" + "github.com/aws/aws-sdk-go-v2/service/ec2" + "github.com/hashicorp/aws-sdk-go-base/v2/tfawserr" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/names" ) // 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) (*ec2_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*ec2.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return ec2_sdkv2.NewFromConfig(cfg, - ec2_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return ec2.NewFromConfig(cfg, + ec2.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), - func(o *ec2_sdkv2.Options) { - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws_sdkv2.RetryerV2), retry_sdkv2.IsErrorRetryableFunc(func(err error) aws_sdkv2.Ternary { - if tfawserr_sdkv2.ErrMessageContains(err, errCodeInvalidParameterValue, "This call cannot be completed because there are pending VPNs or Virtual Interfaces") { // AttachVpnGateway, DetachVpnGateway - return aws_sdkv2.TrueTernary + func(o *ec2.Options) { + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(func(err error) aws.Ternary { + if tfawserr.ErrMessageContains(err, errCodeInvalidParameterValue, "This call cannot be completed because there are pending VPNs or Virtual Interfaces") { // AttachVpnGateway, DetachVpnGateway + return aws.TrueTernary } - if tfawserr_sdkv2.ErrCodeEquals(err, errCodeInsufficientInstanceCapacity) { // CreateCapacityReservation, RunInstances - return aws_sdkv2.TrueTernary + if tfawserr.ErrCodeEquals(err, errCodeInsufficientInstanceCapacity) { // CreateCapacityReservation, RunInstances + return aws.TrueTernary } - if tfawserr_sdkv2.ErrMessageContains(err, errCodeOperationNotPermitted, "Endpoint cannot be created while another endpoint is being created") { // CreateClientVpnEndpoint - return aws_sdkv2.TrueTernary + if tfawserr.ErrMessageContains(err, errCodeOperationNotPermitted, "Endpoint cannot be created while another endpoint is being created") { // CreateClientVpnEndpoint + return aws.TrueTernary } - if tfawserr_sdkv2.ErrMessageContains(err, errCodeConcurrentMutationLimitExceeded, "Cannot initiate another change for this endpoint at this time") { // CreateClientVpnRoute, DeleteClientVpnRoute - return aws_sdkv2.TrueTernary + if tfawserr.ErrMessageContains(err, errCodeConcurrentMutationLimitExceeded, "Cannot initiate another change for this endpoint at this time") { // CreateClientVpnRoute, DeleteClientVpnRoute + return aws.TrueTernary } - if tfawserr_sdkv2.ErrMessageContains(err, errCodeVPNConnectionLimitExceeded, "maximum number of mutating objects has been reached") { // CreateVpnConnection - return aws_sdkv2.TrueTernary + if tfawserr.ErrMessageContains(err, errCodeVPNConnectionLimitExceeded, "maximum number of mutating objects has been reached") { // CreateVpnConnection + return aws.TrueTernary } - if tfawserr_sdkv2.ErrMessageContains(err, errCodeVPNGatewayLimitExceeded, "maximum number of mutating objects has been reached") { // CreateVpnGateway - return aws_sdkv2.TrueTernary + if tfawserr.ErrMessageContains(err, errCodeVPNGatewayLimitExceeded, "maximum number of mutating objects has been reached") { // CreateVpnGateway + return aws.TrueTernary } - return aws_sdkv2.UnknownTernary // Delegate to configured Retryer. + return aws.UnknownTernary // Delegate to configured Retryer. })) }, ), nil diff --git a/internal/service/ecr/service_endpoint_resolver_gen.go b/internal/service/ecr/service_endpoint_resolver_gen.go index 550251f394c..6972fecf3f7 100644 --- a/internal/service/ecr/service_endpoint_resolver_gen.go +++ b/internal/service/ecr/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - ecr_sdkv2 "github.com/aws/aws-sdk-go-v2/service/ecr" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/ecr" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ ecr_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ ecr.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver ecr_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver ecr.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: ecr_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: ecr.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params ecr_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params ecr.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params ecr_sdkv2.End tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up ecr endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params ecr_sdkv2.End return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*ecr_sdkv2.Options) { - return func(o *ecr_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*ecr.Options) { + return func(o *ecr.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/ecr/service_endpoints_gen_test.go b/internal/service/ecr/service_endpoints_gen_test.go index 7214dc03898..7d7229bfa3c 100644 --- a/internal/service/ecr/service_endpoints_gen_test.go +++ b/internal/service/ecr/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - ecr_sdkv2 "github.com/aws/aws-sdk-go-v2/service/ecr" + "github.com/aws/aws-sdk-go-v2/service/ecr" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := ecr_sdkv2.NewDefaultEndpointResolverV2() + r := ecr.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), ecr_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), ecr.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := ecr_sdkv2.NewDefaultEndpointResolverV2() + r := ecr.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), ecr_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), ecr.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.DescribeRepositories(ctx, &ecr_sdkv2.DescribeRepositoriesInput{}, - func(opts *ecr_sdkv2.Options) { + _, err := client.DescribeRepositories(ctx, &ecr.DescribeRepositoriesInput{}, + func(opts *ecr.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/ecr/service_package_gen.go b/internal/service/ecr/service_package_gen.go index 9a1f8e3ee2f..de5939cd70a 100644 --- a/internal/service/ecr/service_package_gen.go +++ b/internal/service/ecr/service_package_gen.go @@ -5,8 +5,8 @@ package ecr import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - ecr_sdkv2 "github.com/aws/aws-sdk-go-v2/service/ecr" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/ecr" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -117,11 +117,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*ecr_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*ecr.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return ecr_sdkv2.NewFromConfig(cfg, - ecr_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return ecr.NewFromConfig(cfg, + ecr.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/ecrpublic/service_endpoint_resolver_gen.go b/internal/service/ecrpublic/service_endpoint_resolver_gen.go index e87de1cf693..cd4451fc6e1 100644 --- a/internal/service/ecrpublic/service_endpoint_resolver_gen.go +++ b/internal/service/ecrpublic/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - ecrpublic_sdkv2 "github.com/aws/aws-sdk-go-v2/service/ecrpublic" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/ecrpublic" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ ecrpublic_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ ecrpublic.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver ecrpublic_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver ecrpublic.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: ecrpublic_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: ecrpublic.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params ecrpublic_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params ecrpublic.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params ecrpublic_sdk tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up ecrpublic endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params ecrpublic_sdk return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*ecrpublic_sdkv2.Options) { - return func(o *ecrpublic_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*ecrpublic.Options) { + return func(o *ecrpublic.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/ecrpublic/service_endpoints_gen_test.go b/internal/service/ecrpublic/service_endpoints_gen_test.go index 2c0c04a7777..b448239fdec 100644 --- a/internal/service/ecrpublic/service_endpoints_gen_test.go +++ b/internal/service/ecrpublic/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - ecrpublic_sdkv2 "github.com/aws/aws-sdk-go-v2/service/ecrpublic" + "github.com/aws/aws-sdk-go-v2/service/ecrpublic" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := ecrpublic_sdkv2.NewDefaultEndpointResolverV2() + r := ecrpublic.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), ecrpublic_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), ecrpublic.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := ecrpublic_sdkv2.NewDefaultEndpointResolverV2() + r := ecrpublic.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), ecrpublic_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), ecrpublic.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.DescribeRepositories(ctx, &ecrpublic_sdkv2.DescribeRepositoriesInput{}, - func(opts *ecrpublic_sdkv2.Options) { + _, err := client.DescribeRepositories(ctx, &ecrpublic.DescribeRepositoriesInput{}, + func(opts *ecrpublic.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/ecrpublic/service_package_gen.go b/internal/service/ecrpublic/service_package_gen.go index 6f3b96d38ff..9ba6c732241 100644 --- a/internal/service/ecrpublic/service_package_gen.go +++ b/internal/service/ecrpublic/service_package_gen.go @@ -5,8 +5,8 @@ package ecrpublic import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - ecrpublic_sdkv2 "github.com/aws/aws-sdk-go-v2/service/ecrpublic" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/ecrpublic" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -53,11 +53,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*ecrpublic_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*ecrpublic.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return ecrpublic_sdkv2.NewFromConfig(cfg, - ecrpublic_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return ecrpublic.NewFromConfig(cfg, + ecrpublic.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/ecs/service_endpoint_resolver_gen.go b/internal/service/ecs/service_endpoint_resolver_gen.go index ec77b1947f6..f880ad4df38 100644 --- a/internal/service/ecs/service_endpoint_resolver_gen.go +++ b/internal/service/ecs/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - ecs_sdkv2 "github.com/aws/aws-sdk-go-v2/service/ecs" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/ecs" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ ecs_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ ecs.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver ecs_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver ecs.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: ecs_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: ecs.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params ecs_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params ecs.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params ecs_sdkv2.End tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up ecs endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params ecs_sdkv2.End return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*ecs_sdkv2.Options) { - return func(o *ecs_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*ecs.Options) { + return func(o *ecs.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/ecs/service_endpoints_gen_test.go b/internal/service/ecs/service_endpoints_gen_test.go index d8f5b1c4d49..6a1fdeb5170 100644 --- a/internal/service/ecs/service_endpoints_gen_test.go +++ b/internal/service/ecs/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - ecs_sdkv2 "github.com/aws/aws-sdk-go-v2/service/ecs" + "github.com/aws/aws-sdk-go-v2/service/ecs" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := ecs_sdkv2.NewDefaultEndpointResolverV2() + r := ecs.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), ecs_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), ecs.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := ecs_sdkv2.NewDefaultEndpointResolverV2() + r := ecs.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), ecs_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), ecs.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListClusters(ctx, &ecs_sdkv2.ListClustersInput{}, - func(opts *ecs_sdkv2.Options) { + _, err := client.ListClusters(ctx, &ecs.ListClustersInput{}, + func(opts *ecs.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/ecs/service_package_gen.go b/internal/service/ecs/service_package_gen.go index 40b04aa3e44..2f7209cc925 100644 --- a/internal/service/ecs/service_package_gen.go +++ b/internal/service/ecs/service_package_gen.go @@ -5,8 +5,8 @@ package ecs import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - ecs_sdkv2 "github.com/aws/aws-sdk-go-v2/service/ecs" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/ecs" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -119,11 +119,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*ecs_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*ecs.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return ecs_sdkv2.NewFromConfig(cfg, - ecs_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return ecs.NewFromConfig(cfg, + ecs.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/efs/service_endpoint_resolver_gen.go b/internal/service/efs/service_endpoint_resolver_gen.go index 266db9695a0..b93f94c9ed2 100644 --- a/internal/service/efs/service_endpoint_resolver_gen.go +++ b/internal/service/efs/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - efs_sdkv2 "github.com/aws/aws-sdk-go-v2/service/efs" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/efs" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ efs_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ efs.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver efs_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver efs.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: efs_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: efs.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params efs_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params efs.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params efs_sdkv2.End tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up efs endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params efs_sdkv2.End return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*efs_sdkv2.Options) { - return func(o *efs_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*efs.Options) { + return func(o *efs.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/efs/service_endpoints_gen_test.go b/internal/service/efs/service_endpoints_gen_test.go index 67185cbe077..0ef947028ad 100644 --- a/internal/service/efs/service_endpoints_gen_test.go +++ b/internal/service/efs/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - efs_sdkv2 "github.com/aws/aws-sdk-go-v2/service/efs" + "github.com/aws/aws-sdk-go-v2/service/efs" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := efs_sdkv2.NewDefaultEndpointResolverV2() + r := efs.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), efs_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), efs.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := efs_sdkv2.NewDefaultEndpointResolverV2() + r := efs.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), efs_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), efs.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.DescribeFileSystems(ctx, &efs_sdkv2.DescribeFileSystemsInput{}, - func(opts *efs_sdkv2.Options) { + _, err := client.DescribeFileSystems(ctx, &efs.DescribeFileSystemsInput{}, + func(opts *efs.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/efs/service_package_gen.go b/internal/service/efs/service_package_gen.go index 944de84393e..594403f754f 100644 --- a/internal/service/efs/service_package_gen.go +++ b/internal/service/efs/service_package_gen.go @@ -5,8 +5,8 @@ package efs import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - efs_sdkv2 "github.com/aws/aws-sdk-go-v2/service/efs" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/efs" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -95,11 +95,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*efs_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*efs.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return efs_sdkv2.NewFromConfig(cfg, - efs_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return efs.NewFromConfig(cfg, + efs.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/eks/service_endpoint_resolver_gen.go b/internal/service/eks/service_endpoint_resolver_gen.go index ac68cc8cc13..d215dccbe68 100644 --- a/internal/service/eks/service_endpoint_resolver_gen.go +++ b/internal/service/eks/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - eks_sdkv2 "github.com/aws/aws-sdk-go-v2/service/eks" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/eks" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ eks_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ eks.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver eks_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver eks.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: eks_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: eks.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params eks_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params eks.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params eks_sdkv2.End tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up eks endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params eks_sdkv2.End return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*eks_sdkv2.Options) { - return func(o *eks_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*eks.Options) { + return func(o *eks.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/eks/service_endpoints_gen_test.go b/internal/service/eks/service_endpoints_gen_test.go index ddb83f4241a..1181e9c6b6a 100644 --- a/internal/service/eks/service_endpoints_gen_test.go +++ b/internal/service/eks/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - eks_sdkv2 "github.com/aws/aws-sdk-go-v2/service/eks" + "github.com/aws/aws-sdk-go-v2/service/eks" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := eks_sdkv2.NewDefaultEndpointResolverV2() + r := eks.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), eks_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), eks.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := eks_sdkv2.NewDefaultEndpointResolverV2() + r := eks.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), eks_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), eks.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListClusters(ctx, &eks_sdkv2.ListClustersInput{}, - func(opts *eks_sdkv2.Options) { + _, err := client.ListClusters(ctx, &eks.ListClustersInput{}, + func(opts *eks.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/eks/service_package_gen.go b/internal/service/eks/service_package_gen.go index bfb87d2f2bf..c2d15e9b7d0 100644 --- a/internal/service/eks/service_package_gen.go +++ b/internal/service/eks/service_package_gen.go @@ -5,8 +5,8 @@ package eks import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - eks_sdkv2 "github.com/aws/aws-sdk-go-v2/service/eks" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/eks" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -131,11 +131,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*eks_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*eks.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return eks_sdkv2.NewFromConfig(cfg, - eks_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return eks.NewFromConfig(cfg, + eks.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/elasticache/service_endpoint_resolver_gen.go b/internal/service/elasticache/service_endpoint_resolver_gen.go index b29997cfee0..0107c53b19f 100644 --- a/internal/service/elasticache/service_endpoint_resolver_gen.go +++ b/internal/service/elasticache/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - elasticache_sdkv2 "github.com/aws/aws-sdk-go-v2/service/elasticache" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/elasticache" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ elasticache_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ elasticache.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver elasticache_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver elasticache.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: elasticache_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: elasticache.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params elasticache_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params elasticache.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params elasticache_s tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up elasticache endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params elasticache_s return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*elasticache_sdkv2.Options) { - return func(o *elasticache_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*elasticache.Options) { + return func(o *elasticache.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/elasticache/service_endpoints_gen_test.go b/internal/service/elasticache/service_endpoints_gen_test.go index f9f6fbf2f3c..66561e6c6f0 100644 --- a/internal/service/elasticache/service_endpoints_gen_test.go +++ b/internal/service/elasticache/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - elasticache_sdkv2 "github.com/aws/aws-sdk-go-v2/service/elasticache" + "github.com/aws/aws-sdk-go-v2/service/elasticache" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := elasticache_sdkv2.NewDefaultEndpointResolverV2() + r := elasticache.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), elasticache_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), elasticache.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := elasticache_sdkv2.NewDefaultEndpointResolverV2() + r := elasticache.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), elasticache_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), elasticache.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.DescribeCacheClusters(ctx, &elasticache_sdkv2.DescribeCacheClustersInput{}, - func(opts *elasticache_sdkv2.Options) { + _, err := client.DescribeCacheClusters(ctx, &elasticache.DescribeCacheClustersInput{}, + func(opts *elasticache.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/elasticache/service_package_gen.go b/internal/service/elasticache/service_package_gen.go index 2ea57007af2..3c02c390dd9 100644 --- a/internal/service/elasticache/service_package_gen.go +++ b/internal/service/elasticache/service_package_gen.go @@ -5,8 +5,8 @@ package elasticache import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - elasticache_sdkv2 "github.com/aws/aws-sdk-go-v2/service/elasticache" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/elasticache" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -137,11 +137,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*elasticache_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*elasticache.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return elasticache_sdkv2.NewFromConfig(cfg, - elasticache_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return elasticache.NewFromConfig(cfg, + elasticache.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/elasticbeanstalk/service_endpoint_resolver_gen.go b/internal/service/elasticbeanstalk/service_endpoint_resolver_gen.go index c80d6aa11e4..5d2f46016fa 100644 --- a/internal/service/elasticbeanstalk/service_endpoint_resolver_gen.go +++ b/internal/service/elasticbeanstalk/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - elasticbeanstalk_sdkv2 "github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ elasticbeanstalk_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ elasticbeanstalk.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver elasticbeanstalk_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver elasticbeanstalk.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: elasticbeanstalk_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: elasticbeanstalk.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params elasticbeanstalk_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params elasticbeanstalk.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params elasticbeanst tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up elasticbeanstalk endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params elasticbeanst return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*elasticbeanstalk_sdkv2.Options) { - return func(o *elasticbeanstalk_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*elasticbeanstalk.Options) { + return func(o *elasticbeanstalk.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/elasticbeanstalk/service_endpoints_gen_test.go b/internal/service/elasticbeanstalk/service_endpoints_gen_test.go index bce935c1337..8f970bb66f2 100644 --- a/internal/service/elasticbeanstalk/service_endpoints_gen_test.go +++ b/internal/service/elasticbeanstalk/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - elasticbeanstalk_sdkv2 "github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk" + "github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -296,10 +296,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := elasticbeanstalk_sdkv2.NewDefaultEndpointResolverV2() + r := elasticbeanstalk.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), elasticbeanstalk_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), elasticbeanstalk.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -313,11 +313,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := elasticbeanstalk_sdkv2.NewDefaultEndpointResolverV2() + r := elasticbeanstalk.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), elasticbeanstalk_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), elasticbeanstalk.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -337,8 +337,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListAvailableSolutionStacks(ctx, &elasticbeanstalk_sdkv2.ListAvailableSolutionStacksInput{}, - func(opts *elasticbeanstalk_sdkv2.Options) { + _, err := client.ListAvailableSolutionStacks(ctx, &elasticbeanstalk.ListAvailableSolutionStacksInput{}, + func(opts *elasticbeanstalk.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/elasticbeanstalk/service_package_gen.go b/internal/service/elasticbeanstalk/service_package_gen.go index c431ec6a190..bbcbd50bd26 100644 --- a/internal/service/elasticbeanstalk/service_package_gen.go +++ b/internal/service/elasticbeanstalk/service_package_gen.go @@ -5,8 +5,8 @@ package elasticbeanstalk import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - elasticbeanstalk_sdkv2 "github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -80,11 +80,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*elasticbeanstalk_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*elasticbeanstalk.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return elasticbeanstalk_sdkv2.NewFromConfig(cfg, - elasticbeanstalk_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return elasticbeanstalk.NewFromConfig(cfg, + elasticbeanstalk.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/elasticsearch/service_endpoint_resolver_gen.go b/internal/service/elasticsearch/service_endpoint_resolver_gen.go index 5c0d13000e1..91b9cc230e3 100644 --- a/internal/service/elasticsearch/service_endpoint_resolver_gen.go +++ b/internal/service/elasticsearch/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - elasticsearchservice_sdkv2 "github.com/aws/aws-sdk-go-v2/service/elasticsearchservice" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/elasticsearchservice" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ elasticsearchservice_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ elasticsearchservice.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver elasticsearchservice_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver elasticsearchservice.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: elasticsearchservice_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: elasticsearchservice.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params elasticsearchservice_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params elasticsearchservice.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params elasticsearch tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up elasticsearchservice endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params elasticsearch return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*elasticsearchservice_sdkv2.Options) { - return func(o *elasticsearchservice_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*elasticsearchservice.Options) { + return func(o *elasticsearchservice.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/elasticsearch/service_endpoints_gen_test.go b/internal/service/elasticsearch/service_endpoints_gen_test.go index 128ae41472a..62aed15f32e 100644 --- a/internal/service/elasticsearch/service_endpoints_gen_test.go +++ b/internal/service/elasticsearch/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - elasticsearchservice_sdkv2 "github.com/aws/aws-sdk-go-v2/service/elasticsearchservice" + "github.com/aws/aws-sdk-go-v2/service/elasticsearchservice" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -355,10 +355,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := elasticsearchservice_sdkv2.NewDefaultEndpointResolverV2() + r := elasticsearchservice.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), elasticsearchservice_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), elasticsearchservice.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -372,11 +372,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := elasticsearchservice_sdkv2.NewDefaultEndpointResolverV2() + r := elasticsearchservice.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), elasticsearchservice_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), elasticsearchservice.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -396,8 +396,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListDomainNames(ctx, &elasticsearchservice_sdkv2.ListDomainNamesInput{}, - func(opts *elasticsearchservice_sdkv2.Options) { + _, err := client.ListDomainNames(ctx, &elasticsearchservice.ListDomainNamesInput{}, + func(opts *elasticsearchservice.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/elasticsearch/service_package_gen.go b/internal/service/elasticsearch/service_package_gen.go index b10afe5c8ba..1ac618e37bf 100644 --- a/internal/service/elasticsearch/service_package_gen.go +++ b/internal/service/elasticsearch/service_package_gen.go @@ -5,8 +5,8 @@ package elasticsearch import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - elasticsearchservice_sdkv2 "github.com/aws/aws-sdk-go-v2/service/elasticsearchservice" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/elasticsearchservice" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -65,11 +65,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*elasticsearchservice_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*elasticsearchservice.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return elasticsearchservice_sdkv2.NewFromConfig(cfg, - elasticsearchservice_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return elasticsearchservice.NewFromConfig(cfg, + elasticsearchservice.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/elastictranscoder/service_endpoint_resolver_gen.go b/internal/service/elastictranscoder/service_endpoint_resolver_gen.go index 5f2459b54e7..71db42be00d 100644 --- a/internal/service/elastictranscoder/service_endpoint_resolver_gen.go +++ b/internal/service/elastictranscoder/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - elastictranscoder_sdkv2 "github.com/aws/aws-sdk-go-v2/service/elastictranscoder" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/elastictranscoder" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ elastictranscoder_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ elastictranscoder.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver elastictranscoder_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver elastictranscoder.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: elastictranscoder_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: elastictranscoder.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params elastictranscoder_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params elastictranscoder.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params elastictransc tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up elastictranscoder endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params elastictransc return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*elastictranscoder_sdkv2.Options) { - return func(o *elastictranscoder_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*elastictranscoder.Options) { + return func(o *elastictranscoder.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/elastictranscoder/service_endpoints_gen_test.go b/internal/service/elastictranscoder/service_endpoints_gen_test.go index a2c2b36bc0b..3a575e20f22 100644 --- a/internal/service/elastictranscoder/service_endpoints_gen_test.go +++ b/internal/service/elastictranscoder/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - elastictranscoder_sdkv2 "github.com/aws/aws-sdk-go-v2/service/elastictranscoder" + "github.com/aws/aws-sdk-go-v2/service/elastictranscoder" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := elastictranscoder_sdkv2.NewDefaultEndpointResolverV2() + r := elastictranscoder.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), elastictranscoder_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), elastictranscoder.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := elastictranscoder_sdkv2.NewDefaultEndpointResolverV2() + r := elastictranscoder.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), elastictranscoder_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), elastictranscoder.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListPipelines(ctx, &elastictranscoder_sdkv2.ListPipelinesInput{}, - func(opts *elastictranscoder_sdkv2.Options) { + _, err := client.ListPipelines(ctx, &elastictranscoder.ListPipelinesInput{}, + func(opts *elastictranscoder.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/elastictranscoder/service_package_gen.go b/internal/service/elastictranscoder/service_package_gen.go index 44fafe2fcfe..6eccbc9bbc7 100644 --- a/internal/service/elastictranscoder/service_package_gen.go +++ b/internal/service/elastictranscoder/service_package_gen.go @@ -5,8 +5,8 @@ package elastictranscoder import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - elastictranscoder_sdkv2 "github.com/aws/aws-sdk-go-v2/service/elastictranscoder" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/elastictranscoder" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -44,11 +44,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*elastictranscoder_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*elastictranscoder.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return elastictranscoder_sdkv2.NewFromConfig(cfg, - elastictranscoder_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return elastictranscoder.NewFromConfig(cfg, + elastictranscoder.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/elb/service_endpoint_resolver_gen.go b/internal/service/elb/service_endpoint_resolver_gen.go index 941c5efd895..4e13fe085f5 100644 --- a/internal/service/elb/service_endpoint_resolver_gen.go +++ b/internal/service/elb/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - elasticloadbalancing_sdkv2 "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ elasticloadbalancing_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ elasticloadbalancing.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver elasticloadbalancing_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver elasticloadbalancing.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: elasticloadbalancing_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: elasticloadbalancing.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params elasticloadbalancing_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params elasticloadbalancing.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params elasticloadba tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up elasticloadbalancing endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params elasticloadba return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*elasticloadbalancing_sdkv2.Options) { - return func(o *elasticloadbalancing_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*elasticloadbalancing.Options) { + return func(o *elasticloadbalancing.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/elb/service_endpoints_gen_test.go b/internal/service/elb/service_endpoints_gen_test.go index 07f62c2343d..aeae5bc8f16 100644 --- a/internal/service/elb/service_endpoints_gen_test.go +++ b/internal/service/elb/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - elasticloadbalancing_sdkv2 "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing" + "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -296,10 +296,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := elasticloadbalancing_sdkv2.NewDefaultEndpointResolverV2() + r := elasticloadbalancing.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), elasticloadbalancing_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), elasticloadbalancing.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -313,11 +313,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := elasticloadbalancing_sdkv2.NewDefaultEndpointResolverV2() + r := elasticloadbalancing.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), elasticloadbalancing_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), elasticloadbalancing.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -337,8 +337,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.DescribeLoadBalancers(ctx, &elasticloadbalancing_sdkv2.DescribeLoadBalancersInput{}, - func(opts *elasticloadbalancing_sdkv2.Options) { + _, err := client.DescribeLoadBalancers(ctx, &elasticloadbalancing.DescribeLoadBalancersInput{}, + func(opts *elasticloadbalancing.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/elb/service_package_gen.go b/internal/service/elb/service_package_gen.go index b4a6313e238..aef415bff18 100644 --- a/internal/service/elb/service_package_gen.go +++ b/internal/service/elb/service_package_gen.go @@ -5,8 +5,8 @@ package elb import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - elasticloadbalancing_sdkv2 "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -100,11 +100,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*elasticloadbalancing_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*elasticloadbalancing.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return elasticloadbalancing_sdkv2.NewFromConfig(cfg, - elasticloadbalancing_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return elasticloadbalancing.NewFromConfig(cfg, + elasticloadbalancing.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/elbv2/service_endpoint_resolver_gen.go b/internal/service/elbv2/service_endpoint_resolver_gen.go index d1a1bde0233..aef72ee0d25 100644 --- a/internal/service/elbv2/service_endpoint_resolver_gen.go +++ b/internal/service/elbv2/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - elasticloadbalancingv2_sdkv2 "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ elasticloadbalancingv2_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ elasticloadbalancingv2.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver elasticloadbalancingv2_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver elasticloadbalancingv2.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: elasticloadbalancingv2_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: elasticloadbalancingv2.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params elasticloadbalancingv2_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params elasticloadbalancingv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params elasticloadba tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up elasticloadbalancingv2 endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params elasticloadba return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*elasticloadbalancingv2_sdkv2.Options) { - return func(o *elasticloadbalancingv2_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*elasticloadbalancingv2.Options) { + return func(o *elasticloadbalancingv2.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/elbv2/service_endpoints_gen_test.go b/internal/service/elbv2/service_endpoints_gen_test.go index f544d94e505..3ba453dd8d8 100644 --- a/internal/service/elbv2/service_endpoints_gen_test.go +++ b/internal/service/elbv2/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - elasticloadbalancingv2_sdkv2 "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2" + "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -296,10 +296,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := elasticloadbalancingv2_sdkv2.NewDefaultEndpointResolverV2() + r := elasticloadbalancingv2.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), elasticloadbalancingv2_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), elasticloadbalancingv2.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -313,11 +313,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := elasticloadbalancingv2_sdkv2.NewDefaultEndpointResolverV2() + r := elasticloadbalancingv2.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), elasticloadbalancingv2_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), elasticloadbalancingv2.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -337,8 +337,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.DescribeLoadBalancers(ctx, &elasticloadbalancingv2_sdkv2.DescribeLoadBalancersInput{}, - func(opts *elasticloadbalancingv2_sdkv2.Options) { + _, err := client.DescribeLoadBalancers(ctx, &elasticloadbalancingv2.DescribeLoadBalancersInput{}, + func(opts *elasticloadbalancingv2.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/elbv2/service_package_gen.go b/internal/service/elbv2/service_package_gen.go index d292fbcf200..0f6c79d96d4 100644 --- a/internal/service/elbv2/service_package_gen.go +++ b/internal/service/elbv2/service_package_gen.go @@ -5,8 +5,8 @@ package elbv2 import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - elasticloadbalancingv2_sdkv2 "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -197,11 +197,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*elasticloadbalancingv2_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*elasticloadbalancingv2.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return elasticloadbalancingv2_sdkv2.NewFromConfig(cfg, - elasticloadbalancingv2_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return elasticloadbalancingv2.NewFromConfig(cfg, + elasticloadbalancingv2.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/emr/service_endpoint_resolver_gen.go b/internal/service/emr/service_endpoint_resolver_gen.go index 33c970d203a..843bfa64b18 100644 --- a/internal/service/emr/service_endpoint_resolver_gen.go +++ b/internal/service/emr/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - emr_sdkv2 "github.com/aws/aws-sdk-go-v2/service/emr" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/emr" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ emr_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ emr.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver emr_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver emr.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: emr_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: emr.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params emr_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params emr.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params emr_sdkv2.End tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up emr endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params emr_sdkv2.End return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*emr_sdkv2.Options) { - return func(o *emr_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*emr.Options) { + return func(o *emr.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/emr/service_endpoints_gen_test.go b/internal/service/emr/service_endpoints_gen_test.go index a8e2b7d2b85..53e39f5f9a5 100644 --- a/internal/service/emr/service_endpoints_gen_test.go +++ b/internal/service/emr/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - emr_sdkv2 "github.com/aws/aws-sdk-go-v2/service/emr" + "github.com/aws/aws-sdk-go-v2/service/emr" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := emr_sdkv2.NewDefaultEndpointResolverV2() + r := emr.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), emr_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), emr.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := emr_sdkv2.NewDefaultEndpointResolverV2() + r := emr.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), emr_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), emr.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListClusters(ctx, &emr_sdkv2.ListClustersInput{}, - func(opts *emr_sdkv2.Options) { + _, err := client.ListClusters(ctx, &emr.ListClustersInput{}, + func(opts *emr.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/emr/service_package_gen.go b/internal/service/emr/service_package_gen.go index 51119aaee74..d76211b4681 100644 --- a/internal/service/emr/service_package_gen.go +++ b/internal/service/emr/service_package_gen.go @@ -5,8 +5,8 @@ package emr import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - emr_sdkv2 "github.com/aws/aws-sdk-go-v2/service/emr" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/emr" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -93,11 +93,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*emr_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*emr.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return emr_sdkv2.NewFromConfig(cfg, - emr_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return emr.NewFromConfig(cfg, + emr.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/emrcontainers/service_endpoint_resolver_gen.go b/internal/service/emrcontainers/service_endpoint_resolver_gen.go index 2836eabb49a..3e8dbe529d8 100644 --- a/internal/service/emrcontainers/service_endpoint_resolver_gen.go +++ b/internal/service/emrcontainers/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - emrcontainers_sdkv2 "github.com/aws/aws-sdk-go-v2/service/emrcontainers" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/emrcontainers" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ emrcontainers_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ emrcontainers.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver emrcontainers_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver emrcontainers.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: emrcontainers_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: emrcontainers.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params emrcontainers_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params emrcontainers.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params emrcontainers tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up emrcontainers endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params emrcontainers return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*emrcontainers_sdkv2.Options) { - return func(o *emrcontainers_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*emrcontainers.Options) { + return func(o *emrcontainers.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/emrcontainers/service_endpoints_gen_test.go b/internal/service/emrcontainers/service_endpoints_gen_test.go index ef6063baf87..175758645a7 100644 --- a/internal/service/emrcontainers/service_endpoints_gen_test.go +++ b/internal/service/emrcontainers/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - emrcontainers_sdkv2 "github.com/aws/aws-sdk-go-v2/service/emrcontainers" + "github.com/aws/aws-sdk-go-v2/service/emrcontainers" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := emrcontainers_sdkv2.NewDefaultEndpointResolverV2() + r := emrcontainers.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), emrcontainers_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), emrcontainers.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := emrcontainers_sdkv2.NewDefaultEndpointResolverV2() + r := emrcontainers.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), emrcontainers_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), emrcontainers.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListVirtualClusters(ctx, &emrcontainers_sdkv2.ListVirtualClustersInput{}, - func(opts *emrcontainers_sdkv2.Options) { + _, err := client.ListVirtualClusters(ctx, &emrcontainers.ListVirtualClustersInput{}, + func(opts *emrcontainers.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/emrcontainers/service_package_gen.go b/internal/service/emrcontainers/service_package_gen.go index 87ce0530473..74f9f8a6691 100644 --- a/internal/service/emrcontainers/service_package_gen.go +++ b/internal/service/emrcontainers/service_package_gen.go @@ -5,8 +5,8 @@ package emrcontainers import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - emrcontainers_sdkv2 "github.com/aws/aws-sdk-go-v2/service/emrcontainers" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/emrcontainers" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -59,11 +59,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*emrcontainers_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*emrcontainers.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return emrcontainers_sdkv2.NewFromConfig(cfg, - emrcontainers_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return emrcontainers.NewFromConfig(cfg, + emrcontainers.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/emrserverless/service_endpoint_resolver_gen.go b/internal/service/emrserverless/service_endpoint_resolver_gen.go index 1e5a0a357fc..b0171333e23 100644 --- a/internal/service/emrserverless/service_endpoint_resolver_gen.go +++ b/internal/service/emrserverless/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - emrserverless_sdkv2 "github.com/aws/aws-sdk-go-v2/service/emrserverless" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/emrserverless" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ emrserverless_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ emrserverless.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver emrserverless_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver emrserverless.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: emrserverless_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: emrserverless.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params emrserverless_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params emrserverless.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params emrserverless tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up emrserverless endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params emrserverless return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*emrserverless_sdkv2.Options) { - return func(o *emrserverless_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*emrserverless.Options) { + return func(o *emrserverless.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/emrserverless/service_endpoints_gen_test.go b/internal/service/emrserverless/service_endpoints_gen_test.go index c8a387c4898..9ed185d27b9 100644 --- a/internal/service/emrserverless/service_endpoints_gen_test.go +++ b/internal/service/emrserverless/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - emrserverless_sdkv2 "github.com/aws/aws-sdk-go-v2/service/emrserverless" + "github.com/aws/aws-sdk-go-v2/service/emrserverless" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := emrserverless_sdkv2.NewDefaultEndpointResolverV2() + r := emrserverless.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), emrserverless_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), emrserverless.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := emrserverless_sdkv2.NewDefaultEndpointResolverV2() + r := emrserverless.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), emrserverless_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), emrserverless.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListApplications(ctx, &emrserverless_sdkv2.ListApplicationsInput{}, - func(opts *emrserverless_sdkv2.Options) { + _, err := client.ListApplications(ctx, &emrserverless.ListApplicationsInput{}, + func(opts *emrserverless.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/emrserverless/service_package_gen.go b/internal/service/emrserverless/service_package_gen.go index 92fdfd78ebd..a62d944cfb8 100644 --- a/internal/service/emrserverless/service_package_gen.go +++ b/internal/service/emrserverless/service_package_gen.go @@ -5,8 +5,8 @@ package emrserverless import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - emrserverless_sdkv2 "github.com/aws/aws-sdk-go-v2/service/emrserverless" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/emrserverless" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -44,11 +44,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*emrserverless_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*emrserverless.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return emrserverless_sdkv2.NewFromConfig(cfg, - emrserverless_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return emrserverless.NewFromConfig(cfg, + emrserverless.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/events/service_endpoint_resolver_gen.go b/internal/service/events/service_endpoint_resolver_gen.go index 3506ec51991..cc56d8d1edd 100644 --- a/internal/service/events/service_endpoint_resolver_gen.go +++ b/internal/service/events/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - eventbridge_sdkv2 "github.com/aws/aws-sdk-go-v2/service/eventbridge" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/eventbridge" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ eventbridge_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ eventbridge.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver eventbridge_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver eventbridge.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: eventbridge_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: eventbridge.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params eventbridge_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params eventbridge.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params eventbridge_s tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up eventbridge endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params eventbridge_s return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*eventbridge_sdkv2.Options) { - return func(o *eventbridge_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*eventbridge.Options) { + return func(o *eventbridge.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/events/service_endpoints_gen_test.go b/internal/service/events/service_endpoints_gen_test.go index 7c3cbea66b0..afff382f21f 100644 --- a/internal/service/events/service_endpoints_gen_test.go +++ b/internal/service/events/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - eventbridge_sdkv2 "github.com/aws/aws-sdk-go-v2/service/eventbridge" + "github.com/aws/aws-sdk-go-v2/service/eventbridge" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -355,10 +355,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := eventbridge_sdkv2.NewDefaultEndpointResolverV2() + r := eventbridge.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), eventbridge_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), eventbridge.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -372,11 +372,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := eventbridge_sdkv2.NewDefaultEndpointResolverV2() + r := eventbridge.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), eventbridge_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), eventbridge.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -396,8 +396,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListEventBuses(ctx, &eventbridge_sdkv2.ListEventBusesInput{}, - func(opts *eventbridge_sdkv2.Options) { + _, err := client.ListEventBuses(ctx, &eventbridge.ListEventBusesInput{}, + func(opts *eventbridge.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/events/service_package_gen.go b/internal/service/events/service_package_gen.go index e0cca987a99..bf9da7c0029 100644 --- a/internal/service/events/service_package_gen.go +++ b/internal/service/events/service_package_gen.go @@ -5,8 +5,8 @@ package events import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - eventbridge_sdkv2 "github.com/aws/aws-sdk-go-v2/service/eventbridge" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/eventbridge" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -103,11 +103,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*eventbridge_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*eventbridge.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return eventbridge_sdkv2.NewFromConfig(cfg, - eventbridge_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return eventbridge.NewFromConfig(cfg, + eventbridge.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/evidently/service_endpoint_resolver_gen.go b/internal/service/evidently/service_endpoint_resolver_gen.go index ef4156707ad..efe21cf9bf5 100644 --- a/internal/service/evidently/service_endpoint_resolver_gen.go +++ b/internal/service/evidently/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - evidently_sdkv2 "github.com/aws/aws-sdk-go-v2/service/evidently" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/evidently" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ evidently_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ evidently.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver evidently_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver evidently.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: evidently_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: evidently.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params evidently_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params evidently.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params evidently_sdk tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up evidently endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params evidently_sdk return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*evidently_sdkv2.Options) { - return func(o *evidently_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*evidently.Options) { + return func(o *evidently.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/evidently/service_endpoints_gen_test.go b/internal/service/evidently/service_endpoints_gen_test.go index 2b88aef55be..c0afa167f98 100644 --- a/internal/service/evidently/service_endpoints_gen_test.go +++ b/internal/service/evidently/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - evidently_sdkv2 "github.com/aws/aws-sdk-go-v2/service/evidently" + "github.com/aws/aws-sdk-go-v2/service/evidently" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -296,10 +296,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := evidently_sdkv2.NewDefaultEndpointResolverV2() + r := evidently.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), evidently_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), evidently.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -313,11 +313,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := evidently_sdkv2.NewDefaultEndpointResolverV2() + r := evidently.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), evidently_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), evidently.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -337,8 +337,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListProjects(ctx, &evidently_sdkv2.ListProjectsInput{}, - func(opts *evidently_sdkv2.Options) { + _, err := client.ListProjects(ctx, &evidently.ListProjectsInput{}, + func(opts *evidently.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/evidently/service_package_gen.go b/internal/service/evidently/service_package_gen.go index df2ecbd1b68..c436328af73 100644 --- a/internal/service/evidently/service_package_gen.go +++ b/internal/service/evidently/service_package_gen.go @@ -5,8 +5,8 @@ package evidently import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - evidently_sdkv2 "github.com/aws/aws-sdk-go-v2/service/evidently" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/evidently" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -68,11 +68,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*evidently_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*evidently.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return evidently_sdkv2.NewFromConfig(cfg, - evidently_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return evidently.NewFromConfig(cfg, + evidently.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/finspace/service_endpoint_resolver_gen.go b/internal/service/finspace/service_endpoint_resolver_gen.go index ee6aad2fed0..1080bd32b97 100644 --- a/internal/service/finspace/service_endpoint_resolver_gen.go +++ b/internal/service/finspace/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - finspace_sdkv2 "github.com/aws/aws-sdk-go-v2/service/finspace" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/finspace" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ finspace_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ finspace.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver finspace_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver finspace.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: finspace_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: finspace.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params finspace_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params finspace.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params finspace_sdkv tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up finspace endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params finspace_sdkv return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*finspace_sdkv2.Options) { - return func(o *finspace_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*finspace.Options) { + return func(o *finspace.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/finspace/service_endpoints_gen_test.go b/internal/service/finspace/service_endpoints_gen_test.go index 7a2590b69ce..98e53cb5923 100644 --- a/internal/service/finspace/service_endpoints_gen_test.go +++ b/internal/service/finspace/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - finspace_sdkv2 "github.com/aws/aws-sdk-go-v2/service/finspace" + "github.com/aws/aws-sdk-go-v2/service/finspace" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := finspace_sdkv2.NewDefaultEndpointResolverV2() + r := finspace.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), finspace_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), finspace.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := finspace_sdkv2.NewDefaultEndpointResolverV2() + r := finspace.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), finspace_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), finspace.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListEnvironments(ctx, &finspace_sdkv2.ListEnvironmentsInput{}, - func(opts *finspace_sdkv2.Options) { + _, err := client.ListEnvironments(ctx, &finspace.ListEnvironmentsInput{}, + func(opts *finspace.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/finspace/service_package_gen.go b/internal/service/finspace/service_package_gen.go index a08f0926312..4f3aed4b9e0 100644 --- a/internal/service/finspace/service_package_gen.go +++ b/internal/service/finspace/service_package_gen.go @@ -5,8 +5,8 @@ package finspace import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - finspace_sdkv2 "github.com/aws/aws-sdk-go-v2/service/finspace" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/finspace" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -92,11 +92,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*finspace_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*finspace.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return finspace_sdkv2.NewFromConfig(cfg, - finspace_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return finspace.NewFromConfig(cfg, + finspace.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/firehose/service_endpoint_resolver_gen.go b/internal/service/firehose/service_endpoint_resolver_gen.go index 35ce6c8e9cf..87ec0ff2b92 100644 --- a/internal/service/firehose/service_endpoint_resolver_gen.go +++ b/internal/service/firehose/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - firehose_sdkv2 "github.com/aws/aws-sdk-go-v2/service/firehose" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/firehose" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ firehose_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ firehose.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver firehose_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver firehose.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: firehose_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: firehose.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params firehose_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params firehose.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params firehose_sdkv tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up firehose endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params firehose_sdkv return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*firehose_sdkv2.Options) { - return func(o *firehose_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*firehose.Options) { + return func(o *firehose.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/firehose/service_endpoints_gen_test.go b/internal/service/firehose/service_endpoints_gen_test.go index 67a07dd0d05..e5ce88f6d37 100644 --- a/internal/service/firehose/service_endpoints_gen_test.go +++ b/internal/service/firehose/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - firehose_sdkv2 "github.com/aws/aws-sdk-go-v2/service/firehose" + "github.com/aws/aws-sdk-go-v2/service/firehose" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := firehose_sdkv2.NewDefaultEndpointResolverV2() + r := firehose.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), firehose_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), firehose.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := firehose_sdkv2.NewDefaultEndpointResolverV2() + r := firehose.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), firehose_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), firehose.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListDeliveryStreams(ctx, &firehose_sdkv2.ListDeliveryStreamsInput{}, - func(opts *firehose_sdkv2.Options) { + _, err := client.ListDeliveryStreams(ctx, &firehose.ListDeliveryStreamsInput{}, + func(opts *firehose.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/firehose/service_package_gen.go b/internal/service/firehose/service_package_gen.go index b1de02419a0..3b2521b641c 100644 --- a/internal/service/firehose/service_package_gen.go +++ b/internal/service/firehose/service_package_gen.go @@ -5,8 +5,8 @@ package firehose import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - firehose_sdkv2 "github.com/aws/aws-sdk-go-v2/service/firehose" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/firehose" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -49,11 +49,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*firehose_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*firehose.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return firehose_sdkv2.NewFromConfig(cfg, - firehose_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return firehose.NewFromConfig(cfg, + firehose.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/fis/service_endpoint_resolver_gen.go b/internal/service/fis/service_endpoint_resolver_gen.go index 7d0816e8673..c989684206d 100644 --- a/internal/service/fis/service_endpoint_resolver_gen.go +++ b/internal/service/fis/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - fis_sdkv2 "github.com/aws/aws-sdk-go-v2/service/fis" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/fis" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ fis_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ fis.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver fis_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver fis.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: fis_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: fis.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params fis_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params fis.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params fis_sdkv2.End tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up fis endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params fis_sdkv2.End return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*fis_sdkv2.Options) { - return func(o *fis_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*fis.Options) { + return func(o *fis.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/fis/service_endpoints_gen_test.go b/internal/service/fis/service_endpoints_gen_test.go index 3fe468cafc2..9cf07d653af 100644 --- a/internal/service/fis/service_endpoints_gen_test.go +++ b/internal/service/fis/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - fis_sdkv2 "github.com/aws/aws-sdk-go-v2/service/fis" + "github.com/aws/aws-sdk-go-v2/service/fis" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := fis_sdkv2.NewDefaultEndpointResolverV2() + r := fis.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), fis_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), fis.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := fis_sdkv2.NewDefaultEndpointResolverV2() + r := fis.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), fis_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), fis.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListExperiments(ctx, &fis_sdkv2.ListExperimentsInput{}, - func(opts *fis_sdkv2.Options) { + _, err := client.ListExperiments(ctx, &fis.ListExperimentsInput{}, + func(opts *fis.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/fis/service_package_gen.go b/internal/service/fis/service_package_gen.go index b8305e06a87..185784846ce 100644 --- a/internal/service/fis/service_package_gen.go +++ b/internal/service/fis/service_package_gen.go @@ -5,8 +5,8 @@ package fis import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - fis_sdkv2 "github.com/aws/aws-sdk-go-v2/service/fis" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/fis" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -42,11 +42,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*fis_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*fis.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return fis_sdkv2.NewFromConfig(cfg, - fis_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return fis.NewFromConfig(cfg, + fis.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/fms/service_endpoint_resolver_gen.go b/internal/service/fms/service_endpoint_resolver_gen.go index cdfe197026f..39ff48b9224 100644 --- a/internal/service/fms/service_endpoint_resolver_gen.go +++ b/internal/service/fms/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - fms_sdkv2 "github.com/aws/aws-sdk-go-v2/service/fms" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/fms" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ fms_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ fms.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver fms_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver fms.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: fms_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: fms.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params fms_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params fms.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params fms_sdkv2.End tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up fms endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params fms_sdkv2.End return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*fms_sdkv2.Options) { - return func(o *fms_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*fms.Options) { + return func(o *fms.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/fms/service_endpoints_gen_test.go b/internal/service/fms/service_endpoints_gen_test.go index 3d77de12ff7..4518e79c8ef 100644 --- a/internal/service/fms/service_endpoints_gen_test.go +++ b/internal/service/fms/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - fms_sdkv2 "github.com/aws/aws-sdk-go-v2/service/fms" + "github.com/aws/aws-sdk-go-v2/service/fms" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := fms_sdkv2.NewDefaultEndpointResolverV2() + r := fms.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), fms_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), fms.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := fms_sdkv2.NewDefaultEndpointResolverV2() + r := fms.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), fms_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), fms.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,10 +283,10 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListAppsLists(ctx, &fms_sdkv2.ListAppsListsInput{ - MaxResults: aws_sdkv2.Int32(1), + _, err := client.ListAppsLists(ctx, &fms.ListAppsListsInput{ + MaxResults: aws.Int32(1), }, - func(opts *fms_sdkv2.Options) { + func(opts *fms.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/fms/service_package.go b/internal/service/fms/service_package.go index c14bacb15eb..125eb789d02 100644 --- a/internal/service/fms/service_package.go +++ b/internal/service/fms/service_package.go @@ -20,7 +20,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return fms.NewFromConfig(cfg, - fms.WithEndpointResolverV2(newEndpointResolverSDKv2()), + fms.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), func(o *fms.Options) { o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(func(err error) aws.Ternary { diff --git a/internal/service/fsx/service_endpoint_resolver_gen.go b/internal/service/fsx/service_endpoint_resolver_gen.go index 43a93b544c2..338435f922e 100644 --- a/internal/service/fsx/service_endpoint_resolver_gen.go +++ b/internal/service/fsx/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - fsx_sdkv2 "github.com/aws/aws-sdk-go-v2/service/fsx" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/fsx" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ fsx_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ fsx.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver fsx_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver fsx.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: fsx_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: fsx.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params fsx_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params fsx.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params fsx_sdkv2.End tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up fsx endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params fsx_sdkv2.End return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*fsx_sdkv2.Options) { - return func(o *fsx_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*fsx.Options) { + return func(o *fsx.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/fsx/service_endpoints_gen_test.go b/internal/service/fsx/service_endpoints_gen_test.go index 90aeb0f8554..922b885044c 100644 --- a/internal/service/fsx/service_endpoints_gen_test.go +++ b/internal/service/fsx/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - fsx_sdkv2 "github.com/aws/aws-sdk-go-v2/service/fsx" + "github.com/aws/aws-sdk-go-v2/service/fsx" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := fsx_sdkv2.NewDefaultEndpointResolverV2() + r := fsx.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), fsx_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), fsx.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := fsx_sdkv2.NewDefaultEndpointResolverV2() + r := fsx.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), fsx_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), fsx.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.DescribeFileSystems(ctx, &fsx_sdkv2.DescribeFileSystemsInput{}, - func(opts *fsx_sdkv2.Options) { + _, err := client.DescribeFileSystems(ctx, &fsx.DescribeFileSystemsInput{}, + func(opts *fsx.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/fsx/service_package_gen.go b/internal/service/fsx/service_package_gen.go index ddd11413804..f7594041b5f 100644 --- a/internal/service/fsx/service_package_gen.go +++ b/internal/service/fsx/service_package_gen.go @@ -5,8 +5,8 @@ package fsx import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - fsx_sdkv2 "github.com/aws/aws-sdk-go-v2/service/fsx" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/fsx" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -151,11 +151,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*fsx_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*fsx.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return fsx_sdkv2.NewFromConfig(cfg, - fsx_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return fsx.NewFromConfig(cfg, + fsx.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/gamelift/service_endpoint_resolver_gen.go b/internal/service/gamelift/service_endpoint_resolver_gen.go index 950bf453d4a..010d1fb56e9 100644 --- a/internal/service/gamelift/service_endpoint_resolver_gen.go +++ b/internal/service/gamelift/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - gamelift_sdkv2 "github.com/aws/aws-sdk-go-v2/service/gamelift" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/gamelift" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ gamelift_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ gamelift.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver gamelift_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver gamelift.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: gamelift_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: gamelift.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params gamelift_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params gamelift.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params gamelift_sdkv tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up gamelift endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params gamelift_sdkv return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*gamelift_sdkv2.Options) { - return func(o *gamelift_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*gamelift.Options) { + return func(o *gamelift.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/gamelift/service_endpoints_gen_test.go b/internal/service/gamelift/service_endpoints_gen_test.go index 462e8e81a4c..c22cb9bbf14 100644 --- a/internal/service/gamelift/service_endpoints_gen_test.go +++ b/internal/service/gamelift/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - gamelift_sdkv2 "github.com/aws/aws-sdk-go-v2/service/gamelift" + "github.com/aws/aws-sdk-go-v2/service/gamelift" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := gamelift_sdkv2.NewDefaultEndpointResolverV2() + r := gamelift.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), gamelift_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), gamelift.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := gamelift_sdkv2.NewDefaultEndpointResolverV2() + r := gamelift.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), gamelift_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), gamelift.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListGameServerGroups(ctx, &gamelift_sdkv2.ListGameServerGroupsInput{}, - func(opts *gamelift_sdkv2.Options) { + _, err := client.ListGameServerGroups(ctx, &gamelift.ListGameServerGroupsInput{}, + func(opts *gamelift.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/gamelift/service_package_gen.go b/internal/service/gamelift/service_package_gen.go index 18c50330d49..98739ca82fd 100644 --- a/internal/service/gamelift/service_package_gen.go +++ b/internal/service/gamelift/service_package_gen.go @@ -5,8 +5,8 @@ package gamelift import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - gamelift_sdkv2 "github.com/aws/aws-sdk-go-v2/service/gamelift" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/gamelift" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -84,11 +84,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*gamelift_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*gamelift.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return gamelift_sdkv2.NewFromConfig(cfg, - gamelift_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return gamelift.NewFromConfig(cfg, + gamelift.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/glacier/service_endpoint_resolver_gen.go b/internal/service/glacier/service_endpoint_resolver_gen.go index 231b2af334a..6021ec97f2b 100644 --- a/internal/service/glacier/service_endpoint_resolver_gen.go +++ b/internal/service/glacier/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - glacier_sdkv2 "github.com/aws/aws-sdk-go-v2/service/glacier" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/glacier" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ glacier_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ glacier.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver glacier_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver glacier.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: glacier_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: glacier.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params glacier_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params glacier.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params glacier_sdkv2 tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up glacier endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params glacier_sdkv2 return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*glacier_sdkv2.Options) { - return func(o *glacier_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*glacier.Options) { + return func(o *glacier.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/glacier/service_endpoints_gen_test.go b/internal/service/glacier/service_endpoints_gen_test.go index 2b157f7f9a6..b468527e4d1 100644 --- a/internal/service/glacier/service_endpoints_gen_test.go +++ b/internal/service/glacier/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - glacier_sdkv2 "github.com/aws/aws-sdk-go-v2/service/glacier" + "github.com/aws/aws-sdk-go-v2/service/glacier" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := glacier_sdkv2.NewDefaultEndpointResolverV2() + r := glacier.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), glacier_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), glacier.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := glacier_sdkv2.NewDefaultEndpointResolverV2() + r := glacier.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), glacier_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), glacier.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListVaults(ctx, &glacier_sdkv2.ListVaultsInput{}, - func(opts *glacier_sdkv2.Options) { + _, err := client.ListVaults(ctx, &glacier.ListVaultsInput{}, + func(opts *glacier.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/glacier/service_package_gen.go b/internal/service/glacier/service_package_gen.go index a9c4186d699..7584daab873 100644 --- a/internal/service/glacier/service_package_gen.go +++ b/internal/service/glacier/service_package_gen.go @@ -5,8 +5,8 @@ package glacier import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - glacier_sdkv2 "github.com/aws/aws-sdk-go-v2/service/glacier" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/glacier" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -48,11 +48,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*glacier_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*glacier.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return glacier_sdkv2.NewFromConfig(cfg, - glacier_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return glacier.NewFromConfig(cfg, + glacier.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/globalaccelerator/service_endpoint_resolver_gen.go b/internal/service/globalaccelerator/service_endpoint_resolver_gen.go index f278b6c4634..78b19acb29d 100644 --- a/internal/service/globalaccelerator/service_endpoint_resolver_gen.go +++ b/internal/service/globalaccelerator/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - globalaccelerator_sdkv2 "github.com/aws/aws-sdk-go-v2/service/globalaccelerator" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/globalaccelerator" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ globalaccelerator_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ globalaccelerator.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver globalaccelerator_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver globalaccelerator.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: globalaccelerator_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: globalaccelerator.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params globalaccelerator_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params globalaccelerator.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params globalacceler tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up globalaccelerator endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params globalacceler return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*globalaccelerator_sdkv2.Options) { - return func(o *globalaccelerator_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*globalaccelerator.Options) { + return func(o *globalaccelerator.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/globalaccelerator/service_endpoints_gen_test.go b/internal/service/globalaccelerator/service_endpoints_gen_test.go index adcd88fc4bc..7cf86ae2a3c 100644 --- a/internal/service/globalaccelerator/service_endpoints_gen_test.go +++ b/internal/service/globalaccelerator/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - globalaccelerator_sdkv2 "github.com/aws/aws-sdk-go-v2/service/globalaccelerator" + "github.com/aws/aws-sdk-go-v2/service/globalaccelerator" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -244,10 +244,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := globalaccelerator_sdkv2.NewDefaultEndpointResolverV2() + r := globalaccelerator.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), globalaccelerator_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), globalaccelerator.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -261,11 +261,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := globalaccelerator_sdkv2.NewDefaultEndpointResolverV2() + r := globalaccelerator.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), globalaccelerator_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), globalaccelerator.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -285,8 +285,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListAccelerators(ctx, &globalaccelerator_sdkv2.ListAcceleratorsInput{}, - func(opts *globalaccelerator_sdkv2.Options) { + _, err := client.ListAccelerators(ctx, &globalaccelerator.ListAcceleratorsInput{}, + func(opts *globalaccelerator.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/globalaccelerator/service_package.go b/internal/service/globalaccelerator/service_package.go index 6627b43d968..2284e7781df 100644 --- a/internal/service/globalaccelerator/service_package.go +++ b/internal/service/globalaccelerator/service_package.go @@ -17,7 +17,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return globalaccelerator.NewFromConfig(cfg, - globalaccelerator.WithEndpointResolverV2(newEndpointResolverSDKv2()), + globalaccelerator.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), func(o *globalaccelerator.Options) { if config["partition"].(string) == names.StandardPartitionID { diff --git a/internal/service/glue/service_endpoint_resolver_gen.go b/internal/service/glue/service_endpoint_resolver_gen.go index 727040172bb..20203f46d1e 100644 --- a/internal/service/glue/service_endpoint_resolver_gen.go +++ b/internal/service/glue/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - glue_sdkv2 "github.com/aws/aws-sdk-go-v2/service/glue" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/glue" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ glue_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ glue.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver glue_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver glue.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: glue_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: glue.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params glue_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params glue.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params glue_sdkv2.En tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up glue endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params glue_sdkv2.En return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*glue_sdkv2.Options) { - return func(o *glue_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*glue.Options) { + return func(o *glue.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/glue/service_endpoints_gen_test.go b/internal/service/glue/service_endpoints_gen_test.go index 90623c9010c..9da7219779e 100644 --- a/internal/service/glue/service_endpoints_gen_test.go +++ b/internal/service/glue/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - glue_sdkv2 "github.com/aws/aws-sdk-go-v2/service/glue" + "github.com/aws/aws-sdk-go-v2/service/glue" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := glue_sdkv2.NewDefaultEndpointResolverV2() + r := glue.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), glue_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), glue.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := glue_sdkv2.NewDefaultEndpointResolverV2() + r := glue.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), glue_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), glue.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListRegistries(ctx, &glue_sdkv2.ListRegistriesInput{}, - func(opts *glue_sdkv2.Options) { + _, err := client.ListRegistries(ctx, &glue.ListRegistriesInput{}, + func(opts *glue.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/glue/service_package_gen.go b/internal/service/glue/service_package_gen.go index e47e9407323..c7a8aac5c3a 100644 --- a/internal/service/glue/service_package_gen.go +++ b/internal/service/glue/service_package_gen.go @@ -5,8 +5,8 @@ package glue import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - glue_sdkv2 "github.com/aws/aws-sdk-go-v2/service/glue" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/glue" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -183,11 +183,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*glue_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*glue.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return glue_sdkv2.NewFromConfig(cfg, - glue_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return glue.NewFromConfig(cfg, + glue.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/grafana/service_endpoint_resolver_gen.go b/internal/service/grafana/service_endpoint_resolver_gen.go index 0b615b5eb0e..60eb52badad 100644 --- a/internal/service/grafana/service_endpoint_resolver_gen.go +++ b/internal/service/grafana/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - grafana_sdkv2 "github.com/aws/aws-sdk-go-v2/service/grafana" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/grafana" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ grafana_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ grafana.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver grafana_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver grafana.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: grafana_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: grafana.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params grafana_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params grafana.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params grafana_sdkv2 tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up grafana endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params grafana_sdkv2 return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*grafana_sdkv2.Options) { - return func(o *grafana_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*grafana.Options) { + return func(o *grafana.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/grafana/service_endpoints_gen_test.go b/internal/service/grafana/service_endpoints_gen_test.go index 4088bdc78a3..d9db6aa43ca 100644 --- a/internal/service/grafana/service_endpoints_gen_test.go +++ b/internal/service/grafana/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - grafana_sdkv2 "github.com/aws/aws-sdk-go-v2/service/grafana" + "github.com/aws/aws-sdk-go-v2/service/grafana" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -355,10 +355,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := grafana_sdkv2.NewDefaultEndpointResolverV2() + r := grafana.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), grafana_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), grafana.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -372,11 +372,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := grafana_sdkv2.NewDefaultEndpointResolverV2() + r := grafana.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), grafana_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), grafana.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -396,8 +396,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListWorkspaces(ctx, &grafana_sdkv2.ListWorkspacesInput{}, - func(opts *grafana_sdkv2.Options) { + _, err := client.ListWorkspaces(ctx, &grafana.ListWorkspacesInput{}, + func(opts *grafana.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/grafana/service_package_gen.go b/internal/service/grafana/service_package_gen.go index 4bd1a7d34b9..9a9ac3e8588 100644 --- a/internal/service/grafana/service_package_gen.go +++ b/internal/service/grafana/service_package_gen.go @@ -5,8 +5,8 @@ package grafana import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - grafana_sdkv2 "github.com/aws/aws-sdk-go-v2/service/grafana" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/grafana" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -80,11 +80,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*grafana_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*grafana.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return grafana_sdkv2.NewFromConfig(cfg, - grafana_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return grafana.NewFromConfig(cfg, + grafana.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/greengrass/service_endpoint_resolver_gen.go b/internal/service/greengrass/service_endpoint_resolver_gen.go index c1563d389c3..0f2ecaba459 100644 --- a/internal/service/greengrass/service_endpoint_resolver_gen.go +++ b/internal/service/greengrass/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - greengrass_sdkv2 "github.com/aws/aws-sdk-go-v2/service/greengrass" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/greengrass" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ greengrass_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ greengrass.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver greengrass_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver greengrass.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: greengrass_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: greengrass.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params greengrass_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params greengrass.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params greengrass_sd tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up greengrass endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params greengrass_sd return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*greengrass_sdkv2.Options) { - return func(o *greengrass_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*greengrass.Options) { + return func(o *greengrass.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/greengrass/service_endpoints_gen_test.go b/internal/service/greengrass/service_endpoints_gen_test.go index 254302da06c..b05eb37fec9 100644 --- a/internal/service/greengrass/service_endpoints_gen_test.go +++ b/internal/service/greengrass/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - greengrass_sdkv2 "github.com/aws/aws-sdk-go-v2/service/greengrass" + "github.com/aws/aws-sdk-go-v2/service/greengrass" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := greengrass_sdkv2.NewDefaultEndpointResolverV2() + r := greengrass.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), greengrass_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), greengrass.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := greengrass_sdkv2.NewDefaultEndpointResolverV2() + r := greengrass.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), greengrass_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), greengrass.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListGroups(ctx, &greengrass_sdkv2.ListGroupsInput{}, - func(opts *greengrass_sdkv2.Options) { + _, err := client.ListGroups(ctx, &greengrass.ListGroupsInput{}, + func(opts *greengrass.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/greengrass/service_package_gen.go b/internal/service/greengrass/service_package_gen.go index 171fd82de01..d411264eae4 100644 --- a/internal/service/greengrass/service_package_gen.go +++ b/internal/service/greengrass/service_package_gen.go @@ -5,8 +5,8 @@ package greengrass import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - greengrass_sdkv2 "github.com/aws/aws-sdk-go-v2/service/greengrass" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/greengrass" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -35,11 +35,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*greengrass_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*greengrass.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return greengrass_sdkv2.NewFromConfig(cfg, - greengrass_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return greengrass.NewFromConfig(cfg, + greengrass.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/groundstation/service_endpoint_resolver_gen.go b/internal/service/groundstation/service_endpoint_resolver_gen.go index e449cafde9f..c4f9330cf6a 100644 --- a/internal/service/groundstation/service_endpoint_resolver_gen.go +++ b/internal/service/groundstation/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - groundstation_sdkv2 "github.com/aws/aws-sdk-go-v2/service/groundstation" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/groundstation" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ groundstation_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ groundstation.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver groundstation_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver groundstation.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: groundstation_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: groundstation.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params groundstation_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params groundstation.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params groundstation tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up groundstation endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params groundstation return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*groundstation_sdkv2.Options) { - return func(o *groundstation_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*groundstation.Options) { + return func(o *groundstation.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/groundstation/service_endpoints_gen_test.go b/internal/service/groundstation/service_endpoints_gen_test.go index 79b658543d0..98438121a26 100644 --- a/internal/service/groundstation/service_endpoints_gen_test.go +++ b/internal/service/groundstation/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - groundstation_sdkv2 "github.com/aws/aws-sdk-go-v2/service/groundstation" + "github.com/aws/aws-sdk-go-v2/service/groundstation" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := groundstation_sdkv2.NewDefaultEndpointResolverV2() + r := groundstation.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), groundstation_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), groundstation.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := groundstation_sdkv2.NewDefaultEndpointResolverV2() + r := groundstation.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), groundstation_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), groundstation.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListConfigs(ctx, &groundstation_sdkv2.ListConfigsInput{}, - func(opts *groundstation_sdkv2.Options) { + _, err := client.ListConfigs(ctx, &groundstation.ListConfigsInput{}, + func(opts *groundstation.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/groundstation/service_package_gen.go b/internal/service/groundstation/service_package_gen.go index 8f6b5a5ea31..a447ab43a80 100644 --- a/internal/service/groundstation/service_package_gen.go +++ b/internal/service/groundstation/service_package_gen.go @@ -5,8 +5,8 @@ package groundstation import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - groundstation_sdkv2 "github.com/aws/aws-sdk-go-v2/service/groundstation" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/groundstation" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -35,11 +35,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*groundstation_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*groundstation.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return groundstation_sdkv2.NewFromConfig(cfg, - groundstation_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return groundstation.NewFromConfig(cfg, + groundstation.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/guardduty/service_endpoint_resolver_gen.go b/internal/service/guardduty/service_endpoint_resolver_gen.go index 776011ae2e1..bdd75b5dcfd 100644 --- a/internal/service/guardduty/service_endpoint_resolver_gen.go +++ b/internal/service/guardduty/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - guardduty_sdkv2 "github.com/aws/aws-sdk-go-v2/service/guardduty" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/guardduty" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ guardduty_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ guardduty.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver guardduty_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver guardduty.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: guardduty_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: guardduty.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params guardduty_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params guardduty.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params guardduty_sdk tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up guardduty endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params guardduty_sdk return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*guardduty_sdkv2.Options) { - return func(o *guardduty_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*guardduty.Options) { + return func(o *guardduty.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/guardduty/service_endpoints_gen_test.go b/internal/service/guardduty/service_endpoints_gen_test.go index 13b426a6d4d..744c3268cd7 100644 --- a/internal/service/guardduty/service_endpoints_gen_test.go +++ b/internal/service/guardduty/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - guardduty_sdkv2 "github.com/aws/aws-sdk-go-v2/service/guardduty" + "github.com/aws/aws-sdk-go-v2/service/guardduty" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := guardduty_sdkv2.NewDefaultEndpointResolverV2() + r := guardduty.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), guardduty_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), guardduty.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := guardduty_sdkv2.NewDefaultEndpointResolverV2() + r := guardduty.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), guardduty_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), guardduty.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListDetectors(ctx, &guardduty_sdkv2.ListDetectorsInput{}, - func(opts *guardduty_sdkv2.Options) { + _, err := client.ListDetectors(ctx, &guardduty.ListDetectorsInput{}, + func(opts *guardduty.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/guardduty/service_package_gen.go b/internal/service/guardduty/service_package_gen.go index 2f1991e4409..992fbe7e715 100644 --- a/internal/service/guardduty/service_package_gen.go +++ b/internal/service/guardduty/service_package_gen.go @@ -5,8 +5,8 @@ package guardduty import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - guardduty_sdkv2 "github.com/aws/aws-sdk-go-v2/service/guardduty" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/guardduty" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -118,11 +118,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*guardduty_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*guardduty.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return guardduty_sdkv2.NewFromConfig(cfg, - guardduty_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return guardduty.NewFromConfig(cfg, + guardduty.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/healthlake/service_endpoint_resolver_gen.go b/internal/service/healthlake/service_endpoint_resolver_gen.go index d106de30043..a7335e5de93 100644 --- a/internal/service/healthlake/service_endpoint_resolver_gen.go +++ b/internal/service/healthlake/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - healthlake_sdkv2 "github.com/aws/aws-sdk-go-v2/service/healthlake" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/healthlake" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ healthlake_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ healthlake.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver healthlake_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver healthlake.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: healthlake_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: healthlake.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params healthlake_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params healthlake.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params healthlake_sd tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up healthlake endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params healthlake_sd return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*healthlake_sdkv2.Options) { - return func(o *healthlake_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*healthlake.Options) { + return func(o *healthlake.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/healthlake/service_endpoints_gen_test.go b/internal/service/healthlake/service_endpoints_gen_test.go index 26caaff9399..11200726be0 100644 --- a/internal/service/healthlake/service_endpoints_gen_test.go +++ b/internal/service/healthlake/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - healthlake_sdkv2 "github.com/aws/aws-sdk-go-v2/service/healthlake" + "github.com/aws/aws-sdk-go-v2/service/healthlake" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := healthlake_sdkv2.NewDefaultEndpointResolverV2() + r := healthlake.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), healthlake_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), healthlake.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := healthlake_sdkv2.NewDefaultEndpointResolverV2() + r := healthlake.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), healthlake_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), healthlake.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListFHIRDatastores(ctx, &healthlake_sdkv2.ListFHIRDatastoresInput{}, - func(opts *healthlake_sdkv2.Options) { + _, err := client.ListFHIRDatastores(ctx, &healthlake.ListFHIRDatastoresInput{}, + func(opts *healthlake.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/healthlake/service_package_gen.go b/internal/service/healthlake/service_package_gen.go index 46da7a8c1a7..ca7bedd0be2 100644 --- a/internal/service/healthlake/service_package_gen.go +++ b/internal/service/healthlake/service_package_gen.go @@ -5,8 +5,8 @@ package healthlake import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - healthlake_sdkv2 "github.com/aws/aws-sdk-go-v2/service/healthlake" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/healthlake" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -35,11 +35,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*healthlake_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*healthlake.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return healthlake_sdkv2.NewFromConfig(cfg, - healthlake_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return healthlake.NewFromConfig(cfg, + healthlake.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/iam/service_endpoint_resolver_gen.go b/internal/service/iam/service_endpoint_resolver_gen.go index 288dd84b150..6f76401c5fd 100644 --- a/internal/service/iam/service_endpoint_resolver_gen.go +++ b/internal/service/iam/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - iam_sdkv2 "github.com/aws/aws-sdk-go-v2/service/iam" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/iam" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ iam_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ iam.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver iam_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver iam.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: iam_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: iam.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params iam_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params iam.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params iam_sdkv2.End tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up iam endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params iam_sdkv2.End return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*iam_sdkv2.Options) { - return func(o *iam_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*iam.Options) { + return func(o *iam.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/iam/service_endpoints_gen_test.go b/internal/service/iam/service_endpoints_gen_test.go index e568384d2d0..6f8b3786825 100644 --- a/internal/service/iam/service_endpoints_gen_test.go +++ b/internal/service/iam/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - iam_sdkv2 "github.com/aws/aws-sdk-go-v2/service/iam" + "github.com/aws/aws-sdk-go-v2/service/iam" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -352,10 +352,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := iam_sdkv2.NewDefaultEndpointResolverV2() + r := iam.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), iam_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), iam.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -369,11 +369,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := iam_sdkv2.NewDefaultEndpointResolverV2() + r := iam.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), iam_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), iam.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -393,8 +393,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListRoles(ctx, &iam_sdkv2.ListRolesInput{}, - func(opts *iam_sdkv2.Options) { + _, err := client.ListRoles(ctx, &iam.ListRolesInput{}, + func(opts *iam.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/iam/service_package_gen.go b/internal/service/iam/service_package_gen.go index db778ae28c6..8029167973b 100644 --- a/internal/service/iam/service_package_gen.go +++ b/internal/service/iam/service_package_gen.go @@ -5,8 +5,8 @@ package iam import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - iam_sdkv2 "github.com/aws/aws-sdk-go-v2/service/iam" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/iam" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -322,11 +322,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*iam_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*iam.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return iam_sdkv2.NewFromConfig(cfg, - iam_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return iam.NewFromConfig(cfg, + iam.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/identitystore/service_endpoint_resolver_gen.go b/internal/service/identitystore/service_endpoint_resolver_gen.go index f0ecaf695ce..6571c9d8f6e 100644 --- a/internal/service/identitystore/service_endpoint_resolver_gen.go +++ b/internal/service/identitystore/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - identitystore_sdkv2 "github.com/aws/aws-sdk-go-v2/service/identitystore" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/identitystore" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ identitystore_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ identitystore.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver identitystore_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver identitystore.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: identitystore_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: identitystore.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params identitystore_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params identitystore.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params identitystore tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up identitystore endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params identitystore return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*identitystore_sdkv2.Options) { - return func(o *identitystore_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*identitystore.Options) { + return func(o *identitystore.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/identitystore/service_endpoints_gen_test.go b/internal/service/identitystore/service_endpoints_gen_test.go index 5bd48890719..f80aed4ade0 100644 --- a/internal/service/identitystore/service_endpoints_gen_test.go +++ b/internal/service/identitystore/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - identitystore_sdkv2 "github.com/aws/aws-sdk-go-v2/service/identitystore" + "github.com/aws/aws-sdk-go-v2/service/identitystore" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := identitystore_sdkv2.NewDefaultEndpointResolverV2() + r := identitystore.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), identitystore_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), identitystore.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := identitystore_sdkv2.NewDefaultEndpointResolverV2() + r := identitystore.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), identitystore_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), identitystore.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,10 +283,10 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListUsers(ctx, &identitystore_sdkv2.ListUsersInput{ - IdentityStoreId: aws_sdkv2.String("d-1234567890"), + _, err := client.ListUsers(ctx, &identitystore.ListUsersInput{ + IdentityStoreId: aws.String("d-1234567890"), }, - func(opts *identitystore_sdkv2.Options) { + func(opts *identitystore.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/identitystore/service_package_gen.go b/internal/service/identitystore/service_package_gen.go index 7ece94d0294..ee26d351b48 100644 --- a/internal/service/identitystore/service_package_gen.go +++ b/internal/service/identitystore/service_package_gen.go @@ -5,8 +5,8 @@ package identitystore import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - identitystore_sdkv2 "github.com/aws/aws-sdk-go-v2/service/identitystore" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/identitystore" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -67,11 +67,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*identitystore_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*identitystore.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return identitystore_sdkv2.NewFromConfig(cfg, - identitystore_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return identitystore.NewFromConfig(cfg, + identitystore.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/imagebuilder/service_endpoint_resolver_gen.go b/internal/service/imagebuilder/service_endpoint_resolver_gen.go index 21a9dff1235..cbc53be0e4d 100644 --- a/internal/service/imagebuilder/service_endpoint_resolver_gen.go +++ b/internal/service/imagebuilder/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - imagebuilder_sdkv2 "github.com/aws/aws-sdk-go-v2/service/imagebuilder" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/imagebuilder" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ imagebuilder_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ imagebuilder.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver imagebuilder_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver imagebuilder.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: imagebuilder_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: imagebuilder.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params imagebuilder_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params imagebuilder.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params imagebuilder_ tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up imagebuilder endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params imagebuilder_ return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*imagebuilder_sdkv2.Options) { - return func(o *imagebuilder_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*imagebuilder.Options) { + return func(o *imagebuilder.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/imagebuilder/service_endpoints_gen_test.go b/internal/service/imagebuilder/service_endpoints_gen_test.go index 88631c06a7c..73686a1041e 100644 --- a/internal/service/imagebuilder/service_endpoints_gen_test.go +++ b/internal/service/imagebuilder/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - imagebuilder_sdkv2 "github.com/aws/aws-sdk-go-v2/service/imagebuilder" + "github.com/aws/aws-sdk-go-v2/service/imagebuilder" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := imagebuilder_sdkv2.NewDefaultEndpointResolverV2() + r := imagebuilder.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), imagebuilder_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), imagebuilder.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := imagebuilder_sdkv2.NewDefaultEndpointResolverV2() + r := imagebuilder.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), imagebuilder_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), imagebuilder.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListImages(ctx, &imagebuilder_sdkv2.ListImagesInput{}, - func(opts *imagebuilder_sdkv2.Options) { + _, err := client.ListImages(ctx, &imagebuilder.ListImagesInput{}, + func(opts *imagebuilder.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/imagebuilder/service_package_gen.go b/internal/service/imagebuilder/service_package_gen.go index 769cc57c474..b0ff4aa328a 100644 --- a/internal/service/imagebuilder/service_package_gen.go +++ b/internal/service/imagebuilder/service_package_gen.go @@ -5,8 +5,8 @@ package imagebuilder import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - imagebuilder_sdkv2 "github.com/aws/aws-sdk-go-v2/service/imagebuilder" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/imagebuilder" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -181,11 +181,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*imagebuilder_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*imagebuilder.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return imagebuilder_sdkv2.NewFromConfig(cfg, - imagebuilder_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return imagebuilder.NewFromConfig(cfg, + imagebuilder.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/inspector/service_endpoint_resolver_gen.go b/internal/service/inspector/service_endpoint_resolver_gen.go index 8a62f5e1183..b896bf2eb74 100644 --- a/internal/service/inspector/service_endpoint_resolver_gen.go +++ b/internal/service/inspector/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - inspector_sdkv2 "github.com/aws/aws-sdk-go-v2/service/inspector" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/inspector" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ inspector_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ inspector.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver inspector_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver inspector.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: inspector_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: inspector.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params inspector_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params inspector.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params inspector_sdk tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up inspector endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params inspector_sdk return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*inspector_sdkv2.Options) { - return func(o *inspector_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*inspector.Options) { + return func(o *inspector.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/inspector/service_endpoints_gen_test.go b/internal/service/inspector/service_endpoints_gen_test.go index 4b814629901..ca305ad3994 100644 --- a/internal/service/inspector/service_endpoints_gen_test.go +++ b/internal/service/inspector/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - inspector_sdkv2 "github.com/aws/aws-sdk-go-v2/service/inspector" + "github.com/aws/aws-sdk-go-v2/service/inspector" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := inspector_sdkv2.NewDefaultEndpointResolverV2() + r := inspector.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), inspector_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), inspector.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := inspector_sdkv2.NewDefaultEndpointResolverV2() + r := inspector.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), inspector_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), inspector.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListRulesPackages(ctx, &inspector_sdkv2.ListRulesPackagesInput{}, - func(opts *inspector_sdkv2.Options) { + _, err := client.ListRulesPackages(ctx, &inspector.ListRulesPackagesInput{}, + func(opts *inspector.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/inspector/service_package_gen.go b/internal/service/inspector/service_package_gen.go index 99aa0f1fac4..671b40c0d30 100644 --- a/internal/service/inspector/service_package_gen.go +++ b/internal/service/inspector/service_package_gen.go @@ -5,8 +5,8 @@ package inspector import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - inspector_sdkv2 "github.com/aws/aws-sdk-go-v2/service/inspector" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/inspector" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -57,11 +57,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*inspector_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*inspector.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return inspector_sdkv2.NewFromConfig(cfg, - inspector_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return inspector.NewFromConfig(cfg, + inspector.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/inspector2/service_endpoint_resolver_gen.go b/internal/service/inspector2/service_endpoint_resolver_gen.go index f01799d5882..1a00552e67e 100644 --- a/internal/service/inspector2/service_endpoint_resolver_gen.go +++ b/internal/service/inspector2/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - inspector2_sdkv2 "github.com/aws/aws-sdk-go-v2/service/inspector2" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/inspector2" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ inspector2_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ inspector2.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver inspector2_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver inspector2.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: inspector2_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: inspector2.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params inspector2_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params inspector2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params inspector2_sd tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up inspector2 endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params inspector2_sd return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*inspector2_sdkv2.Options) { - return func(o *inspector2_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*inspector2.Options) { + return func(o *inspector2.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/inspector2/service_endpoints_gen_test.go b/internal/service/inspector2/service_endpoints_gen_test.go index 4db181d0e0c..2523dc2b352 100644 --- a/internal/service/inspector2/service_endpoints_gen_test.go +++ b/internal/service/inspector2/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - inspector2_sdkv2 "github.com/aws/aws-sdk-go-v2/service/inspector2" + "github.com/aws/aws-sdk-go-v2/service/inspector2" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -296,10 +296,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := inspector2_sdkv2.NewDefaultEndpointResolverV2() + r := inspector2.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), inspector2_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), inspector2.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -313,11 +313,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := inspector2_sdkv2.NewDefaultEndpointResolverV2() + r := inspector2.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), inspector2_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), inspector2.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -337,8 +337,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListAccountPermissions(ctx, &inspector2_sdkv2.ListAccountPermissionsInput{}, - func(opts *inspector2_sdkv2.Options) { + _, err := client.ListAccountPermissions(ctx, &inspector2.ListAccountPermissionsInput{}, + func(opts *inspector2.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/inspector2/service_package_gen.go b/internal/service/inspector2/service_package_gen.go index 14f29b966f9..6b141faf3e2 100644 --- a/internal/service/inspector2/service_package_gen.go +++ b/internal/service/inspector2/service_package_gen.go @@ -5,8 +5,8 @@ package inspector2 import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - inspector2_sdkv2 "github.com/aws/aws-sdk-go-v2/service/inspector2" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/inspector2" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -55,11 +55,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*inspector2_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*inspector2.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return inspector2_sdkv2.NewFromConfig(cfg, - inspector2_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return inspector2.NewFromConfig(cfg, + inspector2.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/internetmonitor/service_endpoint_resolver_gen.go b/internal/service/internetmonitor/service_endpoint_resolver_gen.go index 2585620b6e9..e31c6e0a78e 100644 --- a/internal/service/internetmonitor/service_endpoint_resolver_gen.go +++ b/internal/service/internetmonitor/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - internetmonitor_sdkv2 "github.com/aws/aws-sdk-go-v2/service/internetmonitor" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/internetmonitor" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ internetmonitor_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ internetmonitor.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver internetmonitor_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver internetmonitor.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: internetmonitor_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: internetmonitor.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params internetmonitor_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params internetmonitor.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params internetmonit tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up internetmonitor endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params internetmonit return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*internetmonitor_sdkv2.Options) { - return func(o *internetmonitor_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*internetmonitor.Options) { + return func(o *internetmonitor.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/internetmonitor/service_endpoints_gen_test.go b/internal/service/internetmonitor/service_endpoints_gen_test.go index c770e4a8f67..f0434020f4c 100644 --- a/internal/service/internetmonitor/service_endpoints_gen_test.go +++ b/internal/service/internetmonitor/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - internetmonitor_sdkv2 "github.com/aws/aws-sdk-go-v2/service/internetmonitor" + "github.com/aws/aws-sdk-go-v2/service/internetmonitor" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := internetmonitor_sdkv2.NewDefaultEndpointResolverV2() + r := internetmonitor.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), internetmonitor_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), internetmonitor.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := internetmonitor_sdkv2.NewDefaultEndpointResolverV2() + r := internetmonitor.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), internetmonitor_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), internetmonitor.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListMonitors(ctx, &internetmonitor_sdkv2.ListMonitorsInput{}, - func(opts *internetmonitor_sdkv2.Options) { + _, err := client.ListMonitors(ctx, &internetmonitor.ListMonitorsInput{}, + func(opts *internetmonitor.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/internetmonitor/service_package_gen.go b/internal/service/internetmonitor/service_package_gen.go index 28fe340ad32..1bc73f058a6 100644 --- a/internal/service/internetmonitor/service_package_gen.go +++ b/internal/service/internetmonitor/service_package_gen.go @@ -5,8 +5,8 @@ package internetmonitor import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - internetmonitor_sdkv2 "github.com/aws/aws-sdk-go-v2/service/internetmonitor" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/internetmonitor" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -44,11 +44,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*internetmonitor_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*internetmonitor.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return internetmonitor_sdkv2.NewFromConfig(cfg, - internetmonitor_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return internetmonitor.NewFromConfig(cfg, + internetmonitor.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/iot/service_endpoint_resolver_gen.go b/internal/service/iot/service_endpoint_resolver_gen.go index fedf65be258..040cd2f3d94 100644 --- a/internal/service/iot/service_endpoint_resolver_gen.go +++ b/internal/service/iot/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - iot_sdkv2 "github.com/aws/aws-sdk-go-v2/service/iot" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/iot" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ iot_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ iot.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver iot_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver iot.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: iot_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: iot.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params iot_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params iot.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params iot_sdkv2.End tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up iot endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params iot_sdkv2.End return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*iot_sdkv2.Options) { - return func(o *iot_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*iot.Options) { + return func(o *iot.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/iot/service_endpoints_gen_test.go b/internal/service/iot/service_endpoints_gen_test.go index 28a9a5ecaf5..bf6f67bff33 100644 --- a/internal/service/iot/service_endpoints_gen_test.go +++ b/internal/service/iot/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - iot_sdkv2 "github.com/aws/aws-sdk-go-v2/service/iot" + "github.com/aws/aws-sdk-go-v2/service/iot" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := iot_sdkv2.NewDefaultEndpointResolverV2() + r := iot.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), iot_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), iot.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := iot_sdkv2.NewDefaultEndpointResolverV2() + r := iot.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), iot_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), iot.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.DescribeDefaultAuthorizer(ctx, &iot_sdkv2.DescribeDefaultAuthorizerInput{}, - func(opts *iot_sdkv2.Options) { + _, err := client.DescribeDefaultAuthorizer(ctx, &iot.DescribeDefaultAuthorizerInput{}, + func(opts *iot.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/iot/service_package_gen.go b/internal/service/iot/service_package_gen.go index 478ff6c408d..084d3824c68 100644 --- a/internal/service/iot/service_package_gen.go +++ b/internal/service/iot/service_package_gen.go @@ -5,8 +5,8 @@ package iot import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - iot_sdkv2 "github.com/aws/aws-sdk-go-v2/service/iot" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/iot" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -171,11 +171,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*iot_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*iot.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return iot_sdkv2.NewFromConfig(cfg, - iot_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return iot.NewFromConfig(cfg, + iot.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/iotanalytics/service_endpoint_resolver_gen.go b/internal/service/iotanalytics/service_endpoint_resolver_gen.go index eba81098a25..653c69fc053 100644 --- a/internal/service/iotanalytics/service_endpoint_resolver_gen.go +++ b/internal/service/iotanalytics/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - iotanalytics_sdkv2 "github.com/aws/aws-sdk-go-v2/service/iotanalytics" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/iotanalytics" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ iotanalytics_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ iotanalytics.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver iotanalytics_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver iotanalytics.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: iotanalytics_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: iotanalytics.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params iotanalytics_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params iotanalytics.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params iotanalytics_ tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up iotanalytics endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params iotanalytics_ return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*iotanalytics_sdkv2.Options) { - return func(o *iotanalytics_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*iotanalytics.Options) { + return func(o *iotanalytics.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/iotanalytics/service_endpoints_gen_test.go b/internal/service/iotanalytics/service_endpoints_gen_test.go index 5e8bc4f5794..5b5f4a5f965 100644 --- a/internal/service/iotanalytics/service_endpoints_gen_test.go +++ b/internal/service/iotanalytics/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - iotanalytics_sdkv2 "github.com/aws/aws-sdk-go-v2/service/iotanalytics" + "github.com/aws/aws-sdk-go-v2/service/iotanalytics" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := iotanalytics_sdkv2.NewDefaultEndpointResolverV2() + r := iotanalytics.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), iotanalytics_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), iotanalytics.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := iotanalytics_sdkv2.NewDefaultEndpointResolverV2() + r := iotanalytics.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), iotanalytics_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), iotanalytics.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListChannels(ctx, &iotanalytics_sdkv2.ListChannelsInput{}, - func(opts *iotanalytics_sdkv2.Options) { + _, err := client.ListChannels(ctx, &iotanalytics.ListChannelsInput{}, + func(opts *iotanalytics.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/iotanalytics/service_package_gen.go b/internal/service/iotanalytics/service_package_gen.go index 32fcb9814eb..4d6dfb4686a 100644 --- a/internal/service/iotanalytics/service_package_gen.go +++ b/internal/service/iotanalytics/service_package_gen.go @@ -5,8 +5,8 @@ package iotanalytics import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - iotanalytics_sdkv2 "github.com/aws/aws-sdk-go-v2/service/iotanalytics" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/iotanalytics" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -35,11 +35,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*iotanalytics_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*iotanalytics.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return iotanalytics_sdkv2.NewFromConfig(cfg, - iotanalytics_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return iotanalytics.NewFromConfig(cfg, + iotanalytics.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/iotevents/service_endpoint_resolver_gen.go b/internal/service/iotevents/service_endpoint_resolver_gen.go index 013e6dc51c6..a1369af22bc 100644 --- a/internal/service/iotevents/service_endpoint_resolver_gen.go +++ b/internal/service/iotevents/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - iotevents_sdkv2 "github.com/aws/aws-sdk-go-v2/service/iotevents" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/iotevents" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ iotevents_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ iotevents.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver iotevents_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver iotevents.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: iotevents_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: iotevents.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params iotevents_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params iotevents.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params iotevents_sdk tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up iotevents endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params iotevents_sdk return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*iotevents_sdkv2.Options) { - return func(o *iotevents_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*iotevents.Options) { + return func(o *iotevents.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/iotevents/service_endpoints_gen_test.go b/internal/service/iotevents/service_endpoints_gen_test.go index f17981ff4e6..a79d9486820 100644 --- a/internal/service/iotevents/service_endpoints_gen_test.go +++ b/internal/service/iotevents/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - iotevents_sdkv2 "github.com/aws/aws-sdk-go-v2/service/iotevents" + "github.com/aws/aws-sdk-go-v2/service/iotevents" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := iotevents_sdkv2.NewDefaultEndpointResolverV2() + r := iotevents.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), iotevents_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), iotevents.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := iotevents_sdkv2.NewDefaultEndpointResolverV2() + r := iotevents.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), iotevents_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), iotevents.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListAlarmModels(ctx, &iotevents_sdkv2.ListAlarmModelsInput{}, - func(opts *iotevents_sdkv2.Options) { + _, err := client.ListAlarmModels(ctx, &iotevents.ListAlarmModelsInput{}, + func(opts *iotevents.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/iotevents/service_package_gen.go b/internal/service/iotevents/service_package_gen.go index c664bdbabc5..a12afe56fdc 100644 --- a/internal/service/iotevents/service_package_gen.go +++ b/internal/service/iotevents/service_package_gen.go @@ -5,8 +5,8 @@ package iotevents import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - iotevents_sdkv2 "github.com/aws/aws-sdk-go-v2/service/iotevents" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/iotevents" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -35,11 +35,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*iotevents_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*iotevents.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return iotevents_sdkv2.NewFromConfig(cfg, - iotevents_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return iotevents.NewFromConfig(cfg, + iotevents.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/ivs/service_endpoint_resolver_gen.go b/internal/service/ivs/service_endpoint_resolver_gen.go index 58495c307fe..c6ee0852761 100644 --- a/internal/service/ivs/service_endpoint_resolver_gen.go +++ b/internal/service/ivs/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - ivs_sdkv2 "github.com/aws/aws-sdk-go-v2/service/ivs" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/ivs" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ ivs_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ ivs.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver ivs_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver ivs.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: ivs_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: ivs.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params ivs_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params ivs.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params ivs_sdkv2.End tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up ivs endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params ivs_sdkv2.End return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*ivs_sdkv2.Options) { - return func(o *ivs_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*ivs.Options) { + return func(o *ivs.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/ivs/service_endpoints_gen_test.go b/internal/service/ivs/service_endpoints_gen_test.go index 6e0487c2da0..f5f62e5e571 100644 --- a/internal/service/ivs/service_endpoints_gen_test.go +++ b/internal/service/ivs/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - ivs_sdkv2 "github.com/aws/aws-sdk-go-v2/service/ivs" + "github.com/aws/aws-sdk-go-v2/service/ivs" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := ivs_sdkv2.NewDefaultEndpointResolverV2() + r := ivs.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), ivs_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), ivs.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := ivs_sdkv2.NewDefaultEndpointResolverV2() + r := ivs.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), ivs_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), ivs.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListChannels(ctx, &ivs_sdkv2.ListChannelsInput{}, - func(opts *ivs_sdkv2.Options) { + _, err := client.ListChannels(ctx, &ivs.ListChannelsInput{}, + func(opts *ivs.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/ivs/service_package_gen.go b/internal/service/ivs/service_package_gen.go index 9af4b3e36fe..df1227c0c81 100644 --- a/internal/service/ivs/service_package_gen.go +++ b/internal/service/ivs/service_package_gen.go @@ -5,8 +5,8 @@ package ivs import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - ivs_sdkv2 "github.com/aws/aws-sdk-go-v2/service/ivs" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/ivs" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -65,11 +65,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*ivs_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*ivs.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return ivs_sdkv2.NewFromConfig(cfg, - ivs_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return ivs.NewFromConfig(cfg, + ivs.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/ivschat/service_endpoint_resolver_gen.go b/internal/service/ivschat/service_endpoint_resolver_gen.go index 846167405ce..8717de5d415 100644 --- a/internal/service/ivschat/service_endpoint_resolver_gen.go +++ b/internal/service/ivschat/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - ivschat_sdkv2 "github.com/aws/aws-sdk-go-v2/service/ivschat" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/ivschat" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ ivschat_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ ivschat.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver ivschat_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver ivschat.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: ivschat_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: ivschat.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params ivschat_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params ivschat.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params ivschat_sdkv2 tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up ivschat endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params ivschat_sdkv2 return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*ivschat_sdkv2.Options) { - return func(o *ivschat_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*ivschat.Options) { + return func(o *ivschat.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/ivschat/service_endpoints_gen_test.go b/internal/service/ivschat/service_endpoints_gen_test.go index 4bec654ba8b..fd395364de1 100644 --- a/internal/service/ivschat/service_endpoints_gen_test.go +++ b/internal/service/ivschat/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - ivschat_sdkv2 "github.com/aws/aws-sdk-go-v2/service/ivschat" + "github.com/aws/aws-sdk-go-v2/service/ivschat" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := ivschat_sdkv2.NewDefaultEndpointResolverV2() + r := ivschat.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), ivschat_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), ivschat.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := ivschat_sdkv2.NewDefaultEndpointResolverV2() + r := ivschat.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), ivschat_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), ivschat.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListRooms(ctx, &ivschat_sdkv2.ListRoomsInput{}, - func(opts *ivschat_sdkv2.Options) { + _, err := client.ListRooms(ctx, &ivschat.ListRoomsInput{}, + func(opts *ivschat.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/ivschat/service_package_gen.go b/internal/service/ivschat/service_package_gen.go index e5309be335e..bc6059815c7 100644 --- a/internal/service/ivschat/service_package_gen.go +++ b/internal/service/ivschat/service_package_gen.go @@ -5,8 +5,8 @@ package ivschat import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - ivschat_sdkv2 "github.com/aws/aws-sdk-go-v2/service/ivschat" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/ivschat" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -52,11 +52,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*ivschat_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*ivschat.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return ivschat_sdkv2.NewFromConfig(cfg, - ivschat_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return ivschat.NewFromConfig(cfg, + ivschat.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/kafka/service_endpoint_resolver_gen.go b/internal/service/kafka/service_endpoint_resolver_gen.go index 8b1b945be3f..f630adba87d 100644 --- a/internal/service/kafka/service_endpoint_resolver_gen.go +++ b/internal/service/kafka/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - kafka_sdkv2 "github.com/aws/aws-sdk-go-v2/service/kafka" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/kafka" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ kafka_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ kafka.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver kafka_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver kafka.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: kafka_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: kafka.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params kafka_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params kafka.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params kafka_sdkv2.E tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up kafka endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params kafka_sdkv2.E return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*kafka_sdkv2.Options) { - return func(o *kafka_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*kafka.Options) { + return func(o *kafka.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/kafka/service_endpoints_gen_test.go b/internal/service/kafka/service_endpoints_gen_test.go index 68311368c22..0e1cad4dc8f 100644 --- a/internal/service/kafka/service_endpoints_gen_test.go +++ b/internal/service/kafka/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - kafka_sdkv2 "github.com/aws/aws-sdk-go-v2/service/kafka" + "github.com/aws/aws-sdk-go-v2/service/kafka" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -296,10 +296,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := kafka_sdkv2.NewDefaultEndpointResolverV2() + r := kafka.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), kafka_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), kafka.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -313,11 +313,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := kafka_sdkv2.NewDefaultEndpointResolverV2() + r := kafka.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), kafka_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), kafka.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -337,8 +337,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListClusters(ctx, &kafka_sdkv2.ListClustersInput{}, - func(opts *kafka_sdkv2.Options) { + _, err := client.ListClusters(ctx, &kafka.ListClustersInput{}, + func(opts *kafka.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/kafka/service_package.go b/internal/service/kafka/service_package.go index 7fb8e126004..7b39ed6c226 100644 --- a/internal/service/kafka/service_package.go +++ b/internal/service/kafka/service_package.go @@ -20,7 +20,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return kafka.NewFromConfig(cfg, - kafka.WithEndpointResolverV2(newEndpointResolverSDKv2()), + kafka.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), func(o *kafka.Options) { o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(func(err error) aws.Ternary { diff --git a/internal/service/kafkaconnect/service_endpoint_resolver_gen.go b/internal/service/kafkaconnect/service_endpoint_resolver_gen.go index ec9c3ea8ab5..14ac41d0f2a 100644 --- a/internal/service/kafkaconnect/service_endpoint_resolver_gen.go +++ b/internal/service/kafkaconnect/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - kafkaconnect_sdkv2 "github.com/aws/aws-sdk-go-v2/service/kafkaconnect" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/kafkaconnect" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ kafkaconnect_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ kafkaconnect.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver kafkaconnect_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver kafkaconnect.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: kafkaconnect_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: kafkaconnect.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params kafkaconnect_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params kafkaconnect.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params kafkaconnect_ tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up kafkaconnect endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params kafkaconnect_ return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*kafkaconnect_sdkv2.Options) { - return func(o *kafkaconnect_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*kafkaconnect.Options) { + return func(o *kafkaconnect.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/kafkaconnect/service_endpoints_gen_test.go b/internal/service/kafkaconnect/service_endpoints_gen_test.go index 080214bf02d..1944d366551 100644 --- a/internal/service/kafkaconnect/service_endpoints_gen_test.go +++ b/internal/service/kafkaconnect/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - kafkaconnect_sdkv2 "github.com/aws/aws-sdk-go-v2/service/kafkaconnect" + "github.com/aws/aws-sdk-go-v2/service/kafkaconnect" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := kafkaconnect_sdkv2.NewDefaultEndpointResolverV2() + r := kafkaconnect.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), kafkaconnect_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), kafkaconnect.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := kafkaconnect_sdkv2.NewDefaultEndpointResolverV2() + r := kafkaconnect.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), kafkaconnect_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), kafkaconnect.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListConnectors(ctx, &kafkaconnect_sdkv2.ListConnectorsInput{}, - func(opts *kafkaconnect_sdkv2.Options) { + _, err := client.ListConnectors(ctx, &kafkaconnect.ListConnectorsInput{}, + func(opts *kafkaconnect.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/kafkaconnect/service_package_gen.go b/internal/service/kafkaconnect/service_package_gen.go index 5a4f586bc5b..e41685761c9 100644 --- a/internal/service/kafkaconnect/service_package_gen.go +++ b/internal/service/kafkaconnect/service_package_gen.go @@ -5,8 +5,8 @@ package kafkaconnect import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - kafkaconnect_sdkv2 "github.com/aws/aws-sdk-go-v2/service/kafkaconnect" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/kafkaconnect" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -85,11 +85,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*kafkaconnect_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*kafkaconnect.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return kafkaconnect_sdkv2.NewFromConfig(cfg, - kafkaconnect_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return kafkaconnect.NewFromConfig(cfg, + kafkaconnect.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/kendra/service_endpoint_resolver_gen.go b/internal/service/kendra/service_endpoint_resolver_gen.go index ebaa1cc8ade..2afb9523ce7 100644 --- a/internal/service/kendra/service_endpoint_resolver_gen.go +++ b/internal/service/kendra/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - kendra_sdkv2 "github.com/aws/aws-sdk-go-v2/service/kendra" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/kendra" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ kendra_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ kendra.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver kendra_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver kendra.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: kendra_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: kendra.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params kendra_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params kendra.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params kendra_sdkv2. tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up kendra endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params kendra_sdkv2. return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*kendra_sdkv2.Options) { - return func(o *kendra_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*kendra.Options) { + return func(o *kendra.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/kendra/service_endpoints_gen_test.go b/internal/service/kendra/service_endpoints_gen_test.go index e6bd28e00dc..afe8ae2b1d2 100644 --- a/internal/service/kendra/service_endpoints_gen_test.go +++ b/internal/service/kendra/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - kendra_sdkv2 "github.com/aws/aws-sdk-go-v2/service/kendra" + "github.com/aws/aws-sdk-go-v2/service/kendra" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := kendra_sdkv2.NewDefaultEndpointResolverV2() + r := kendra.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), kendra_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), kendra.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := kendra_sdkv2.NewDefaultEndpointResolverV2() + r := kendra.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), kendra_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), kendra.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListIndices(ctx, &kendra_sdkv2.ListIndicesInput{}, - func(opts *kendra_sdkv2.Options) { + _, err := client.ListIndices(ctx, &kendra.ListIndicesInput{}, + func(opts *kendra.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/kendra/service_package_gen.go b/internal/service/kendra/service_package_gen.go index 9020eca3fb0..3559d491a19 100644 --- a/internal/service/kendra/service_package_gen.go +++ b/internal/service/kendra/service_package_gen.go @@ -5,8 +5,8 @@ package kendra import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - kendra_sdkv2 "github.com/aws/aws-sdk-go-v2/service/kendra" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/kendra" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -101,11 +101,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*kendra_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*kendra.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return kendra_sdkv2.NewFromConfig(cfg, - kendra_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return kendra.NewFromConfig(cfg, + kendra.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/keyspaces/service_endpoint_resolver_gen.go b/internal/service/keyspaces/service_endpoint_resolver_gen.go index d0ffb20e630..f577c639186 100644 --- a/internal/service/keyspaces/service_endpoint_resolver_gen.go +++ b/internal/service/keyspaces/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - keyspaces_sdkv2 "github.com/aws/aws-sdk-go-v2/service/keyspaces" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/keyspaces" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ keyspaces_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ keyspaces.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver keyspaces_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver keyspaces.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: keyspaces_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: keyspaces.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params keyspaces_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params keyspaces.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params keyspaces_sdk tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up keyspaces endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params keyspaces_sdk return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*keyspaces_sdkv2.Options) { - return func(o *keyspaces_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*keyspaces.Options) { + return func(o *keyspaces.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/keyspaces/service_endpoints_gen_test.go b/internal/service/keyspaces/service_endpoints_gen_test.go index 7665f89efcf..1981f82c75b 100644 --- a/internal/service/keyspaces/service_endpoints_gen_test.go +++ b/internal/service/keyspaces/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - keyspaces_sdkv2 "github.com/aws/aws-sdk-go-v2/service/keyspaces" + "github.com/aws/aws-sdk-go-v2/service/keyspaces" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := keyspaces_sdkv2.NewDefaultEndpointResolverV2() + r := keyspaces.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), keyspaces_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), keyspaces.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := keyspaces_sdkv2.NewDefaultEndpointResolverV2() + r := keyspaces.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), keyspaces_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), keyspaces.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListKeyspaces(ctx, &keyspaces_sdkv2.ListKeyspacesInput{}, - func(opts *keyspaces_sdkv2.Options) { + _, err := client.ListKeyspaces(ctx, &keyspaces.ListKeyspacesInput{}, + func(opts *keyspaces.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/keyspaces/service_package_gen.go b/internal/service/keyspaces/service_package_gen.go index 552afe84e43..eb98f23f4c1 100644 --- a/internal/service/keyspaces/service_package_gen.go +++ b/internal/service/keyspaces/service_package_gen.go @@ -5,8 +5,8 @@ package keyspaces import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - keyspaces_sdkv2 "github.com/aws/aws-sdk-go-v2/service/keyspaces" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/keyspaces" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -52,11 +52,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*keyspaces_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*keyspaces.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return keyspaces_sdkv2.NewFromConfig(cfg, - keyspaces_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return keyspaces.NewFromConfig(cfg, + keyspaces.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/kinesis/service_endpoint_resolver_gen.go b/internal/service/kinesis/service_endpoint_resolver_gen.go index 155859018d3..3edcc3caae7 100644 --- a/internal/service/kinesis/service_endpoint_resolver_gen.go +++ b/internal/service/kinesis/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - kinesis_sdkv2 "github.com/aws/aws-sdk-go-v2/service/kinesis" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/kinesis" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ kinesis_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ kinesis.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver kinesis_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver kinesis.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: kinesis_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: kinesis.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params kinesis_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params kinesis.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params kinesis_sdkv2 tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up kinesis endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params kinesis_sdkv2 return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*kinesis_sdkv2.Options) { - return func(o *kinesis_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*kinesis.Options) { + return func(o *kinesis.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/kinesis/service_endpoints_gen_test.go b/internal/service/kinesis/service_endpoints_gen_test.go index 39a4e25332a..b26f7c8e725 100644 --- a/internal/service/kinesis/service_endpoints_gen_test.go +++ b/internal/service/kinesis/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - kinesis_sdkv2 "github.com/aws/aws-sdk-go-v2/service/kinesis" + "github.com/aws/aws-sdk-go-v2/service/kinesis" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := kinesis_sdkv2.NewDefaultEndpointResolverV2() + r := kinesis.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), kinesis_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), kinesis.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := kinesis_sdkv2.NewDefaultEndpointResolverV2() + r := kinesis.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), kinesis_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), kinesis.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListStreams(ctx, &kinesis_sdkv2.ListStreamsInput{}, - func(opts *kinesis_sdkv2.Options) { + _, err := client.ListStreams(ctx, &kinesis.ListStreamsInput{}, + func(opts *kinesis.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/kinesis/service_package.go b/internal/service/kinesis/service_package.go index b5998e7c503..18b58be6c40 100644 --- a/internal/service/kinesis/service_package.go +++ b/internal/service/kinesis/service_package.go @@ -20,7 +20,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return kinesis.NewFromConfig(cfg, - kinesis.WithEndpointResolverV2(newEndpointResolverSDKv2()), + kinesis.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), func(o *kinesis.Options) { o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(func(err error) aws.Ternary { diff --git a/internal/service/kinesisanalytics/service_endpoint_resolver_gen.go b/internal/service/kinesisanalytics/service_endpoint_resolver_gen.go index c51670b999a..3c7aab734f5 100644 --- a/internal/service/kinesisanalytics/service_endpoint_resolver_gen.go +++ b/internal/service/kinesisanalytics/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - kinesisanalytics_sdkv2 "github.com/aws/aws-sdk-go-v2/service/kinesisanalytics" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/kinesisanalytics" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ kinesisanalytics_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ kinesisanalytics.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver kinesisanalytics_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver kinesisanalytics.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: kinesisanalytics_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: kinesisanalytics.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params kinesisanalytics_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params kinesisanalytics.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params kinesisanalyt tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up kinesisanalytics endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params kinesisanalyt return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*kinesisanalytics_sdkv2.Options) { - return func(o *kinesisanalytics_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*kinesisanalytics.Options) { + return func(o *kinesisanalytics.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/kinesisanalytics/service_endpoints_gen_test.go b/internal/service/kinesisanalytics/service_endpoints_gen_test.go index 498010c6ece..d12211193c6 100644 --- a/internal/service/kinesisanalytics/service_endpoints_gen_test.go +++ b/internal/service/kinesisanalytics/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - kinesisanalytics_sdkv2 "github.com/aws/aws-sdk-go-v2/service/kinesisanalytics" + "github.com/aws/aws-sdk-go-v2/service/kinesisanalytics" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := kinesisanalytics_sdkv2.NewDefaultEndpointResolverV2() + r := kinesisanalytics.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), kinesisanalytics_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), kinesisanalytics.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := kinesisanalytics_sdkv2.NewDefaultEndpointResolverV2() + r := kinesisanalytics.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), kinesisanalytics_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), kinesisanalytics.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListApplications(ctx, &kinesisanalytics_sdkv2.ListApplicationsInput{}, - func(opts *kinesisanalytics_sdkv2.Options) { + _, err := client.ListApplications(ctx, &kinesisanalytics.ListApplicationsInput{}, + func(opts *kinesisanalytics.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/kinesisanalytics/service_package_gen.go b/internal/service/kinesisanalytics/service_package_gen.go index 763bea8a399..9731a0eee46 100644 --- a/internal/service/kinesisanalytics/service_package_gen.go +++ b/internal/service/kinesisanalytics/service_package_gen.go @@ -5,8 +5,8 @@ package kinesisanalytics import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - kinesisanalytics_sdkv2 "github.com/aws/aws-sdk-go-v2/service/kinesisanalytics" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/kinesisanalytics" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -44,11 +44,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*kinesisanalytics_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*kinesisanalytics.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return kinesisanalytics_sdkv2.NewFromConfig(cfg, - kinesisanalytics_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return kinesisanalytics.NewFromConfig(cfg, + kinesisanalytics.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/kinesisanalyticsv2/service_endpoint_resolver_gen.go b/internal/service/kinesisanalyticsv2/service_endpoint_resolver_gen.go index bcf21b930d8..0aa1230e6c2 100644 --- a/internal/service/kinesisanalyticsv2/service_endpoint_resolver_gen.go +++ b/internal/service/kinesisanalyticsv2/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - kinesisanalyticsv2_sdkv2 "github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ kinesisanalyticsv2_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ kinesisanalyticsv2.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver kinesisanalyticsv2_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver kinesisanalyticsv2.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: kinesisanalyticsv2_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: kinesisanalyticsv2.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params kinesisanalyticsv2_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params kinesisanalyticsv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params kinesisanalyt tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up kinesisanalyticsv2 endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params kinesisanalyt return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*kinesisanalyticsv2_sdkv2.Options) { - return func(o *kinesisanalyticsv2_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*kinesisanalyticsv2.Options) { + return func(o *kinesisanalyticsv2.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/kinesisanalyticsv2/service_endpoints_gen_test.go b/internal/service/kinesisanalyticsv2/service_endpoints_gen_test.go index 18ce9e0ea2d..87a85205cf6 100644 --- a/internal/service/kinesisanalyticsv2/service_endpoints_gen_test.go +++ b/internal/service/kinesisanalyticsv2/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - kinesisanalyticsv2_sdkv2 "github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2" + "github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := kinesisanalyticsv2_sdkv2.NewDefaultEndpointResolverV2() + r := kinesisanalyticsv2.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), kinesisanalyticsv2_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), kinesisanalyticsv2.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := kinesisanalyticsv2_sdkv2.NewDefaultEndpointResolverV2() + r := kinesisanalyticsv2.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), kinesisanalyticsv2_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), kinesisanalyticsv2.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListApplications(ctx, &kinesisanalyticsv2_sdkv2.ListApplicationsInput{}, - func(opts *kinesisanalyticsv2_sdkv2.Options) { + _, err := client.ListApplications(ctx, &kinesisanalyticsv2.ListApplicationsInput{}, + func(opts *kinesisanalyticsv2.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/kinesisanalyticsv2/service_package_gen.go b/internal/service/kinesisanalyticsv2/service_package_gen.go index a65b00b51e9..0d3737522a8 100644 --- a/internal/service/kinesisanalyticsv2/service_package_gen.go +++ b/internal/service/kinesisanalyticsv2/service_package_gen.go @@ -5,8 +5,8 @@ package kinesisanalyticsv2 import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - kinesisanalyticsv2_sdkv2 "github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -49,11 +49,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*kinesisanalyticsv2_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*kinesisanalyticsv2.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return kinesisanalyticsv2_sdkv2.NewFromConfig(cfg, - kinesisanalyticsv2_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return kinesisanalyticsv2.NewFromConfig(cfg, + kinesisanalyticsv2.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/kinesisvideo/service_endpoint_resolver_gen.go b/internal/service/kinesisvideo/service_endpoint_resolver_gen.go index 968336a5308..4f75f7349b1 100644 --- a/internal/service/kinesisvideo/service_endpoint_resolver_gen.go +++ b/internal/service/kinesisvideo/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - kinesisvideo_sdkv2 "github.com/aws/aws-sdk-go-v2/service/kinesisvideo" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/kinesisvideo" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ kinesisvideo_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ kinesisvideo.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver kinesisvideo_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver kinesisvideo.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: kinesisvideo_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: kinesisvideo.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params kinesisvideo_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params kinesisvideo.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params kinesisvideo_ tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up kinesisvideo endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params kinesisvideo_ return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*kinesisvideo_sdkv2.Options) { - return func(o *kinesisvideo_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*kinesisvideo.Options) { + return func(o *kinesisvideo.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/kinesisvideo/service_endpoints_gen_test.go b/internal/service/kinesisvideo/service_endpoints_gen_test.go index 5ef43d76e3c..01cfc6e0e2a 100644 --- a/internal/service/kinesisvideo/service_endpoints_gen_test.go +++ b/internal/service/kinesisvideo/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - kinesisvideo_sdkv2 "github.com/aws/aws-sdk-go-v2/service/kinesisvideo" + "github.com/aws/aws-sdk-go-v2/service/kinesisvideo" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := kinesisvideo_sdkv2.NewDefaultEndpointResolverV2() + r := kinesisvideo.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), kinesisvideo_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), kinesisvideo.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := kinesisvideo_sdkv2.NewDefaultEndpointResolverV2() + r := kinesisvideo.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), kinesisvideo_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), kinesisvideo.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListStreams(ctx, &kinesisvideo_sdkv2.ListStreamsInput{}, - func(opts *kinesisvideo_sdkv2.Options) { + _, err := client.ListStreams(ctx, &kinesisvideo.ListStreamsInput{}, + func(opts *kinesisvideo.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/kinesisvideo/service_package_gen.go b/internal/service/kinesisvideo/service_package_gen.go index 2baf14337e3..a5357b65e40 100644 --- a/internal/service/kinesisvideo/service_package_gen.go +++ b/internal/service/kinesisvideo/service_package_gen.go @@ -5,8 +5,8 @@ package kinesisvideo import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - kinesisvideo_sdkv2 "github.com/aws/aws-sdk-go-v2/service/kinesisvideo" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/kinesisvideo" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -44,11 +44,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*kinesisvideo_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*kinesisvideo.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return kinesisvideo_sdkv2.NewFromConfig(cfg, - kinesisvideo_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return kinesisvideo.NewFromConfig(cfg, + kinesisvideo.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/kms/service_endpoint_resolver_gen.go b/internal/service/kms/service_endpoint_resolver_gen.go index 3d191ecadc8..08c41e961bf 100644 --- a/internal/service/kms/service_endpoint_resolver_gen.go +++ b/internal/service/kms/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - kms_sdkv2 "github.com/aws/aws-sdk-go-v2/service/kms" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/kms" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ kms_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ kms.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver kms_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver kms.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: kms_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: kms.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params kms_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params kms.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params kms_sdkv2.End tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up kms endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params kms_sdkv2.End return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*kms_sdkv2.Options) { - return func(o *kms_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*kms.Options) { + return func(o *kms.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/kms/service_endpoints_gen_test.go b/internal/service/kms/service_endpoints_gen_test.go index bded90a87a5..7b548b12fb2 100644 --- a/internal/service/kms/service_endpoints_gen_test.go +++ b/internal/service/kms/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - kms_sdkv2 "github.com/aws/aws-sdk-go-v2/service/kms" + "github.com/aws/aws-sdk-go-v2/service/kms" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := kms_sdkv2.NewDefaultEndpointResolverV2() + r := kms.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), kms_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), kms.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := kms_sdkv2.NewDefaultEndpointResolverV2() + r := kms.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), kms_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), kms.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListKeys(ctx, &kms_sdkv2.ListKeysInput{}, - func(opts *kms_sdkv2.Options) { + _, err := client.ListKeys(ctx, &kms.ListKeysInput{}, + func(opts *kms.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/kms/service_package_gen.go b/internal/service/kms/service_package_gen.go index 012e16b31ba..26bd968780e 100644 --- a/internal/service/kms/service_package_gen.go +++ b/internal/service/kms/service_package_gen.go @@ -5,8 +5,8 @@ package kms import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - kms_sdkv2 "github.com/aws/aws-sdk-go-v2/service/kms" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/kms" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -129,11 +129,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*kms_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*kms.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return kms_sdkv2.NewFromConfig(cfg, - kms_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return kms.NewFromConfig(cfg, + kms.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/lakeformation/service_endpoint_resolver_gen.go b/internal/service/lakeformation/service_endpoint_resolver_gen.go index 9da1ed421d4..2aa2369a6f2 100644 --- a/internal/service/lakeformation/service_endpoint_resolver_gen.go +++ b/internal/service/lakeformation/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - lakeformation_sdkv2 "github.com/aws/aws-sdk-go-v2/service/lakeformation" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/lakeformation" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ lakeformation_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ lakeformation.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver lakeformation_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver lakeformation.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: lakeformation_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: lakeformation.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params lakeformation_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params lakeformation.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params lakeformation tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up lakeformation endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params lakeformation return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*lakeformation_sdkv2.Options) { - return func(o *lakeformation_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*lakeformation.Options) { + return func(o *lakeformation.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/lakeformation/service_endpoints_gen_test.go b/internal/service/lakeformation/service_endpoints_gen_test.go index 7768c2084f9..0f89fbd9d1f 100644 --- a/internal/service/lakeformation/service_endpoints_gen_test.go +++ b/internal/service/lakeformation/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - lakeformation_sdkv2 "github.com/aws/aws-sdk-go-v2/service/lakeformation" + "github.com/aws/aws-sdk-go-v2/service/lakeformation" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := lakeformation_sdkv2.NewDefaultEndpointResolverV2() + r := lakeformation.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), lakeformation_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), lakeformation.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := lakeformation_sdkv2.NewDefaultEndpointResolverV2() + r := lakeformation.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), lakeformation_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), lakeformation.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListResources(ctx, &lakeformation_sdkv2.ListResourcesInput{}, - func(opts *lakeformation_sdkv2.Options) { + _, err := client.ListResources(ctx, &lakeformation.ListResourcesInput{}, + func(opts *lakeformation.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/lakeformation/service_package_gen.go b/internal/service/lakeformation/service_package_gen.go index b979bbfdeff..0c5ff86de1c 100644 --- a/internal/service/lakeformation/service_package_gen.go +++ b/internal/service/lakeformation/service_package_gen.go @@ -5,8 +5,8 @@ package lakeformation import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - lakeformation_sdkv2 "github.com/aws/aws-sdk-go-v2/service/lakeformation" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/lakeformation" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -79,11 +79,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*lakeformation_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*lakeformation.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return lakeformation_sdkv2.NewFromConfig(cfg, - lakeformation_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return lakeformation.NewFromConfig(cfg, + lakeformation.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/lambda/service_endpoint_resolver_gen.go b/internal/service/lambda/service_endpoint_resolver_gen.go index eddf02e25ce..352d37b7029 100644 --- a/internal/service/lambda/service_endpoint_resolver_gen.go +++ b/internal/service/lambda/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - lambda_sdkv2 "github.com/aws/aws-sdk-go-v2/service/lambda" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/lambda" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ lambda_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ lambda.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver lambda_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver lambda.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: lambda_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: lambda.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params lambda_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params lambda.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params lambda_sdkv2. tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up lambda endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params lambda_sdkv2. return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*lambda_sdkv2.Options) { - return func(o *lambda_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*lambda.Options) { + return func(o *lambda.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/lambda/service_endpoints_gen_test.go b/internal/service/lambda/service_endpoints_gen_test.go index f3b125a595d..c3b9b403391 100644 --- a/internal/service/lambda/service_endpoints_gen_test.go +++ b/internal/service/lambda/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - lambda_sdkv2 "github.com/aws/aws-sdk-go-v2/service/lambda" + "github.com/aws/aws-sdk-go-v2/service/lambda" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := lambda_sdkv2.NewDefaultEndpointResolverV2() + r := lambda.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), lambda_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), lambda.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := lambda_sdkv2.NewDefaultEndpointResolverV2() + r := lambda.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), lambda_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), lambda.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListFunctions(ctx, &lambda_sdkv2.ListFunctionsInput{}, - func(opts *lambda_sdkv2.Options) { + _, err := client.ListFunctions(ctx, &lambda.ListFunctionsInput{}, + func(opts *lambda.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/lambda/service_package_gen.go b/internal/service/lambda/service_package_gen.go index c70ed5f1f4c..b787967d5a9 100644 --- a/internal/service/lambda/service_package_gen.go +++ b/internal/service/lambda/service_package_gen.go @@ -5,8 +5,8 @@ package lambda import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - lambda_sdkv2 "github.com/aws/aws-sdk-go-v2/service/lambda" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/lambda" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -145,11 +145,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*lambda_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*lambda.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return lambda_sdkv2.NewFromConfig(cfg, - lambda_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return lambda.NewFromConfig(cfg, + lambda.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/launchwizard/service_endpoint_resolver_gen.go b/internal/service/launchwizard/service_endpoint_resolver_gen.go index 05074f34636..7433df508a4 100644 --- a/internal/service/launchwizard/service_endpoint_resolver_gen.go +++ b/internal/service/launchwizard/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - launchwizard_sdkv2 "github.com/aws/aws-sdk-go-v2/service/launchwizard" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/launchwizard" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ launchwizard_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ launchwizard.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver launchwizard_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver launchwizard.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: launchwizard_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: launchwizard.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params launchwizard_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params launchwizard.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params launchwizard_ tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up launchwizard endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params launchwizard_ return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*launchwizard_sdkv2.Options) { - return func(o *launchwizard_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*launchwizard.Options) { + return func(o *launchwizard.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/launchwizard/service_endpoints_gen_test.go b/internal/service/launchwizard/service_endpoints_gen_test.go index d779b0bf765..7ba10b35434 100644 --- a/internal/service/launchwizard/service_endpoints_gen_test.go +++ b/internal/service/launchwizard/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - launchwizard_sdkv2 "github.com/aws/aws-sdk-go-v2/service/launchwizard" + "github.com/aws/aws-sdk-go-v2/service/launchwizard" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := launchwizard_sdkv2.NewDefaultEndpointResolverV2() + r := launchwizard.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), launchwizard_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), launchwizard.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := launchwizard_sdkv2.NewDefaultEndpointResolverV2() + r := launchwizard.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), launchwizard_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), launchwizard.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListWorkloads(ctx, &launchwizard_sdkv2.ListWorkloadsInput{}, - func(opts *launchwizard_sdkv2.Options) { + _, err := client.ListWorkloads(ctx, &launchwizard.ListWorkloadsInput{}, + func(opts *launchwizard.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/launchwizard/service_package_gen.go b/internal/service/launchwizard/service_package_gen.go index 7686a7cb4f2..effd7fdd15d 100644 --- a/internal/service/launchwizard/service_package_gen.go +++ b/internal/service/launchwizard/service_package_gen.go @@ -5,8 +5,8 @@ package launchwizard import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - launchwizard_sdkv2 "github.com/aws/aws-sdk-go-v2/service/launchwizard" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/launchwizard" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -35,11 +35,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*launchwizard_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*launchwizard.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return launchwizard_sdkv2.NewFromConfig(cfg, - launchwizard_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return launchwizard.NewFromConfig(cfg, + launchwizard.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/lexmodels/service_endpoint_resolver_gen.go b/internal/service/lexmodels/service_endpoint_resolver_gen.go index c8a2a7bbb89..8dcff3f27bf 100644 --- a/internal/service/lexmodels/service_endpoint_resolver_gen.go +++ b/internal/service/lexmodels/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - lexmodelbuildingservice_sdkv2 "github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ lexmodelbuildingservice_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ lexmodelbuildingservice.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver lexmodelbuildingservice_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver lexmodelbuildingservice.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: lexmodelbuildingservice_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: lexmodelbuildingservice.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params lexmodelbuildingservice_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params lexmodelbuildingservice.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params lexmodelbuild tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up lexmodelbuildingservice endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params lexmodelbuild return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*lexmodelbuildingservice_sdkv2.Options) { - return func(o *lexmodelbuildingservice_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*lexmodelbuildingservice.Options) { + return func(o *lexmodelbuildingservice.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/lexmodels/service_endpoints_gen_test.go b/internal/service/lexmodels/service_endpoints_gen_test.go index 3d24ced93ed..30d172749f1 100644 --- a/internal/service/lexmodels/service_endpoints_gen_test.go +++ b/internal/service/lexmodels/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - lexmodelbuildingservice_sdkv2 "github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice" + "github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -422,10 +422,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := lexmodelbuildingservice_sdkv2.NewDefaultEndpointResolverV2() + r := lexmodelbuildingservice.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), lexmodelbuildingservice_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), lexmodelbuildingservice.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -439,11 +439,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := lexmodelbuildingservice_sdkv2.NewDefaultEndpointResolverV2() + r := lexmodelbuildingservice.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), lexmodelbuildingservice_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), lexmodelbuildingservice.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -463,8 +463,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.GetBots(ctx, &lexmodelbuildingservice_sdkv2.GetBotsInput{}, - func(opts *lexmodelbuildingservice_sdkv2.Options) { + _, err := client.GetBots(ctx, &lexmodelbuildingservice.GetBotsInput{}, + func(opts *lexmodelbuildingservice.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/lexmodels/service_package_gen.go b/internal/service/lexmodels/service_package_gen.go index 81a7630030d..1af8a7bbbef 100644 --- a/internal/service/lexmodels/service_package_gen.go +++ b/internal/service/lexmodels/service_package_gen.go @@ -5,8 +5,8 @@ package lexmodels import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - lexmodelbuildingservice_sdkv2 "github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -76,11 +76,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*lexmodelbuildingservice_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*lexmodelbuildingservice.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return lexmodelbuildingservice_sdkv2.NewFromConfig(cfg, - lexmodelbuildingservice_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return lexmodelbuildingservice.NewFromConfig(cfg, + lexmodelbuildingservice.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/lexv2models/service_endpoint_resolver_gen.go b/internal/service/lexv2models/service_endpoint_resolver_gen.go index 58668959901..eea952506e2 100644 --- a/internal/service/lexv2models/service_endpoint_resolver_gen.go +++ b/internal/service/lexv2models/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - lexmodelsv2_sdkv2 "github.com/aws/aws-sdk-go-v2/service/lexmodelsv2" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/lexmodelsv2" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ lexmodelsv2_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ lexmodelsv2.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver lexmodelsv2_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver lexmodelsv2.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: lexmodelsv2_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: lexmodelsv2.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params lexmodelsv2_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params lexmodelsv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params lexmodelsv2_s tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up lexmodelsv2 endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params lexmodelsv2_s return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*lexmodelsv2_sdkv2.Options) { - return func(o *lexmodelsv2_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*lexmodelsv2.Options) { + return func(o *lexmodelsv2.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/lexv2models/service_endpoints_gen_test.go b/internal/service/lexv2models/service_endpoints_gen_test.go index f5a4b7a88ac..04e4c8a4d65 100644 --- a/internal/service/lexv2models/service_endpoints_gen_test.go +++ b/internal/service/lexv2models/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - lexmodelsv2_sdkv2 "github.com/aws/aws-sdk-go-v2/service/lexmodelsv2" + "github.com/aws/aws-sdk-go-v2/service/lexmodelsv2" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -296,10 +296,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := lexmodelsv2_sdkv2.NewDefaultEndpointResolverV2() + r := lexmodelsv2.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), lexmodelsv2_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), lexmodelsv2.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -313,11 +313,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := lexmodelsv2_sdkv2.NewDefaultEndpointResolverV2() + r := lexmodelsv2.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), lexmodelsv2_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), lexmodelsv2.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -337,8 +337,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListBots(ctx, &lexmodelsv2_sdkv2.ListBotsInput{}, - func(opts *lexmodelsv2_sdkv2.Options) { + _, err := client.ListBots(ctx, &lexmodelsv2.ListBotsInput{}, + func(opts *lexmodelsv2.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/lexv2models/service_package_gen.go b/internal/service/lexv2models/service_package_gen.go index 5e59cad211b..b4cd15d1335 100644 --- a/internal/service/lexv2models/service_package_gen.go +++ b/internal/service/lexv2models/service_package_gen.go @@ -5,8 +5,8 @@ package lexv2models import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - lexmodelsv2_sdkv2 "github.com/aws/aws-sdk-go-v2/service/lexmodelsv2" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/lexmodelsv2" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -63,11 +63,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*lexmodelsv2_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*lexmodelsv2.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return lexmodelsv2_sdkv2.NewFromConfig(cfg, - lexmodelsv2_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return lexmodelsv2.NewFromConfig(cfg, + lexmodelsv2.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/licensemanager/service_endpoint_resolver_gen.go b/internal/service/licensemanager/service_endpoint_resolver_gen.go index 45f67af9a71..c13288d804b 100644 --- a/internal/service/licensemanager/service_endpoint_resolver_gen.go +++ b/internal/service/licensemanager/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - licensemanager_sdkv2 "github.com/aws/aws-sdk-go-v2/service/licensemanager" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/licensemanager" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ licensemanager_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ licensemanager.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver licensemanager_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver licensemanager.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: licensemanager_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: licensemanager.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params licensemanager_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params licensemanager.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params licensemanage tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up licensemanager endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params licensemanage return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*licensemanager_sdkv2.Options) { - return func(o *licensemanager_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*licensemanager.Options) { + return func(o *licensemanager.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/licensemanager/service_endpoints_gen_test.go b/internal/service/licensemanager/service_endpoints_gen_test.go index 0ce78eed49c..07e126a210a 100644 --- a/internal/service/licensemanager/service_endpoints_gen_test.go +++ b/internal/service/licensemanager/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - licensemanager_sdkv2 "github.com/aws/aws-sdk-go-v2/service/licensemanager" + "github.com/aws/aws-sdk-go-v2/service/licensemanager" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := licensemanager_sdkv2.NewDefaultEndpointResolverV2() + r := licensemanager.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), licensemanager_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), licensemanager.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := licensemanager_sdkv2.NewDefaultEndpointResolverV2() + r := licensemanager.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), licensemanager_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), licensemanager.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListLicenseConfigurations(ctx, &licensemanager_sdkv2.ListLicenseConfigurationsInput{}, - func(opts *licensemanager_sdkv2.Options) { + _, err := client.ListLicenseConfigurations(ctx, &licensemanager.ListLicenseConfigurationsInput{}, + func(opts *licensemanager.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/licensemanager/service_package_gen.go b/internal/service/licensemanager/service_package_gen.go index 69ae65d41a6..374ad15ba9e 100644 --- a/internal/service/licensemanager/service_package_gen.go +++ b/internal/service/licensemanager/service_package_gen.go @@ -5,8 +5,8 @@ package licensemanager import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - licensemanager_sdkv2 "github.com/aws/aws-sdk-go-v2/service/licensemanager" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/licensemanager" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -75,11 +75,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*licensemanager_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*licensemanager.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return licensemanager_sdkv2.NewFromConfig(cfg, - licensemanager_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return licensemanager.NewFromConfig(cfg, + licensemanager.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/lightsail/service_endpoint_resolver_gen.go b/internal/service/lightsail/service_endpoint_resolver_gen.go index b8945a34e37..5833c03017c 100644 --- a/internal/service/lightsail/service_endpoint_resolver_gen.go +++ b/internal/service/lightsail/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - lightsail_sdkv2 "github.com/aws/aws-sdk-go-v2/service/lightsail" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/lightsail" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ lightsail_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ lightsail.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver lightsail_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver lightsail.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: lightsail_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: lightsail.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params lightsail_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params lightsail.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params lightsail_sdk tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up lightsail endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params lightsail_sdk return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*lightsail_sdkv2.Options) { - return func(o *lightsail_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*lightsail.Options) { + return func(o *lightsail.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/lightsail/service_endpoints_gen_test.go b/internal/service/lightsail/service_endpoints_gen_test.go index b2690c81831..4b66fdcb547 100644 --- a/internal/service/lightsail/service_endpoints_gen_test.go +++ b/internal/service/lightsail/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - lightsail_sdkv2 "github.com/aws/aws-sdk-go-v2/service/lightsail" + "github.com/aws/aws-sdk-go-v2/service/lightsail" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := lightsail_sdkv2.NewDefaultEndpointResolverV2() + r := lightsail.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), lightsail_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), lightsail.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := lightsail_sdkv2.NewDefaultEndpointResolverV2() + r := lightsail.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), lightsail_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), lightsail.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.GetInstances(ctx, &lightsail_sdkv2.GetInstancesInput{}, - func(opts *lightsail_sdkv2.Options) { + _, err := client.GetInstances(ctx, &lightsail.GetInstancesInput{}, + func(opts *lightsail.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/lightsail/service_package.go b/internal/service/lightsail/service_package.go index 9741b0aba11..db52a63eacf 100644 --- a/internal/service/lightsail/service_package.go +++ b/internal/service/lightsail/service_package.go @@ -21,7 +21,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return lightsail.NewFromConfig(cfg, - lightsail.WithEndpointResolverV2(newEndpointResolverSDKv2()), + lightsail.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), func(o *lightsail.Options) { o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(func(err error) aws.Ternary { diff --git a/internal/service/location/service_endpoint_resolver_gen.go b/internal/service/location/service_endpoint_resolver_gen.go index b709d78159b..31d7dcde0a2 100644 --- a/internal/service/location/service_endpoint_resolver_gen.go +++ b/internal/service/location/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - location_sdkv2 "github.com/aws/aws-sdk-go-v2/service/location" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/location" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ location_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ location.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver location_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver location.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: location_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: location.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params location_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params location.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params location_sdkv tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up location endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params location_sdkv return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*location_sdkv2.Options) { - return func(o *location_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*location.Options) { + return func(o *location.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/location/service_package_gen.go b/internal/service/location/service_package_gen.go index 2811fe6f50e..3c89b4d220b 100644 --- a/internal/service/location/service_package_gen.go +++ b/internal/service/location/service_package_gen.go @@ -5,8 +5,8 @@ package location import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - location_sdkv2 "github.com/aws/aws-sdk-go-v2/service/location" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/location" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -109,11 +109,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*location_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*location.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return location_sdkv2.NewFromConfig(cfg, - location_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return location.NewFromConfig(cfg, + location.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/logs/service_endpoint_resolver_gen.go b/internal/service/logs/service_endpoint_resolver_gen.go index ad3874557d0..b43e3fd31a1 100644 --- a/internal/service/logs/service_endpoint_resolver_gen.go +++ b/internal/service/logs/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - cloudwatchlogs_sdkv2 "github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ cloudwatchlogs_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ cloudwatchlogs.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver cloudwatchlogs_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver cloudwatchlogs.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: cloudwatchlogs_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: cloudwatchlogs.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params cloudwatchlogs_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params cloudwatchlogs.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params cloudwatchlog tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up cloudwatchlogs endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params cloudwatchlog return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*cloudwatchlogs_sdkv2.Options) { - return func(o *cloudwatchlogs_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*cloudwatchlogs.Options) { + return func(o *cloudwatchlogs.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/logs/service_endpoints_gen_test.go b/internal/service/logs/service_endpoints_gen_test.go index 1ebd53a6328..2a43a35018c 100644 --- a/internal/service/logs/service_endpoints_gen_test.go +++ b/internal/service/logs/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - cloudwatchlogs_sdkv2 "github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs" + "github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -355,10 +355,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := cloudwatchlogs_sdkv2.NewDefaultEndpointResolverV2() + r := cloudwatchlogs.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), cloudwatchlogs_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), cloudwatchlogs.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -372,11 +372,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := cloudwatchlogs_sdkv2.NewDefaultEndpointResolverV2() + r := cloudwatchlogs.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), cloudwatchlogs_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), cloudwatchlogs.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -396,8 +396,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListAnomalies(ctx, &cloudwatchlogs_sdkv2.ListAnomaliesInput{}, - func(opts *cloudwatchlogs_sdkv2.Options) { + _, err := client.ListAnomalies(ctx, &cloudwatchlogs.ListAnomaliesInput{}, + func(opts *cloudwatchlogs.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/logs/service_package_gen.go b/internal/service/logs/service_package_gen.go index 283f7fc720d..43150af5c10 100644 --- a/internal/service/logs/service_package_gen.go +++ b/internal/service/logs/service_package_gen.go @@ -5,8 +5,8 @@ package logs import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - cloudwatchlogs_sdkv2 "github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -102,11 +102,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*cloudwatchlogs_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*cloudwatchlogs.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return cloudwatchlogs_sdkv2.NewFromConfig(cfg, - cloudwatchlogs_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return cloudwatchlogs.NewFromConfig(cfg, + cloudwatchlogs.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/lookoutmetrics/service_endpoint_resolver_gen.go b/internal/service/lookoutmetrics/service_endpoint_resolver_gen.go index 4bba23d3d1d..319cc604738 100644 --- a/internal/service/lookoutmetrics/service_endpoint_resolver_gen.go +++ b/internal/service/lookoutmetrics/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - lookoutmetrics_sdkv2 "github.com/aws/aws-sdk-go-v2/service/lookoutmetrics" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/lookoutmetrics" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ lookoutmetrics_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ lookoutmetrics.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver lookoutmetrics_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver lookoutmetrics.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: lookoutmetrics_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: lookoutmetrics.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params lookoutmetrics_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params lookoutmetrics.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params lookoutmetric tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up lookoutmetrics endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params lookoutmetric return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*lookoutmetrics_sdkv2.Options) { - return func(o *lookoutmetrics_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*lookoutmetrics.Options) { + return func(o *lookoutmetrics.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/lookoutmetrics/service_endpoints_gen_test.go b/internal/service/lookoutmetrics/service_endpoints_gen_test.go index 86314117ac4..05fc8364fc6 100644 --- a/internal/service/lookoutmetrics/service_endpoints_gen_test.go +++ b/internal/service/lookoutmetrics/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - lookoutmetrics_sdkv2 "github.com/aws/aws-sdk-go-v2/service/lookoutmetrics" + "github.com/aws/aws-sdk-go-v2/service/lookoutmetrics" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := lookoutmetrics_sdkv2.NewDefaultEndpointResolverV2() + r := lookoutmetrics.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), lookoutmetrics_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), lookoutmetrics.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := lookoutmetrics_sdkv2.NewDefaultEndpointResolverV2() + r := lookoutmetrics.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), lookoutmetrics_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), lookoutmetrics.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListMetricSets(ctx, &lookoutmetrics_sdkv2.ListMetricSetsInput{}, - func(opts *lookoutmetrics_sdkv2.Options) { + _, err := client.ListMetricSets(ctx, &lookoutmetrics.ListMetricSetsInput{}, + func(opts *lookoutmetrics.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/lookoutmetrics/service_package_gen.go b/internal/service/lookoutmetrics/service_package_gen.go index 589afbfc397..49b4fa10670 100644 --- a/internal/service/lookoutmetrics/service_package_gen.go +++ b/internal/service/lookoutmetrics/service_package_gen.go @@ -5,8 +5,8 @@ package lookoutmetrics import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - lookoutmetrics_sdkv2 "github.com/aws/aws-sdk-go-v2/service/lookoutmetrics" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/lookoutmetrics" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -35,11 +35,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*lookoutmetrics_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*lookoutmetrics.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return lookoutmetrics_sdkv2.NewFromConfig(cfg, - lookoutmetrics_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return lookoutmetrics.NewFromConfig(cfg, + lookoutmetrics.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/m2/service_endpoint_resolver_gen.go b/internal/service/m2/service_endpoint_resolver_gen.go index b02504b1580..3a44bcf74eb 100644 --- a/internal/service/m2/service_endpoint_resolver_gen.go +++ b/internal/service/m2/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - m2_sdkv2 "github.com/aws/aws-sdk-go-v2/service/m2" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/m2" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ m2_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ m2.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver m2_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver m2.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: m2_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: m2.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params m2_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params m2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params m2_sdkv2.Endp tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up m2 endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params m2_sdkv2.Endp return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*m2_sdkv2.Options) { - return func(o *m2_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*m2.Options) { + return func(o *m2.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/m2/service_endpoints_gen_test.go b/internal/service/m2/service_endpoints_gen_test.go index f15e03ca08b..de5debb2c93 100644 --- a/internal/service/m2/service_endpoints_gen_test.go +++ b/internal/service/m2/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - m2_sdkv2 "github.com/aws/aws-sdk-go-v2/service/m2" + "github.com/aws/aws-sdk-go-v2/service/m2" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := m2_sdkv2.NewDefaultEndpointResolverV2() + r := m2.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), m2_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), m2.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := m2_sdkv2.NewDefaultEndpointResolverV2() + r := m2.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), m2_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), m2.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListApplications(ctx, &m2_sdkv2.ListApplicationsInput{}, - func(opts *m2_sdkv2.Options) { + _, err := client.ListApplications(ctx, &m2.ListApplicationsInput{}, + func(opts *m2.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/m2/service_package_gen.go b/internal/service/m2/service_package_gen.go index 5d730add214..22b74491e94 100644 --- a/internal/service/m2/service_package_gen.go +++ b/internal/service/m2/service_package_gen.go @@ -5,8 +5,8 @@ package m2 import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - m2_sdkv2 "github.com/aws/aws-sdk-go-v2/service/m2" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/m2" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -54,11 +54,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*m2_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*m2.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return m2_sdkv2.NewFromConfig(cfg, - m2_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return m2.NewFromConfig(cfg, + m2.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/macie2/service_endpoint_resolver_gen.go b/internal/service/macie2/service_endpoint_resolver_gen.go index 2e0a6340dcf..97d6b81b0ae 100644 --- a/internal/service/macie2/service_endpoint_resolver_gen.go +++ b/internal/service/macie2/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - macie2_sdkv2 "github.com/aws/aws-sdk-go-v2/service/macie2" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/macie2" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ macie2_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ macie2.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver macie2_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver macie2.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: macie2_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: macie2.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params macie2_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params macie2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params macie2_sdkv2. tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up macie2 endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params macie2_sdkv2. return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*macie2_sdkv2.Options) { - return func(o *macie2_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*macie2.Options) { + return func(o *macie2.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/macie2/service_endpoints_gen_test.go b/internal/service/macie2/service_endpoints_gen_test.go index 708402edc39..80a094eabaf 100644 --- a/internal/service/macie2/service_endpoints_gen_test.go +++ b/internal/service/macie2/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - macie2_sdkv2 "github.com/aws/aws-sdk-go-v2/service/macie2" + "github.com/aws/aws-sdk-go-v2/service/macie2" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := macie2_sdkv2.NewDefaultEndpointResolverV2() + r := macie2.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), macie2_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), macie2.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := macie2_sdkv2.NewDefaultEndpointResolverV2() + r := macie2.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), macie2_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), macie2.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListFindings(ctx, &macie2_sdkv2.ListFindingsInput{}, - func(opts *macie2_sdkv2.Options) { + _, err := client.ListFindings(ctx, &macie2.ListFindingsInput{}, + func(opts *macie2.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/macie2/service_package_gen.go b/internal/service/macie2/service_package_gen.go index af4d920323d..58ce8469a97 100644 --- a/internal/service/macie2/service_package_gen.go +++ b/internal/service/macie2/service_package_gen.go @@ -5,8 +5,8 @@ package macie2 import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - macie2_sdkv2 "github.com/aws/aws-sdk-go-v2/service/macie2" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/macie2" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -80,11 +80,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*macie2_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*macie2.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return macie2_sdkv2.NewFromConfig(cfg, - macie2_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return macie2.NewFromConfig(cfg, + macie2.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/mediaconnect/service_endpoint_resolver_gen.go b/internal/service/mediaconnect/service_endpoint_resolver_gen.go index edce80ae4b4..f508a9fc988 100644 --- a/internal/service/mediaconnect/service_endpoint_resolver_gen.go +++ b/internal/service/mediaconnect/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - mediaconnect_sdkv2 "github.com/aws/aws-sdk-go-v2/service/mediaconnect" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/mediaconnect" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ mediaconnect_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ mediaconnect.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver mediaconnect_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver mediaconnect.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: mediaconnect_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: mediaconnect.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params mediaconnect_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params mediaconnect.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params mediaconnect_ tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up mediaconnect endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params mediaconnect_ return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*mediaconnect_sdkv2.Options) { - return func(o *mediaconnect_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*mediaconnect.Options) { + return func(o *mediaconnect.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/mediaconnect/service_endpoints_gen_test.go b/internal/service/mediaconnect/service_endpoints_gen_test.go index b0811aa4889..3f3e1213e9f 100644 --- a/internal/service/mediaconnect/service_endpoints_gen_test.go +++ b/internal/service/mediaconnect/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - mediaconnect_sdkv2 "github.com/aws/aws-sdk-go-v2/service/mediaconnect" + "github.com/aws/aws-sdk-go-v2/service/mediaconnect" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := mediaconnect_sdkv2.NewDefaultEndpointResolverV2() + r := mediaconnect.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), mediaconnect_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), mediaconnect.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := mediaconnect_sdkv2.NewDefaultEndpointResolverV2() + r := mediaconnect.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), mediaconnect_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), mediaconnect.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListBridges(ctx, &mediaconnect_sdkv2.ListBridgesInput{}, - func(opts *mediaconnect_sdkv2.Options) { + _, err := client.ListBridges(ctx, &mediaconnect.ListBridgesInput{}, + func(opts *mediaconnect.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/mediaconnect/service_package_gen.go b/internal/service/mediaconnect/service_package_gen.go index 20f3febc209..42b4872b7a6 100644 --- a/internal/service/mediaconnect/service_package_gen.go +++ b/internal/service/mediaconnect/service_package_gen.go @@ -5,8 +5,8 @@ package mediaconnect import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - mediaconnect_sdkv2 "github.com/aws/aws-sdk-go-v2/service/mediaconnect" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/mediaconnect" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -35,11 +35,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*mediaconnect_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*mediaconnect.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return mediaconnect_sdkv2.NewFromConfig(cfg, - mediaconnect_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return mediaconnect.NewFromConfig(cfg, + mediaconnect.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/mediaconvert/service_endpoint_resolver_gen.go b/internal/service/mediaconvert/service_endpoint_resolver_gen.go index f18489f36d9..b01467a80c7 100644 --- a/internal/service/mediaconvert/service_endpoint_resolver_gen.go +++ b/internal/service/mediaconvert/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - mediaconvert_sdkv2 "github.com/aws/aws-sdk-go-v2/service/mediaconvert" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/mediaconvert" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ mediaconvert_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ mediaconvert.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver mediaconvert_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver mediaconvert.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: mediaconvert_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: mediaconvert.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params mediaconvert_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params mediaconvert.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params mediaconvert_ tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up mediaconvert endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params mediaconvert_ return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*mediaconvert_sdkv2.Options) { - return func(o *mediaconvert_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*mediaconvert.Options) { + return func(o *mediaconvert.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/mediaconvert/service_endpoints_gen_test.go b/internal/service/mediaconvert/service_endpoints_gen_test.go index fecb7293668..51deed3013f 100644 --- a/internal/service/mediaconvert/service_endpoints_gen_test.go +++ b/internal/service/mediaconvert/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - mediaconvert_sdkv2 "github.com/aws/aws-sdk-go-v2/service/mediaconvert" + "github.com/aws/aws-sdk-go-v2/service/mediaconvert" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := mediaconvert_sdkv2.NewDefaultEndpointResolverV2() + r := mediaconvert.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), mediaconvert_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), mediaconvert.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := mediaconvert_sdkv2.NewDefaultEndpointResolverV2() + r := mediaconvert.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), mediaconvert_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), mediaconvert.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListJobs(ctx, &mediaconvert_sdkv2.ListJobsInput{}, - func(opts *mediaconvert_sdkv2.Options) { + _, err := client.ListJobs(ctx, &mediaconvert.ListJobsInput{}, + func(opts *mediaconvert.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/mediaconvert/service_package_gen.go b/internal/service/mediaconvert/service_package_gen.go index dbd9672aef7..3d4e8a1c513 100644 --- a/internal/service/mediaconvert/service_package_gen.go +++ b/internal/service/mediaconvert/service_package_gen.go @@ -5,8 +5,8 @@ package mediaconvert import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - mediaconvert_sdkv2 "github.com/aws/aws-sdk-go-v2/service/mediaconvert" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/mediaconvert" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -53,11 +53,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*mediaconvert_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*mediaconvert.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return mediaconvert_sdkv2.NewFromConfig(cfg, - mediaconvert_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return mediaconvert.NewFromConfig(cfg, + mediaconvert.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/medialive/service_endpoint_resolver_gen.go b/internal/service/medialive/service_endpoint_resolver_gen.go index fbaf32ec2b4..1f726ce79b1 100644 --- a/internal/service/medialive/service_endpoint_resolver_gen.go +++ b/internal/service/medialive/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - medialive_sdkv2 "github.com/aws/aws-sdk-go-v2/service/medialive" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/medialive" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ medialive_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ medialive.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver medialive_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver medialive.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: medialive_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: medialive.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params medialive_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params medialive.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params medialive_sdk tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up medialive endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params medialive_sdk return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*medialive_sdkv2.Options) { - return func(o *medialive_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*medialive.Options) { + return func(o *medialive.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/medialive/service_endpoints_gen_test.go b/internal/service/medialive/service_endpoints_gen_test.go index 598e9498c68..d2ff84c4b6d 100644 --- a/internal/service/medialive/service_endpoints_gen_test.go +++ b/internal/service/medialive/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - medialive_sdkv2 "github.com/aws/aws-sdk-go-v2/service/medialive" + "github.com/aws/aws-sdk-go-v2/service/medialive" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := medialive_sdkv2.NewDefaultEndpointResolverV2() + r := medialive.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), medialive_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), medialive.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := medialive_sdkv2.NewDefaultEndpointResolverV2() + r := medialive.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), medialive_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), medialive.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListOfferings(ctx, &medialive_sdkv2.ListOfferingsInput{}, - func(opts *medialive_sdkv2.Options) { + _, err := client.ListOfferings(ctx, &medialive.ListOfferingsInput{}, + func(opts *medialive.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/medialive/service_package_gen.go b/internal/service/medialive/service_package_gen.go index 5fdc269e9a5..45d8298e8b3 100644 --- a/internal/service/medialive/service_package_gen.go +++ b/internal/service/medialive/service_package_gen.go @@ -5,8 +5,8 @@ package medialive import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - medialive_sdkv2 "github.com/aws/aws-sdk-go-v2/service/medialive" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/medialive" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -77,11 +77,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*medialive_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*medialive.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return medialive_sdkv2.NewFromConfig(cfg, - medialive_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return medialive.NewFromConfig(cfg, + medialive.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/mediapackage/service_endpoint_resolver_gen.go b/internal/service/mediapackage/service_endpoint_resolver_gen.go index 10e45dc9536..83b86be3724 100644 --- a/internal/service/mediapackage/service_endpoint_resolver_gen.go +++ b/internal/service/mediapackage/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - mediapackage_sdkv2 "github.com/aws/aws-sdk-go-v2/service/mediapackage" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/mediapackage" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ mediapackage_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ mediapackage.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver mediapackage_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver mediapackage.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: mediapackage_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: mediapackage.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params mediapackage_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params mediapackage.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params mediapackage_ tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up mediapackage endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params mediapackage_ return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*mediapackage_sdkv2.Options) { - return func(o *mediapackage_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*mediapackage.Options) { + return func(o *mediapackage.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/mediapackage/service_endpoints_gen_test.go b/internal/service/mediapackage/service_endpoints_gen_test.go index 2c278264837..2a4f6cdd788 100644 --- a/internal/service/mediapackage/service_endpoints_gen_test.go +++ b/internal/service/mediapackage/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - mediapackage_sdkv2 "github.com/aws/aws-sdk-go-v2/service/mediapackage" + "github.com/aws/aws-sdk-go-v2/service/mediapackage" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := mediapackage_sdkv2.NewDefaultEndpointResolverV2() + r := mediapackage.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), mediapackage_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), mediapackage.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := mediapackage_sdkv2.NewDefaultEndpointResolverV2() + r := mediapackage.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), mediapackage_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), mediapackage.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListChannels(ctx, &mediapackage_sdkv2.ListChannelsInput{}, - func(opts *mediapackage_sdkv2.Options) { + _, err := client.ListChannels(ctx, &mediapackage.ListChannelsInput{}, + func(opts *mediapackage.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/mediapackage/service_package_gen.go b/internal/service/mediapackage/service_package_gen.go index 2ad78fcf337..99dac3fed08 100644 --- a/internal/service/mediapackage/service_package_gen.go +++ b/internal/service/mediapackage/service_package_gen.go @@ -5,8 +5,8 @@ package mediapackage import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - mediapackage_sdkv2 "github.com/aws/aws-sdk-go-v2/service/mediapackage" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/mediapackage" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -44,11 +44,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*mediapackage_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*mediapackage.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return mediapackage_sdkv2.NewFromConfig(cfg, - mediapackage_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return mediapackage.NewFromConfig(cfg, + mediapackage.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/mediapackagev2/service_endpoint_resolver_gen.go b/internal/service/mediapackagev2/service_endpoint_resolver_gen.go index 1173787d817..86fcda578f6 100644 --- a/internal/service/mediapackagev2/service_endpoint_resolver_gen.go +++ b/internal/service/mediapackagev2/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - mediapackagev2_sdkv2 "github.com/aws/aws-sdk-go-v2/service/mediapackagev2" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/mediapackagev2" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ mediapackagev2_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ mediapackagev2.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver mediapackagev2_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver mediapackagev2.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: mediapackagev2_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: mediapackagev2.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params mediapackagev2_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params mediapackagev2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params mediapackagev tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up mediapackagev2 endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params mediapackagev return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*mediapackagev2_sdkv2.Options) { - return func(o *mediapackagev2_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*mediapackagev2.Options) { + return func(o *mediapackagev2.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/mediapackagev2/service_endpoints_gen_test.go b/internal/service/mediapackagev2/service_endpoints_gen_test.go index c7900cef74c..fab2b6f1b32 100644 --- a/internal/service/mediapackagev2/service_endpoints_gen_test.go +++ b/internal/service/mediapackagev2/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - mediapackagev2_sdkv2 "github.com/aws/aws-sdk-go-v2/service/mediapackagev2" + "github.com/aws/aws-sdk-go-v2/service/mediapackagev2" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := mediapackagev2_sdkv2.NewDefaultEndpointResolverV2() + r := mediapackagev2.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), mediapackagev2_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), mediapackagev2.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := mediapackagev2_sdkv2.NewDefaultEndpointResolverV2() + r := mediapackagev2.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), mediapackagev2_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), mediapackagev2.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListChannelGroups(ctx, &mediapackagev2_sdkv2.ListChannelGroupsInput{}, - func(opts *mediapackagev2_sdkv2.Options) { + _, err := client.ListChannelGroups(ctx, &mediapackagev2.ListChannelGroupsInput{}, + func(opts *mediapackagev2.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/mediapackagev2/service_package_gen.go b/internal/service/mediapackagev2/service_package_gen.go index 1a5bf9e1f7a..edfb4b32cd2 100644 --- a/internal/service/mediapackagev2/service_package_gen.go +++ b/internal/service/mediapackagev2/service_package_gen.go @@ -5,8 +5,8 @@ package mediapackagev2 import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - mediapackagev2_sdkv2 "github.com/aws/aws-sdk-go-v2/service/mediapackagev2" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/mediapackagev2" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -35,11 +35,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*mediapackagev2_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*mediapackagev2.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return mediapackagev2_sdkv2.NewFromConfig(cfg, - mediapackagev2_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return mediapackagev2.NewFromConfig(cfg, + mediapackagev2.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/mediastore/service_endpoint_resolver_gen.go b/internal/service/mediastore/service_endpoint_resolver_gen.go index a3f770246ac..c7da8fbbf1a 100644 --- a/internal/service/mediastore/service_endpoint_resolver_gen.go +++ b/internal/service/mediastore/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - mediastore_sdkv2 "github.com/aws/aws-sdk-go-v2/service/mediastore" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/mediastore" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ mediastore_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ mediastore.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver mediastore_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver mediastore.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: mediastore_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: mediastore.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params mediastore_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params mediastore.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params mediastore_sd tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up mediastore endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params mediastore_sd return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*mediastore_sdkv2.Options) { - return func(o *mediastore_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*mediastore.Options) { + return func(o *mediastore.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/mediastore/service_endpoints_gen_test.go b/internal/service/mediastore/service_endpoints_gen_test.go index e8e8c448c12..15ae8686486 100644 --- a/internal/service/mediastore/service_endpoints_gen_test.go +++ b/internal/service/mediastore/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - mediastore_sdkv2 "github.com/aws/aws-sdk-go-v2/service/mediastore" + "github.com/aws/aws-sdk-go-v2/service/mediastore" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := mediastore_sdkv2.NewDefaultEndpointResolverV2() + r := mediastore.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), mediastore_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), mediastore.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := mediastore_sdkv2.NewDefaultEndpointResolverV2() + r := mediastore.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), mediastore_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), mediastore.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListContainers(ctx, &mediastore_sdkv2.ListContainersInput{}, - func(opts *mediastore_sdkv2.Options) { + _, err := client.ListContainers(ctx, &mediastore.ListContainersInput{}, + func(opts *mediastore.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/mediastore/service_package_gen.go b/internal/service/mediastore/service_package_gen.go index 8b0c82c7788..1749214297b 100644 --- a/internal/service/mediastore/service_package_gen.go +++ b/internal/service/mediastore/service_package_gen.go @@ -5,8 +5,8 @@ package mediastore import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - mediastore_sdkv2 "github.com/aws/aws-sdk-go-v2/service/mediastore" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/mediastore" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -48,11 +48,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*mediastore_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*mediastore.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return mediastore_sdkv2.NewFromConfig(cfg, - mediastore_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return mediastore.NewFromConfig(cfg, + mediastore.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/memorydb/service_endpoint_resolver_gen.go b/internal/service/memorydb/service_endpoint_resolver_gen.go index 70fe548a565..e8965ab66a7 100644 --- a/internal/service/memorydb/service_endpoint_resolver_gen.go +++ b/internal/service/memorydb/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - memorydb_sdkv2 "github.com/aws/aws-sdk-go-v2/service/memorydb" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/memorydb" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ memorydb_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ memorydb.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver memorydb_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver memorydb.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: memorydb_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: memorydb.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params memorydb_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params memorydb.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params memorydb_sdkv tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up memorydb endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params memorydb_sdkv return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*memorydb_sdkv2.Options) { - return func(o *memorydb_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*memorydb.Options) { + return func(o *memorydb.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/memorydb/service_endpoints_gen_test.go b/internal/service/memorydb/service_endpoints_gen_test.go index 88d3d8b6748..e1a0f90f420 100644 --- a/internal/service/memorydb/service_endpoints_gen_test.go +++ b/internal/service/memorydb/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - memorydb_sdkv2 "github.com/aws/aws-sdk-go-v2/service/memorydb" + "github.com/aws/aws-sdk-go-v2/service/memorydb" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := memorydb_sdkv2.NewDefaultEndpointResolverV2() + r := memorydb.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), memorydb_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), memorydb.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := memorydb_sdkv2.NewDefaultEndpointResolverV2() + r := memorydb.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), memorydb_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), memorydb.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.DescribeClusters(ctx, &memorydb_sdkv2.DescribeClustersInput{}, - func(opts *memorydb_sdkv2.Options) { + _, err := client.DescribeClusters(ctx, &memorydb.DescribeClustersInput{}, + func(opts *memorydb.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/memorydb/service_package_gen.go b/internal/service/memorydb/service_package_gen.go index 4a6516b561f..6792524af95 100644 --- a/internal/service/memorydb/service_package_gen.go +++ b/internal/service/memorydb/service_package_gen.go @@ -5,8 +5,8 @@ package memorydb import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - memorydb_sdkv2 "github.com/aws/aws-sdk-go-v2/service/memorydb" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/memorydb" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -115,11 +115,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*memorydb_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*memorydb.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return memorydb_sdkv2.NewFromConfig(cfg, - memorydb_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return memorydb.NewFromConfig(cfg, + memorydb.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/mq/service_endpoint_resolver_gen.go b/internal/service/mq/service_endpoint_resolver_gen.go index b34425906f7..6eae088697b 100644 --- a/internal/service/mq/service_endpoint_resolver_gen.go +++ b/internal/service/mq/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - mq_sdkv2 "github.com/aws/aws-sdk-go-v2/service/mq" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/mq" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ mq_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ mq.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver mq_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver mq.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: mq_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: mq.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params mq_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params mq.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params mq_sdkv2.Endp tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up mq endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params mq_sdkv2.Endp return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*mq_sdkv2.Options) { - return func(o *mq_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*mq.Options) { + return func(o *mq.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/mq/service_endpoints_gen_test.go b/internal/service/mq/service_endpoints_gen_test.go index 45340607c85..a018a0c7826 100644 --- a/internal/service/mq/service_endpoints_gen_test.go +++ b/internal/service/mq/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - mq_sdkv2 "github.com/aws/aws-sdk-go-v2/service/mq" + "github.com/aws/aws-sdk-go-v2/service/mq" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := mq_sdkv2.NewDefaultEndpointResolverV2() + r := mq.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), mq_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), mq.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := mq_sdkv2.NewDefaultEndpointResolverV2() + r := mq.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), mq_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), mq.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListBrokers(ctx, &mq_sdkv2.ListBrokersInput{}, - func(opts *mq_sdkv2.Options) { + _, err := client.ListBrokers(ctx, &mq.ListBrokersInput{}, + func(opts *mq.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/mq/service_package_gen.go b/internal/service/mq/service_package_gen.go index e2f4dafde65..b39f6eb3ae8 100644 --- a/internal/service/mq/service_package_gen.go +++ b/internal/service/mq/service_package_gen.go @@ -5,8 +5,8 @@ package mq import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - mq_sdkv2 "github.com/aws/aws-sdk-go-v2/service/mq" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/mq" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -68,11 +68,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*mq_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*mq.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return mq_sdkv2.NewFromConfig(cfg, - mq_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return mq.NewFromConfig(cfg, + mq.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/mwaa/service_endpoint_resolver_gen.go b/internal/service/mwaa/service_endpoint_resolver_gen.go index f2d52704cc6..9887fbba8a9 100644 --- a/internal/service/mwaa/service_endpoint_resolver_gen.go +++ b/internal/service/mwaa/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - mwaa_sdkv2 "github.com/aws/aws-sdk-go-v2/service/mwaa" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/mwaa" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ mwaa_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ mwaa.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver mwaa_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver mwaa.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: mwaa_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: mwaa.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params mwaa_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params mwaa.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params mwaa_sdkv2.En tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up mwaa endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params mwaa_sdkv2.En return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*mwaa_sdkv2.Options) { - return func(o *mwaa_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*mwaa.Options) { + return func(o *mwaa.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/mwaa/service_package_gen.go b/internal/service/mwaa/service_package_gen.go index 9aad805d5fe..e6005f1c3d9 100644 --- a/internal/service/mwaa/service_package_gen.go +++ b/internal/service/mwaa/service_package_gen.go @@ -5,8 +5,8 @@ package mwaa import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - mwaa_sdkv2 "github.com/aws/aws-sdk-go-v2/service/mwaa" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/mwaa" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -44,11 +44,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*mwaa_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*mwaa.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return mwaa_sdkv2.NewFromConfig(cfg, - mwaa_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return mwaa.NewFromConfig(cfg, + mwaa.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/neptune/service_endpoint_resolver_gen.go b/internal/service/neptune/service_endpoint_resolver_gen.go index 7ae3934b75f..90cd111da22 100644 --- a/internal/service/neptune/service_endpoint_resolver_gen.go +++ b/internal/service/neptune/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - neptune_sdkv2 "github.com/aws/aws-sdk-go-v2/service/neptune" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/neptune" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ neptune_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ neptune.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver neptune_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver neptune.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: neptune_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: neptune.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params neptune_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params neptune.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params neptune_sdkv2 tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up neptune endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params neptune_sdkv2 return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*neptune_sdkv2.Options) { - return func(o *neptune_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*neptune.Options) { + return func(o *neptune.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/neptune/service_endpoints_gen_test.go b/internal/service/neptune/service_endpoints_gen_test.go index 4f113d059a2..ae1a79862a2 100644 --- a/internal/service/neptune/service_endpoints_gen_test.go +++ b/internal/service/neptune/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - neptune_sdkv2 "github.com/aws/aws-sdk-go-v2/service/neptune" + "github.com/aws/aws-sdk-go-v2/service/neptune" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := neptune_sdkv2.NewDefaultEndpointResolverV2() + r := neptune.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), neptune_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), neptune.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := neptune_sdkv2.NewDefaultEndpointResolverV2() + r := neptune.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), neptune_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), neptune.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.DescribeDBClusters(ctx, &neptune_sdkv2.DescribeDBClustersInput{}, - func(opts *neptune_sdkv2.Options) { + _, err := client.DescribeDBClusters(ctx, &neptune.DescribeDBClustersInput{}, + func(opts *neptune.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/neptune/service_package_gen.go b/internal/service/neptune/service_package_gen.go index 96875522c82..3f852a6a90a 100644 --- a/internal/service/neptune/service_package_gen.go +++ b/internal/service/neptune/service_package_gen.go @@ -5,8 +5,8 @@ package neptune import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - neptune_sdkv2 "github.com/aws/aws-sdk-go-v2/service/neptune" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/neptune" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -113,11 +113,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*neptune_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*neptune.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return neptune_sdkv2.NewFromConfig(cfg, - neptune_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return neptune.NewFromConfig(cfg, + neptune.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/neptunegraph/service_endpoint_resolver_gen.go b/internal/service/neptunegraph/service_endpoint_resolver_gen.go index 20805e472f0..40f969b1d45 100644 --- a/internal/service/neptunegraph/service_endpoint_resolver_gen.go +++ b/internal/service/neptunegraph/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - neptunegraph_sdkv2 "github.com/aws/aws-sdk-go-v2/service/neptunegraph" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/neptunegraph" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ neptunegraph_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ neptunegraph.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver neptunegraph_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver neptunegraph.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: neptunegraph_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: neptunegraph.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params neptunegraph_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params neptunegraph.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params neptunegraph_ tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up neptunegraph endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params neptunegraph_ return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*neptunegraph_sdkv2.Options) { - return func(o *neptunegraph_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*neptunegraph.Options) { + return func(o *neptunegraph.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/neptunegraph/service_package_gen.go b/internal/service/neptunegraph/service_package_gen.go index 699cca71095..a2f7e33bff9 100644 --- a/internal/service/neptunegraph/service_package_gen.go +++ b/internal/service/neptunegraph/service_package_gen.go @@ -5,8 +5,8 @@ package neptunegraph import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - neptunegraph_sdkv2 "github.com/aws/aws-sdk-go-v2/service/neptunegraph" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/neptunegraph" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -35,11 +35,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*neptunegraph_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*neptunegraph.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return neptunegraph_sdkv2.NewFromConfig(cfg, - neptunegraph_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return neptunegraph.NewFromConfig(cfg, + neptunegraph.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/networkfirewall/service_endpoint_resolver_gen.go b/internal/service/networkfirewall/service_endpoint_resolver_gen.go index cde2ef0198d..5d762fe871f 100644 --- a/internal/service/networkfirewall/service_endpoint_resolver_gen.go +++ b/internal/service/networkfirewall/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - networkfirewall_sdkv2 "github.com/aws/aws-sdk-go-v2/service/networkfirewall" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/networkfirewall" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ networkfirewall_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ networkfirewall.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver networkfirewall_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver networkfirewall.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: networkfirewall_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: networkfirewall.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params networkfirewall_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params networkfirewall.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params networkfirewa tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up networkfirewall endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params networkfirewa return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*networkfirewall_sdkv2.Options) { - return func(o *networkfirewall_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*networkfirewall.Options) { + return func(o *networkfirewall.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/networkfirewall/service_endpoints_gen_test.go b/internal/service/networkfirewall/service_endpoints_gen_test.go index d1a0c6ad4a3..09ef8d43516 100644 --- a/internal/service/networkfirewall/service_endpoints_gen_test.go +++ b/internal/service/networkfirewall/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - networkfirewall_sdkv2 "github.com/aws/aws-sdk-go-v2/service/networkfirewall" + "github.com/aws/aws-sdk-go-v2/service/networkfirewall" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := networkfirewall_sdkv2.NewDefaultEndpointResolverV2() + r := networkfirewall.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), networkfirewall_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), networkfirewall.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := networkfirewall_sdkv2.NewDefaultEndpointResolverV2() + r := networkfirewall.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), networkfirewall_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), networkfirewall.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListFirewalls(ctx, &networkfirewall_sdkv2.ListFirewallsInput{}, - func(opts *networkfirewall_sdkv2.Options) { + _, err := client.ListFirewalls(ctx, &networkfirewall.ListFirewallsInput{}, + func(opts *networkfirewall.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/networkfirewall/service_package_gen.go b/internal/service/networkfirewall/service_package_gen.go index 267439726ec..7b74ba0a883 100644 --- a/internal/service/networkfirewall/service_package_gen.go +++ b/internal/service/networkfirewall/service_package_gen.go @@ -5,8 +5,8 @@ package networkfirewall import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - networkfirewall_sdkv2 "github.com/aws/aws-sdk-go-v2/service/networkfirewall" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/networkfirewall" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -96,11 +96,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*networkfirewall_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*networkfirewall.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return networkfirewall_sdkv2.NewFromConfig(cfg, - networkfirewall_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return networkfirewall.NewFromConfig(cfg, + networkfirewall.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/networkmanager/service_endpoint_resolver_gen.go b/internal/service/networkmanager/service_endpoint_resolver_gen.go index 7120137df00..38e56133f66 100644 --- a/internal/service/networkmanager/service_endpoint_resolver_gen.go +++ b/internal/service/networkmanager/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - networkmanager_sdkv2 "github.com/aws/aws-sdk-go-v2/service/networkmanager" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/networkmanager" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ networkmanager_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ networkmanager.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver networkmanager_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver networkmanager.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: networkmanager_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: networkmanager.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params networkmanager_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params networkmanager.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params networkmanage tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up networkmanager endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params networkmanage return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*networkmanager_sdkv2.Options) { - return func(o *networkmanager_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*networkmanager.Options) { + return func(o *networkmanager.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/networkmanager/service_endpoints_gen_test.go b/internal/service/networkmanager/service_endpoints_gen_test.go index da547b3f2cb..d0e196defd7 100644 --- a/internal/service/networkmanager/service_endpoints_gen_test.go +++ b/internal/service/networkmanager/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - networkmanager_sdkv2 "github.com/aws/aws-sdk-go-v2/service/networkmanager" + "github.com/aws/aws-sdk-go-v2/service/networkmanager" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := networkmanager_sdkv2.NewDefaultEndpointResolverV2() + r := networkmanager.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), networkmanager_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), networkmanager.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := networkmanager_sdkv2.NewDefaultEndpointResolverV2() + r := networkmanager.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), networkmanager_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), networkmanager.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListCoreNetworks(ctx, &networkmanager_sdkv2.ListCoreNetworksInput{}, - func(opts *networkmanager_sdkv2.Options) { + _, err := client.ListCoreNetworks(ctx, &networkmanager.ListCoreNetworksInput{}, + func(opts *networkmanager.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/networkmanager/service_package_gen.go b/internal/service/networkmanager/service_package_gen.go index 5998f6472f5..3e491b77c3c 100644 --- a/internal/service/networkmanager/service_package_gen.go +++ b/internal/service/networkmanager/service_package_gen.go @@ -5,8 +5,8 @@ package networkmanager import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - networkmanager_sdkv2 "github.com/aws/aws-sdk-go-v2/service/networkmanager" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/networkmanager" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -218,11 +218,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*networkmanager_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*networkmanager.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return networkmanager_sdkv2.NewFromConfig(cfg, - networkmanager_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return networkmanager.NewFromConfig(cfg, + networkmanager.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/networkmonitor/service_endpoint_resolver_gen.go b/internal/service/networkmonitor/service_endpoint_resolver_gen.go index c4505310f2d..a77f41113b6 100644 --- a/internal/service/networkmonitor/service_endpoint_resolver_gen.go +++ b/internal/service/networkmonitor/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - networkmonitor_sdkv2 "github.com/aws/aws-sdk-go-v2/service/networkmonitor" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/networkmonitor" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ networkmonitor_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ networkmonitor.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver networkmonitor_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver networkmonitor.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: networkmonitor_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: networkmonitor.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params networkmonitor_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params networkmonitor.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params networkmonito tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up networkmonitor endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params networkmonito return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*networkmonitor_sdkv2.Options) { - return func(o *networkmonitor_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*networkmonitor.Options) { + return func(o *networkmonitor.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/networkmonitor/service_endpoints_gen_test.go b/internal/service/networkmonitor/service_endpoints_gen_test.go index 222f70372a9..7182f23b502 100644 --- a/internal/service/networkmonitor/service_endpoints_gen_test.go +++ b/internal/service/networkmonitor/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - networkmonitor_sdkv2 "github.com/aws/aws-sdk-go-v2/service/networkmonitor" + "github.com/aws/aws-sdk-go-v2/service/networkmonitor" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := networkmonitor_sdkv2.NewDefaultEndpointResolverV2() + r := networkmonitor.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), networkmonitor_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), networkmonitor.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := networkmonitor_sdkv2.NewDefaultEndpointResolverV2() + r := networkmonitor.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), networkmonitor_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), networkmonitor.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListMonitors(ctx, &networkmonitor_sdkv2.ListMonitorsInput{}, - func(opts *networkmonitor_sdkv2.Options) { + _, err := client.ListMonitors(ctx, &networkmonitor.ListMonitorsInput{}, + func(opts *networkmonitor.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/networkmonitor/service_package_gen.go b/internal/service/networkmonitor/service_package_gen.go index de51b85ce97..77505ac4bb0 100644 --- a/internal/service/networkmonitor/service_package_gen.go +++ b/internal/service/networkmonitor/service_package_gen.go @@ -5,8 +5,8 @@ package networkmonitor import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - networkmonitor_sdkv2 "github.com/aws/aws-sdk-go-v2/service/networkmonitor" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/networkmonitor" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -50,11 +50,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*networkmonitor_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*networkmonitor.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return networkmonitor_sdkv2.NewFromConfig(cfg, - networkmonitor_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return networkmonitor.NewFromConfig(cfg, + networkmonitor.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/oam/service_endpoint_resolver_gen.go b/internal/service/oam/service_endpoint_resolver_gen.go index 06de202246c..52e81cc9d0e 100644 --- a/internal/service/oam/service_endpoint_resolver_gen.go +++ b/internal/service/oam/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - oam_sdkv2 "github.com/aws/aws-sdk-go-v2/service/oam" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/oam" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ oam_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ oam.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver oam_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver oam.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: oam_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: oam.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params oam_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params oam.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params oam_sdkv2.End tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up oam endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params oam_sdkv2.End return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*oam_sdkv2.Options) { - return func(o *oam_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*oam.Options) { + return func(o *oam.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/oam/service_endpoints_gen_test.go b/internal/service/oam/service_endpoints_gen_test.go index 4fc08bf1c02..6b10039fdfb 100644 --- a/internal/service/oam/service_endpoints_gen_test.go +++ b/internal/service/oam/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - oam_sdkv2 "github.com/aws/aws-sdk-go-v2/service/oam" + "github.com/aws/aws-sdk-go-v2/service/oam" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -296,10 +296,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := oam_sdkv2.NewDefaultEndpointResolverV2() + r := oam.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), oam_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), oam.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -313,11 +313,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := oam_sdkv2.NewDefaultEndpointResolverV2() + r := oam.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), oam_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), oam.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -337,8 +337,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListLinks(ctx, &oam_sdkv2.ListLinksInput{}, - func(opts *oam_sdkv2.Options) { + _, err := client.ListLinks(ctx, &oam.ListLinksInput{}, + func(opts *oam.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/oam/service_package_gen.go b/internal/service/oam/service_package_gen.go index 2778bea7d35..cdd3043bcbe 100644 --- a/internal/service/oam/service_package_gen.go +++ b/internal/service/oam/service_package_gen.go @@ -5,8 +5,8 @@ package oam import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - oam_sdkv2 "github.com/aws/aws-sdk-go-v2/service/oam" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/oam" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -73,11 +73,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*oam_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*oam.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return oam_sdkv2.NewFromConfig(cfg, - oam_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return oam.NewFromConfig(cfg, + oam.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/opensearch/service_endpoint_resolver_gen.go b/internal/service/opensearch/service_endpoint_resolver_gen.go index 91637f6dbc3..7c7b779105f 100644 --- a/internal/service/opensearch/service_endpoint_resolver_gen.go +++ b/internal/service/opensearch/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - opensearch_sdkv2 "github.com/aws/aws-sdk-go-v2/service/opensearch" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/opensearch" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ opensearch_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ opensearch.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver opensearch_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver opensearch.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: opensearch_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: opensearch.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params opensearch_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params opensearch.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params opensearch_sd tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up opensearch endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params opensearch_sd return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*opensearch_sdkv2.Options) { - return func(o *opensearch_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*opensearch.Options) { + return func(o *opensearch.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/opensearch/service_endpoints_gen_test.go b/internal/service/opensearch/service_endpoints_gen_test.go index eef9ab08dae..44171c3b91a 100644 --- a/internal/service/opensearch/service_endpoints_gen_test.go +++ b/internal/service/opensearch/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - opensearch_sdkv2 "github.com/aws/aws-sdk-go-v2/service/opensearch" + "github.com/aws/aws-sdk-go-v2/service/opensearch" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -296,10 +296,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := opensearch_sdkv2.NewDefaultEndpointResolverV2() + r := opensearch.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), opensearch_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), opensearch.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -313,11 +313,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := opensearch_sdkv2.NewDefaultEndpointResolverV2() + r := opensearch.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), opensearch_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), opensearch.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -337,8 +337,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListDomainNames(ctx, &opensearch_sdkv2.ListDomainNamesInput{}, - func(opts *opensearch_sdkv2.Options) { + _, err := client.ListDomainNames(ctx, &opensearch.ListDomainNamesInput{}, + func(opts *opensearch.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/opensearch/service_package_gen.go b/internal/service/opensearch/service_package_gen.go index 5397c228da6..75382dd7c84 100644 --- a/internal/service/opensearch/service_package_gen.go +++ b/internal/service/opensearch/service_package_gen.go @@ -5,8 +5,8 @@ package opensearch import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - opensearch_sdkv2 "github.com/aws/aws-sdk-go-v2/service/opensearch" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/opensearch" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -85,11 +85,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*opensearch_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*opensearch.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return opensearch_sdkv2.NewFromConfig(cfg, - opensearch_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return opensearch.NewFromConfig(cfg, + opensearch.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/opensearchserverless/service_endpoint_resolver_gen.go b/internal/service/opensearchserverless/service_endpoint_resolver_gen.go index 5d8f1b501c6..51a4ec07e87 100644 --- a/internal/service/opensearchserverless/service_endpoint_resolver_gen.go +++ b/internal/service/opensearchserverless/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - opensearchserverless_sdkv2 "github.com/aws/aws-sdk-go-v2/service/opensearchserverless" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/opensearchserverless" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ opensearchserverless_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ opensearchserverless.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver opensearchserverless_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver opensearchserverless.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: opensearchserverless_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: opensearchserverless.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params opensearchserverless_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params opensearchserverless.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params opensearchser tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up opensearchserverless endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params opensearchser return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*opensearchserverless_sdkv2.Options) { - return func(o *opensearchserverless_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*opensearchserverless.Options) { + return func(o *opensearchserverless.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/opensearchserverless/service_endpoints_gen_test.go b/internal/service/opensearchserverless/service_endpoints_gen_test.go index febf88f6300..044dac2bdba 100644 --- a/internal/service/opensearchserverless/service_endpoints_gen_test.go +++ b/internal/service/opensearchserverless/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - opensearchserverless_sdkv2 "github.com/aws/aws-sdk-go-v2/service/opensearchserverless" + "github.com/aws/aws-sdk-go-v2/service/opensearchserverless" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := opensearchserverless_sdkv2.NewDefaultEndpointResolverV2() + r := opensearchserverless.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), opensearchserverless_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), opensearchserverless.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := opensearchserverless_sdkv2.NewDefaultEndpointResolverV2() + r := opensearchserverless.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), opensearchserverless_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), opensearchserverless.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListCollections(ctx, &opensearchserverless_sdkv2.ListCollectionsInput{}, - func(opts *opensearchserverless_sdkv2.Options) { + _, err := client.ListCollections(ctx, &opensearchserverless.ListCollectionsInput{}, + func(opts *opensearchserverless.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/opensearchserverless/service_package_gen.go b/internal/service/opensearchserverless/service_package_gen.go index 2c16ac2432a..29817943b2e 100644 --- a/internal/service/opensearchserverless/service_package_gen.go +++ b/internal/service/opensearchserverless/service_package_gen.go @@ -5,8 +5,8 @@ package opensearchserverless import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - opensearchserverless_sdkv2 "github.com/aws/aws-sdk-go-v2/service/opensearchserverless" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/opensearchserverless" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -91,11 +91,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*opensearchserverless_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*opensearchserverless.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return opensearchserverless_sdkv2.NewFromConfig(cfg, - opensearchserverless_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return opensearchserverless.NewFromConfig(cfg, + opensearchserverless.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/opsworks/service_endpoint_resolver_gen.go b/internal/service/opsworks/service_endpoint_resolver_gen.go index 8067dbf5d88..e0536d91e8f 100644 --- a/internal/service/opsworks/service_endpoint_resolver_gen.go +++ b/internal/service/opsworks/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - opsworks_sdkv2 "github.com/aws/aws-sdk-go-v2/service/opsworks" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/opsworks" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ opsworks_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ opsworks.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver opsworks_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver opsworks.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: opsworks_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: opsworks.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params opsworks_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params opsworks.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params opsworks_sdkv tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up opsworks endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params opsworks_sdkv return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*opsworks_sdkv2.Options) { - return func(o *opsworks_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*opsworks.Options) { + return func(o *opsworks.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/opsworks/service_endpoints_gen_test.go b/internal/service/opsworks/service_endpoints_gen_test.go index bdba6767335..2873117e0d5 100644 --- a/internal/service/opsworks/service_endpoints_gen_test.go +++ b/internal/service/opsworks/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - opsworks_sdkv2 "github.com/aws/aws-sdk-go-v2/service/opsworks" + "github.com/aws/aws-sdk-go-v2/service/opsworks" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := opsworks_sdkv2.NewDefaultEndpointResolverV2() + r := opsworks.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), opsworks_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), opsworks.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := opsworks_sdkv2.NewDefaultEndpointResolverV2() + r := opsworks.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), opsworks_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), opsworks.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.DescribeApps(ctx, &opsworks_sdkv2.DescribeAppsInput{}, - func(opts *opsworks_sdkv2.Options) { + _, err := client.DescribeApps(ctx, &opsworks.DescribeAppsInput{}, + func(opts *opsworks.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/opsworks/service_package_gen.go b/internal/service/opsworks/service_package_gen.go index f9e32a543f1..9402a5db4ff 100644 --- a/internal/service/opsworks/service_package_gen.go +++ b/internal/service/opsworks/service_package_gen.go @@ -5,8 +5,8 @@ package opsworks import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - opsworks_sdkv2 "github.com/aws/aws-sdk-go-v2/service/opsworks" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/opsworks" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -155,11 +155,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*opsworks_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*opsworks.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return opsworks_sdkv2.NewFromConfig(cfg, - opsworks_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return opsworks.NewFromConfig(cfg, + opsworks.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/organizations/service_endpoint_resolver_gen.go b/internal/service/organizations/service_endpoint_resolver_gen.go index 6d88c9fd916..6878ed62c17 100644 --- a/internal/service/organizations/service_endpoint_resolver_gen.go +++ b/internal/service/organizations/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - organizations_sdkv2 "github.com/aws/aws-sdk-go-v2/service/organizations" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/organizations" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ organizations_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ organizations.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver organizations_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver organizations.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: organizations_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: organizations.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params organizations_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params organizations.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params organizations tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up organizations endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params organizations return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*organizations_sdkv2.Options) { - return func(o *organizations_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*organizations.Options) { + return func(o *organizations.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/organizations/service_endpoints_gen_test.go b/internal/service/organizations/service_endpoints_gen_test.go index 4e9a6e88cb3..a7f9700896e 100644 --- a/internal/service/organizations/service_endpoints_gen_test.go +++ b/internal/service/organizations/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - organizations_sdkv2 "github.com/aws/aws-sdk-go-v2/service/organizations" + "github.com/aws/aws-sdk-go-v2/service/organizations" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := organizations_sdkv2.NewDefaultEndpointResolverV2() + r := organizations.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), organizations_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), organizations.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := organizations_sdkv2.NewDefaultEndpointResolverV2() + r := organizations.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), organizations_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), organizations.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListAccounts(ctx, &organizations_sdkv2.ListAccountsInput{}, - func(opts *organizations_sdkv2.Options) { + _, err := client.ListAccounts(ctx, &organizations.ListAccountsInput{}, + func(opts *organizations.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/organizations/service_package.go b/internal/service/organizations/service_package.go index 62b07ffb4dc..66db2c640d8 100644 --- a/internal/service/organizations/service_package.go +++ b/internal/service/organizations/service_package.go @@ -20,7 +20,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return organizations.NewFromConfig(cfg, - organizations.WithEndpointResolverV2(newEndpointResolverSDKv2()), + organizations.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), func(o *organizations.Options) { o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(func(err error) aws.Ternary { diff --git a/internal/service/osis/service_endpoint_resolver_gen.go b/internal/service/osis/service_endpoint_resolver_gen.go index 5f57e01330e..6d27b8a1905 100644 --- a/internal/service/osis/service_endpoint_resolver_gen.go +++ b/internal/service/osis/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - osis_sdkv2 "github.com/aws/aws-sdk-go-v2/service/osis" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/osis" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ osis_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ osis.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver osis_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver osis.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: osis_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: osis.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params osis_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params osis.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params osis_sdkv2.En tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up osis endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params osis_sdkv2.En return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*osis_sdkv2.Options) { - return func(o *osis_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*osis.Options) { + return func(o *osis.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/osis/service_endpoints_gen_test.go b/internal/service/osis/service_endpoints_gen_test.go index d4d97d9d4dc..88ae205b501 100644 --- a/internal/service/osis/service_endpoints_gen_test.go +++ b/internal/service/osis/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - osis_sdkv2 "github.com/aws/aws-sdk-go-v2/service/osis" + "github.com/aws/aws-sdk-go-v2/service/osis" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -296,10 +296,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := osis_sdkv2.NewDefaultEndpointResolverV2() + r := osis.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), osis_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), osis.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -313,11 +313,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := osis_sdkv2.NewDefaultEndpointResolverV2() + r := osis.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), osis_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), osis.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -337,8 +337,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListPipelines(ctx, &osis_sdkv2.ListPipelinesInput{}, - func(opts *osis_sdkv2.Options) { + _, err := client.ListPipelines(ctx, &osis.ListPipelinesInput{}, + func(opts *osis.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/osis/service_package_gen.go b/internal/service/osis/service_package_gen.go index c290f3ba01a..a254af32061 100644 --- a/internal/service/osis/service_package_gen.go +++ b/internal/service/osis/service_package_gen.go @@ -5,8 +5,8 @@ package osis import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - osis_sdkv2 "github.com/aws/aws-sdk-go-v2/service/osis" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/osis" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -43,11 +43,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*osis_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*osis.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return osis_sdkv2.NewFromConfig(cfg, - osis_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return osis.NewFromConfig(cfg, + osis.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/outposts/service_endpoint_resolver_gen.go b/internal/service/outposts/service_endpoint_resolver_gen.go index 890bf403a77..0279c09937a 100644 --- a/internal/service/outposts/service_endpoint_resolver_gen.go +++ b/internal/service/outposts/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - outposts_sdkv2 "github.com/aws/aws-sdk-go-v2/service/outposts" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/outposts" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ outposts_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ outposts.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver outposts_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver outposts.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: outposts_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: outposts.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params outposts_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params outposts.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params outposts_sdkv tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up outposts endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params outposts_sdkv return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*outposts_sdkv2.Options) { - return func(o *outposts_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*outposts.Options) { + return func(o *outposts.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/outposts/service_endpoints_gen_test.go b/internal/service/outposts/service_endpoints_gen_test.go index cc990b584db..7eb501943c2 100644 --- a/internal/service/outposts/service_endpoints_gen_test.go +++ b/internal/service/outposts/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - outposts_sdkv2 "github.com/aws/aws-sdk-go-v2/service/outposts" + "github.com/aws/aws-sdk-go-v2/service/outposts" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := outposts_sdkv2.NewDefaultEndpointResolverV2() + r := outposts.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), outposts_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), outposts.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := outposts_sdkv2.NewDefaultEndpointResolverV2() + r := outposts.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), outposts_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), outposts.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListSites(ctx, &outposts_sdkv2.ListSitesInput{}, - func(opts *outposts_sdkv2.Options) { + _, err := client.ListSites(ctx, &outposts.ListSitesInput{}, + func(opts *outposts.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/outposts/service_package_gen.go b/internal/service/outposts/service_package_gen.go index 0513e933c62..c5a527a6044 100644 --- a/internal/service/outposts/service_package_gen.go +++ b/internal/service/outposts/service_package_gen.go @@ -5,8 +5,8 @@ package outposts import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - outposts_sdkv2 "github.com/aws/aws-sdk-go-v2/service/outposts" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/outposts" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -76,11 +76,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*outposts_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*outposts.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return outposts_sdkv2.NewFromConfig(cfg, - outposts_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return outposts.NewFromConfig(cfg, + outposts.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/paymentcryptography/service_endpoint_resolver_gen.go b/internal/service/paymentcryptography/service_endpoint_resolver_gen.go index fc57ac8a514..b1c0d194684 100644 --- a/internal/service/paymentcryptography/service_endpoint_resolver_gen.go +++ b/internal/service/paymentcryptography/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - paymentcryptography_sdkv2 "github.com/aws/aws-sdk-go-v2/service/paymentcryptography" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/paymentcryptography" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ paymentcryptography_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ paymentcryptography.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver paymentcryptography_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver paymentcryptography.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: paymentcryptography_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: paymentcryptography.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params paymentcryptography_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params paymentcryptography.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params paymentcrypto tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up paymentcryptography endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params paymentcrypto return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*paymentcryptography_sdkv2.Options) { - return func(o *paymentcryptography_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*paymentcryptography.Options) { + return func(o *paymentcryptography.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/paymentcryptography/service_package_gen.go b/internal/service/paymentcryptography/service_package_gen.go index ef747eda518..dcd333da567 100644 --- a/internal/service/paymentcryptography/service_package_gen.go +++ b/internal/service/paymentcryptography/service_package_gen.go @@ -5,8 +5,8 @@ package paymentcryptography import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - paymentcryptography_sdkv2 "github.com/aws/aws-sdk-go-v2/service/paymentcryptography" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/paymentcryptography" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -47,11 +47,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*paymentcryptography_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*paymentcryptography.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return paymentcryptography_sdkv2.NewFromConfig(cfg, - paymentcryptography_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return paymentcryptography.NewFromConfig(cfg, + paymentcryptography.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/pcaconnectorad/service_endpoint_resolver_gen.go b/internal/service/pcaconnectorad/service_endpoint_resolver_gen.go index dc488d05723..8b4aed19b52 100644 --- a/internal/service/pcaconnectorad/service_endpoint_resolver_gen.go +++ b/internal/service/pcaconnectorad/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - pcaconnectorad_sdkv2 "github.com/aws/aws-sdk-go-v2/service/pcaconnectorad" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/pcaconnectorad" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ pcaconnectorad_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ pcaconnectorad.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver pcaconnectorad_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver pcaconnectorad.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: pcaconnectorad_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: pcaconnectorad.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params pcaconnectorad_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params pcaconnectorad.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params pcaconnectora tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up pcaconnectorad endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params pcaconnectora return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*pcaconnectorad_sdkv2.Options) { - return func(o *pcaconnectorad_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*pcaconnectorad.Options) { + return func(o *pcaconnectorad.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/pcaconnectorad/service_endpoints_gen_test.go b/internal/service/pcaconnectorad/service_endpoints_gen_test.go index 2b2bad61876..902131dd5cf 100644 --- a/internal/service/pcaconnectorad/service_endpoints_gen_test.go +++ b/internal/service/pcaconnectorad/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - pcaconnectorad_sdkv2 "github.com/aws/aws-sdk-go-v2/service/pcaconnectorad" + "github.com/aws/aws-sdk-go-v2/service/pcaconnectorad" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := pcaconnectorad_sdkv2.NewDefaultEndpointResolverV2() + r := pcaconnectorad.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), pcaconnectorad_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), pcaconnectorad.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := pcaconnectorad_sdkv2.NewDefaultEndpointResolverV2() + r := pcaconnectorad.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), pcaconnectorad_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), pcaconnectorad.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListConnectors(ctx, &pcaconnectorad_sdkv2.ListConnectorsInput{}, - func(opts *pcaconnectorad_sdkv2.Options) { + _, err := client.ListConnectors(ctx, &pcaconnectorad.ListConnectorsInput{}, + func(opts *pcaconnectorad.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/pcaconnectorad/service_package_gen.go b/internal/service/pcaconnectorad/service_package_gen.go index 2723b987d99..10aad76b3cf 100644 --- a/internal/service/pcaconnectorad/service_package_gen.go +++ b/internal/service/pcaconnectorad/service_package_gen.go @@ -5,8 +5,8 @@ package pcaconnectorad import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - pcaconnectorad_sdkv2 "github.com/aws/aws-sdk-go-v2/service/pcaconnectorad" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/pcaconnectorad" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -35,11 +35,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*pcaconnectorad_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*pcaconnectorad.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return pcaconnectorad_sdkv2.NewFromConfig(cfg, - pcaconnectorad_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return pcaconnectorad.NewFromConfig(cfg, + pcaconnectorad.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/pcs/service_endpoint_resolver_gen.go b/internal/service/pcs/service_endpoint_resolver_gen.go index 3204aa60cea..b217a4cd1dd 100644 --- a/internal/service/pcs/service_endpoint_resolver_gen.go +++ b/internal/service/pcs/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - pcs_sdkv2 "github.com/aws/aws-sdk-go-v2/service/pcs" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/pcs" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ pcs_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ pcs.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver pcs_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver pcs.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: pcs_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: pcs.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params pcs_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params pcs.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params pcs_sdkv2.End tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up pcs endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params pcs_sdkv2.End return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*pcs_sdkv2.Options) { - return func(o *pcs_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*pcs.Options) { + return func(o *pcs.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/pcs/service_endpoints_gen_test.go b/internal/service/pcs/service_endpoints_gen_test.go index 0e3ee665e64..81d9ad95d6b 100644 --- a/internal/service/pcs/service_endpoints_gen_test.go +++ b/internal/service/pcs/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - pcs_sdkv2 "github.com/aws/aws-sdk-go-v2/service/pcs" + "github.com/aws/aws-sdk-go-v2/service/pcs" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := pcs_sdkv2.NewDefaultEndpointResolverV2() + r := pcs.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), pcs_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), pcs.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := pcs_sdkv2.NewDefaultEndpointResolverV2() + r := pcs.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), pcs_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), pcs.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListClusters(ctx, &pcs_sdkv2.ListClustersInput{}, - func(opts *pcs_sdkv2.Options) { + _, err := client.ListClusters(ctx, &pcs.ListClustersInput{}, + func(opts *pcs.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/pcs/service_package_gen.go b/internal/service/pcs/service_package_gen.go index eb06ab5580c..855afc184fa 100644 --- a/internal/service/pcs/service_package_gen.go +++ b/internal/service/pcs/service_package_gen.go @@ -5,8 +5,8 @@ package pcs import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - pcs_sdkv2 "github.com/aws/aws-sdk-go-v2/service/pcs" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/pcs" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -35,11 +35,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*pcs_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*pcs.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return pcs_sdkv2.NewFromConfig(cfg, - pcs_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return pcs.NewFromConfig(cfg, + pcs.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/pinpoint/service_endpoint_resolver_gen.go b/internal/service/pinpoint/service_endpoint_resolver_gen.go index f6005571bad..9c9b5833adf 100644 --- a/internal/service/pinpoint/service_endpoint_resolver_gen.go +++ b/internal/service/pinpoint/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - pinpoint_sdkv2 "github.com/aws/aws-sdk-go-v2/service/pinpoint" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/pinpoint" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ pinpoint_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ pinpoint.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver pinpoint_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver pinpoint.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: pinpoint_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: pinpoint.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params pinpoint_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params pinpoint.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params pinpoint_sdkv tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up pinpoint endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params pinpoint_sdkv return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*pinpoint_sdkv2.Options) { - return func(o *pinpoint_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*pinpoint.Options) { + return func(o *pinpoint.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/pinpoint/service_endpoints_gen_test.go b/internal/service/pinpoint/service_endpoints_gen_test.go index b6bcf3c1adc..b077f7e1fdd 100644 --- a/internal/service/pinpoint/service_endpoints_gen_test.go +++ b/internal/service/pinpoint/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - pinpoint_sdkv2 "github.com/aws/aws-sdk-go-v2/service/pinpoint" + "github.com/aws/aws-sdk-go-v2/service/pinpoint" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := pinpoint_sdkv2.NewDefaultEndpointResolverV2() + r := pinpoint.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), pinpoint_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), pinpoint.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := pinpoint_sdkv2.NewDefaultEndpointResolverV2() + r := pinpoint.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), pinpoint_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), pinpoint.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.GetApps(ctx, &pinpoint_sdkv2.GetAppsInput{}, - func(opts *pinpoint_sdkv2.Options) { + _, err := client.GetApps(ctx, &pinpoint.GetAppsInput{}, + func(opts *pinpoint.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/pinpoint/service_package_gen.go b/internal/service/pinpoint/service_package_gen.go index e52bd4d26da..99915cbda9c 100644 --- a/internal/service/pinpoint/service_package_gen.go +++ b/internal/service/pinpoint/service_package_gen.go @@ -5,8 +5,8 @@ package pinpoint import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - pinpoint_sdkv2 "github.com/aws/aws-sdk-go-v2/service/pinpoint" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/pinpoint" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -102,11 +102,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*pinpoint_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*pinpoint.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return pinpoint_sdkv2.NewFromConfig(cfg, - pinpoint_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return pinpoint.NewFromConfig(cfg, + pinpoint.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/pinpointsmsvoicev2/service_endpoint_resolver_gen.go b/internal/service/pinpointsmsvoicev2/service_endpoint_resolver_gen.go index 9122247763a..09ba3a9f190 100644 --- a/internal/service/pinpointsmsvoicev2/service_endpoint_resolver_gen.go +++ b/internal/service/pinpointsmsvoicev2/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - pinpointsmsvoicev2_sdkv2 "github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ pinpointsmsvoicev2_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ pinpointsmsvoicev2.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver pinpointsmsvoicev2_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver pinpointsmsvoicev2.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: pinpointsmsvoicev2_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: pinpointsmsvoicev2.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params pinpointsmsvoicev2_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params pinpointsmsvoicev2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params pinpointsmsvo tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up pinpointsmsvoicev2 endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params pinpointsmsvo return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*pinpointsmsvoicev2_sdkv2.Options) { - return func(o *pinpointsmsvoicev2_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*pinpointsmsvoicev2.Options) { + return func(o *pinpointsmsvoicev2.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/pinpointsmsvoicev2/service_endpoints_gen_test.go b/internal/service/pinpointsmsvoicev2/service_endpoints_gen_test.go index 7e8a05133bd..08f908915ce 100644 --- a/internal/service/pinpointsmsvoicev2/service_endpoints_gen_test.go +++ b/internal/service/pinpointsmsvoicev2/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - pinpointsmsvoicev2_sdkv2 "github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2" + "github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := pinpointsmsvoicev2_sdkv2.NewDefaultEndpointResolverV2() + r := pinpointsmsvoicev2.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), pinpointsmsvoicev2_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), pinpointsmsvoicev2.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := pinpointsmsvoicev2_sdkv2.NewDefaultEndpointResolverV2() + r := pinpointsmsvoicev2.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), pinpointsmsvoicev2_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), pinpointsmsvoicev2.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.DescribePhoneNumbers(ctx, &pinpointsmsvoicev2_sdkv2.DescribePhoneNumbersInput{}, - func(opts *pinpointsmsvoicev2_sdkv2.Options) { + _, err := client.DescribePhoneNumbers(ctx, &pinpointsmsvoicev2.DescribePhoneNumbersInput{}, + func(opts *pinpointsmsvoicev2.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/pinpointsmsvoicev2/service_package_gen.go b/internal/service/pinpointsmsvoicev2/service_package_gen.go index 8a7120482e0..fb69f9d27cb 100644 --- a/internal/service/pinpointsmsvoicev2/service_package_gen.go +++ b/internal/service/pinpointsmsvoicev2/service_package_gen.go @@ -5,8 +5,8 @@ package pinpointsmsvoicev2 import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - pinpointsmsvoicev2_sdkv2 "github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -57,11 +57,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*pinpointsmsvoicev2_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*pinpointsmsvoicev2.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return pinpointsmsvoicev2_sdkv2.NewFromConfig(cfg, - pinpointsmsvoicev2_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return pinpointsmsvoicev2.NewFromConfig(cfg, + pinpointsmsvoicev2.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/pipes/service_endpoint_resolver_gen.go b/internal/service/pipes/service_endpoint_resolver_gen.go index 81c0d5f49b1..647f1c82107 100644 --- a/internal/service/pipes/service_endpoint_resolver_gen.go +++ b/internal/service/pipes/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - pipes_sdkv2 "github.com/aws/aws-sdk-go-v2/service/pipes" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/pipes" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ pipes_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ pipes.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver pipes_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver pipes.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: pipes_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: pipes.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params pipes_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params pipes.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params pipes_sdkv2.E tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up pipes endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params pipes_sdkv2.E return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*pipes_sdkv2.Options) { - return func(o *pipes_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*pipes.Options) { + return func(o *pipes.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/pipes/service_endpoints_gen_test.go b/internal/service/pipes/service_endpoints_gen_test.go index 25068067d32..f86efd854b5 100644 --- a/internal/service/pipes/service_endpoints_gen_test.go +++ b/internal/service/pipes/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - pipes_sdkv2 "github.com/aws/aws-sdk-go-v2/service/pipes" + "github.com/aws/aws-sdk-go-v2/service/pipes" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := pipes_sdkv2.NewDefaultEndpointResolverV2() + r := pipes.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), pipes_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), pipes.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := pipes_sdkv2.NewDefaultEndpointResolverV2() + r := pipes.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), pipes_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), pipes.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListPipes(ctx, &pipes_sdkv2.ListPipesInput{}, - func(opts *pipes_sdkv2.Options) { + _, err := client.ListPipes(ctx, &pipes.ListPipesInput{}, + func(opts *pipes.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/pipes/service_package_gen.go b/internal/service/pipes/service_package_gen.go index c268b1f80d5..bc923f3ea00 100644 --- a/internal/service/pipes/service_package_gen.go +++ b/internal/service/pipes/service_package_gen.go @@ -5,8 +5,8 @@ package pipes import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - pipes_sdkv2 "github.com/aws/aws-sdk-go-v2/service/pipes" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/pipes" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -44,11 +44,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*pipes_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*pipes.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return pipes_sdkv2.NewFromConfig(cfg, - pipes_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return pipes.NewFromConfig(cfg, + pipes.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/polly/service_endpoint_resolver_gen.go b/internal/service/polly/service_endpoint_resolver_gen.go index cd3672f6520..7f8d50ac4e6 100644 --- a/internal/service/polly/service_endpoint_resolver_gen.go +++ b/internal/service/polly/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - polly_sdkv2 "github.com/aws/aws-sdk-go-v2/service/polly" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/polly" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ polly_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ polly.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver polly_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver polly.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: polly_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: polly.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params polly_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params polly.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params polly_sdkv2.E tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up polly endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params polly_sdkv2.E return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*polly_sdkv2.Options) { - return func(o *polly_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*polly.Options) { + return func(o *polly.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/polly/service_endpoints_gen_test.go b/internal/service/polly/service_endpoints_gen_test.go index 068a895a287..9530d3f7cec 100644 --- a/internal/service/polly/service_endpoints_gen_test.go +++ b/internal/service/polly/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - polly_sdkv2 "github.com/aws/aws-sdk-go-v2/service/polly" + "github.com/aws/aws-sdk-go-v2/service/polly" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := polly_sdkv2.NewDefaultEndpointResolverV2() + r := polly.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), polly_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), polly.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := polly_sdkv2.NewDefaultEndpointResolverV2() + r := polly.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), polly_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), polly.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListLexicons(ctx, &polly_sdkv2.ListLexiconsInput{}, - func(opts *polly_sdkv2.Options) { + _, err := client.ListLexicons(ctx, &polly.ListLexiconsInput{}, + func(opts *polly.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/polly/service_package_gen.go b/internal/service/polly/service_package_gen.go index e3fa6f7dd0c..5d3a389d5c7 100644 --- a/internal/service/polly/service_package_gen.go +++ b/internal/service/polly/service_package_gen.go @@ -5,8 +5,8 @@ package polly import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - polly_sdkv2 "github.com/aws/aws-sdk-go-v2/service/polly" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/polly" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -40,11 +40,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*polly_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*polly.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return polly_sdkv2.NewFromConfig(cfg, - polly_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return polly.NewFromConfig(cfg, + polly.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/pricing/service_endpoint_resolver_gen.go b/internal/service/pricing/service_endpoint_resolver_gen.go index 15b32059979..7d927d33cfd 100644 --- a/internal/service/pricing/service_endpoint_resolver_gen.go +++ b/internal/service/pricing/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - pricing_sdkv2 "github.com/aws/aws-sdk-go-v2/service/pricing" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/pricing" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ pricing_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ pricing.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver pricing_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver pricing.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: pricing_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: pricing.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params pricing_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params pricing.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params pricing_sdkv2 tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up pricing endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params pricing_sdkv2 return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*pricing_sdkv2.Options) { - return func(o *pricing_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*pricing.Options) { + return func(o *pricing.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/pricing/service_endpoints_gen_test.go b/internal/service/pricing/service_endpoints_gen_test.go index 572b3ea9ad2..961af20d0c5 100644 --- a/internal/service/pricing/service_endpoints_gen_test.go +++ b/internal/service/pricing/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - pricing_sdkv2 "github.com/aws/aws-sdk-go-v2/service/pricing" + "github.com/aws/aws-sdk-go-v2/service/pricing" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := pricing_sdkv2.NewDefaultEndpointResolverV2() + r := pricing.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), pricing_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), pricing.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := pricing_sdkv2.NewDefaultEndpointResolverV2() + r := pricing.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), pricing_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), pricing.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.DescribeServices(ctx, &pricing_sdkv2.DescribeServicesInput{}, - func(opts *pricing_sdkv2.Options) { + _, err := client.DescribeServices(ctx, &pricing.DescribeServicesInput{}, + func(opts *pricing.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/pricing/service_package_gen.go b/internal/service/pricing/service_package_gen.go index 2fed2364644..cbf421164aa 100644 --- a/internal/service/pricing/service_package_gen.go +++ b/internal/service/pricing/service_package_gen.go @@ -5,8 +5,8 @@ package pricing import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - pricing_sdkv2 "github.com/aws/aws-sdk-go-v2/service/pricing" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/pricing" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -40,11 +40,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*pricing_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*pricing.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return pricing_sdkv2.NewFromConfig(cfg, - pricing_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return pricing.NewFromConfig(cfg, + pricing.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/qbusiness/service_endpoint_resolver_gen.go b/internal/service/qbusiness/service_endpoint_resolver_gen.go index 1d24494ea9a..e3a9fd19d32 100644 --- a/internal/service/qbusiness/service_endpoint_resolver_gen.go +++ b/internal/service/qbusiness/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - qbusiness_sdkv2 "github.com/aws/aws-sdk-go-v2/service/qbusiness" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/qbusiness" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ qbusiness_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ qbusiness.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver qbusiness_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver qbusiness.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: qbusiness_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: qbusiness.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params qbusiness_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params qbusiness.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params qbusiness_sdk tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up qbusiness endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params qbusiness_sdk return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*qbusiness_sdkv2.Options) { - return func(o *qbusiness_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*qbusiness.Options) { + return func(o *qbusiness.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/qbusiness/service_endpoints_gen_test.go b/internal/service/qbusiness/service_endpoints_gen_test.go index 8cc702aeadd..f676e02d47f 100644 --- a/internal/service/qbusiness/service_endpoints_gen_test.go +++ b/internal/service/qbusiness/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - qbusiness_sdkv2 "github.com/aws/aws-sdk-go-v2/service/qbusiness" + "github.com/aws/aws-sdk-go-v2/service/qbusiness" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := qbusiness_sdkv2.NewDefaultEndpointResolverV2() + r := qbusiness.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), qbusiness_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), qbusiness.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := qbusiness_sdkv2.NewDefaultEndpointResolverV2() + r := qbusiness.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), qbusiness_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), qbusiness.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListApplications(ctx, &qbusiness_sdkv2.ListApplicationsInput{}, - func(opts *qbusiness_sdkv2.Options) { + _, err := client.ListApplications(ctx, &qbusiness.ListApplicationsInput{}, + func(opts *qbusiness.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/qbusiness/service_package_gen.go b/internal/service/qbusiness/service_package_gen.go index b02a4b2b74e..1d5b393a76e 100644 --- a/internal/service/qbusiness/service_package_gen.go +++ b/internal/service/qbusiness/service_package_gen.go @@ -5,8 +5,8 @@ package qbusiness import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - qbusiness_sdkv2 "github.com/aws/aws-sdk-go-v2/service/qbusiness" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/qbusiness" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -35,11 +35,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*qbusiness_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*qbusiness.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return qbusiness_sdkv2.NewFromConfig(cfg, - qbusiness_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return qbusiness.NewFromConfig(cfg, + qbusiness.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/qldb/service_endpoint_resolver_gen.go b/internal/service/qldb/service_endpoint_resolver_gen.go index 1db7b08627a..9d59080dfff 100644 --- a/internal/service/qldb/service_endpoint_resolver_gen.go +++ b/internal/service/qldb/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - qldb_sdkv2 "github.com/aws/aws-sdk-go-v2/service/qldb" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/qldb" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ qldb_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ qldb.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver qldb_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver qldb.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: qldb_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: qldb.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params qldb_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params qldb.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params qldb_sdkv2.En tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up qldb endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params qldb_sdkv2.En return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*qldb_sdkv2.Options) { - return func(o *qldb_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*qldb.Options) { + return func(o *qldb.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/qldb/service_endpoints_gen_test.go b/internal/service/qldb/service_endpoints_gen_test.go index 104c675b096..80e72aca36f 100644 --- a/internal/service/qldb/service_endpoints_gen_test.go +++ b/internal/service/qldb/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - qldb_sdkv2 "github.com/aws/aws-sdk-go-v2/service/qldb" + "github.com/aws/aws-sdk-go-v2/service/qldb" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := qldb_sdkv2.NewDefaultEndpointResolverV2() + r := qldb.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), qldb_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), qldb.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := qldb_sdkv2.NewDefaultEndpointResolverV2() + r := qldb.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), qldb_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), qldb.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListLedgers(ctx, &qldb_sdkv2.ListLedgersInput{}, - func(opts *qldb_sdkv2.Options) { + _, err := client.ListLedgers(ctx, &qldb.ListLedgersInput{}, + func(opts *qldb.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/qldb/service_package_gen.go b/internal/service/qldb/service_package_gen.go index 2af8b39f05e..a0b8abaa6b3 100644 --- a/internal/service/qldb/service_package_gen.go +++ b/internal/service/qldb/service_package_gen.go @@ -5,8 +5,8 @@ package qldb import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - qldb_sdkv2 "github.com/aws/aws-sdk-go-v2/service/qldb" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/qldb" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -57,11 +57,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*qldb_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*qldb.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return qldb_sdkv2.NewFromConfig(cfg, - qldb_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return qldb.NewFromConfig(cfg, + qldb.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/quicksight/service_endpoint_resolver_gen.go b/internal/service/quicksight/service_endpoint_resolver_gen.go index da8fc75c94b..3c6a46e0980 100644 --- a/internal/service/quicksight/service_endpoint_resolver_gen.go +++ b/internal/service/quicksight/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - quicksight_sdkv2 "github.com/aws/aws-sdk-go-v2/service/quicksight" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/quicksight" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ quicksight_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ quicksight.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver quicksight_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver quicksight.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: quicksight_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: quicksight.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params quicksight_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params quicksight.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params quicksight_sd tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up quicksight endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params quicksight_sd return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*quicksight_sdkv2.Options) { - return func(o *quicksight_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*quicksight.Options) { + return func(o *quicksight.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/quicksight/service_endpoints_gen_test.go b/internal/service/quicksight/service_endpoints_gen_test.go index 5cb72c4ce81..f8a59bc5b9d 100644 --- a/internal/service/quicksight/service_endpoints_gen_test.go +++ b/internal/service/quicksight/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - quicksight_sdkv2 "github.com/aws/aws-sdk-go-v2/service/quicksight" + "github.com/aws/aws-sdk-go-v2/service/quicksight" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := quicksight_sdkv2.NewDefaultEndpointResolverV2() + r := quicksight.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), quicksight_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), quicksight.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := quicksight_sdkv2.NewDefaultEndpointResolverV2() + r := quicksight.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), quicksight_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), quicksight.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,10 +283,10 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListDashboards(ctx, &quicksight_sdkv2.ListDashboardsInput{ - AwsAccountId: aws_sdkv2.String("123456789012"), + _, err := client.ListDashboards(ctx, &quicksight.ListDashboardsInput{ + AwsAccountId: aws.String("123456789012"), }, - func(opts *quicksight_sdkv2.Options) { + func(opts *quicksight.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/quicksight/service_package_gen.go b/internal/service/quicksight/service_package_gen.go index f37f2a40f6a..7215f4ace01 100644 --- a/internal/service/quicksight/service_package_gen.go +++ b/internal/service/quicksight/service_package_gen.go @@ -5,8 +5,8 @@ package quicksight import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - quicksight_sdkv2 "github.com/aws/aws-sdk-go-v2/service/quicksight" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/quicksight" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -176,11 +176,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*quicksight_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*quicksight.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return quicksight_sdkv2.NewFromConfig(cfg, - quicksight_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return quicksight.NewFromConfig(cfg, + quicksight.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/ram/service_endpoint_resolver_gen.go b/internal/service/ram/service_endpoint_resolver_gen.go index 850db742de4..959f8113a33 100644 --- a/internal/service/ram/service_endpoint_resolver_gen.go +++ b/internal/service/ram/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - ram_sdkv2 "github.com/aws/aws-sdk-go-v2/service/ram" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/ram" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ ram_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ ram.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver ram_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver ram.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: ram_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: ram.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params ram_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params ram.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params ram_sdkv2.End tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up ram endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params ram_sdkv2.End return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*ram_sdkv2.Options) { - return func(o *ram_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*ram.Options) { + return func(o *ram.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/ram/service_endpoints_gen_test.go b/internal/service/ram/service_endpoints_gen_test.go index 388a4047164..8aedd0ec185 100644 --- a/internal/service/ram/service_endpoints_gen_test.go +++ b/internal/service/ram/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - ram_sdkv2 "github.com/aws/aws-sdk-go-v2/service/ram" + "github.com/aws/aws-sdk-go-v2/service/ram" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := ram_sdkv2.NewDefaultEndpointResolverV2() + r := ram.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), ram_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), ram.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := ram_sdkv2.NewDefaultEndpointResolverV2() + r := ram.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), ram_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), ram.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListPermissions(ctx, &ram_sdkv2.ListPermissionsInput{}, - func(opts *ram_sdkv2.Options) { + _, err := client.ListPermissions(ctx, &ram.ListPermissionsInput{}, + func(opts *ram.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/ram/service_package_gen.go b/internal/service/ram/service_package_gen.go index dc830590c4c..4de1f69112e 100644 --- a/internal/service/ram/service_package_gen.go +++ b/internal/service/ram/service_package_gen.go @@ -5,8 +5,8 @@ package ram import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - ram_sdkv2 "github.com/aws/aws-sdk-go-v2/service/ram" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/ram" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -71,11 +71,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*ram_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*ram.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return ram_sdkv2.NewFromConfig(cfg, - ram_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return ram.NewFromConfig(cfg, + ram.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/rbin/service_endpoint_resolver_gen.go b/internal/service/rbin/service_endpoint_resolver_gen.go index c2030262e0e..813297889ba 100644 --- a/internal/service/rbin/service_endpoint_resolver_gen.go +++ b/internal/service/rbin/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - rbin_sdkv2 "github.com/aws/aws-sdk-go-v2/service/rbin" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/rbin" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ rbin_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ rbin.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver rbin_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver rbin.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: rbin_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: rbin.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params rbin_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params rbin.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params rbin_sdkv2.En tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up rbin endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params rbin_sdkv2.En return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*rbin_sdkv2.Options) { - return func(o *rbin_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*rbin.Options) { + return func(o *rbin.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/rbin/service_endpoints_gen_test.go b/internal/service/rbin/service_endpoints_gen_test.go index 9b2cfc1dc62..1c933ec17b3 100644 --- a/internal/service/rbin/service_endpoints_gen_test.go +++ b/internal/service/rbin/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - rbin_sdkv2 "github.com/aws/aws-sdk-go-v2/service/rbin" + "github.com/aws/aws-sdk-go-v2/service/rbin" awstypes "github.com/aws/aws-sdk-go-v2/service/rbin/types" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" @@ -297,10 +297,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := rbin_sdkv2.NewDefaultEndpointResolverV2() + r := rbin.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), rbin_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), rbin.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -314,11 +314,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := rbin_sdkv2.NewDefaultEndpointResolverV2() + r := rbin.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), rbin_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), rbin.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -338,10 +338,10 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListRules(ctx, &rbin_sdkv2.ListRulesInput{ + _, err := client.ListRules(ctx, &rbin.ListRulesInput{ ResourceType: awstypes.ResourceTypeEc2Image, }, - func(opts *rbin_sdkv2.Options) { + func(opts *rbin.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/rbin/service_package_gen.go b/internal/service/rbin/service_package_gen.go index 063072945e6..d4c98cc421b 100644 --- a/internal/service/rbin/service_package_gen.go +++ b/internal/service/rbin/service_package_gen.go @@ -5,8 +5,8 @@ package rbin import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - rbin_sdkv2 "github.com/aws/aws-sdk-go-v2/service/rbin" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/rbin" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -44,11 +44,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*rbin_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*rbin.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return rbin_sdkv2.NewFromConfig(cfg, - rbin_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return rbin.NewFromConfig(cfg, + rbin.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/rds/blue_green.go b/internal/service/rds/blue_green.go index a040cf2c33d..8d37d35b94d 100644 --- a/internal/service/rds/blue_green.go +++ b/internal/service/rds/blue_green.go @@ -10,7 +10,7 @@ import ( "time" "github.com/aws/aws-sdk-go-v2/aws" - rds_sdkv2 "github.com/aws/aws-sdk-go-v2/service/rds" + "github.com/aws/aws-sdk-go-v2/service/rds" "github.com/aws/aws-sdk-go-v2/service/rds/types" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-provider-aws/internal/errs" @@ -18,14 +18,14 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -type cleanupWaiterFunc func(context.Context, *rds_sdkv2.Client, ...tfresource.OptionsFunc) +type cleanupWaiterFunc func(context.Context, *rds.Client, ...tfresource.OptionsFunc) type blueGreenOrchestrator struct { - conn *rds_sdkv2.Client + conn *rds.Client cleanupWaiters []cleanupWaiterFunc } -func newBlueGreenOrchestrator(conn *rds_sdkv2.Client) *blueGreenOrchestrator { +func newBlueGreenOrchestrator(conn *rds.Client) *blueGreenOrchestrator { return &blueGreenOrchestrator{ conn: conn, } @@ -45,7 +45,7 @@ func (o *blueGreenOrchestrator) CleanUp(ctx context.Context) { } } -func (o *blueGreenOrchestrator) CreateDeployment(ctx context.Context, input *rds_sdkv2.CreateBlueGreenDeploymentInput) (*types.BlueGreenDeployment, error) { +func (o *blueGreenOrchestrator) CreateDeployment(ctx context.Context, input *rds.CreateBlueGreenDeploymentInput) (*types.BlueGreenDeployment, error) { createOut, err := o.conn.CreateBlueGreenDeployment(ctx, input) if err != nil { return nil, fmt.Errorf("creating Blue/Green Deployment: %s", err) @@ -63,7 +63,7 @@ func (o *blueGreenOrchestrator) waitForDeploymentAvailable(ctx context.Context, } func (o *blueGreenOrchestrator) Switchover(ctx context.Context, identifier string, timeout time.Duration) (*types.BlueGreenDeployment, error) { - input := &rds_sdkv2.SwitchoverBlueGreenDeploymentInput{ + input := &rds.SwitchoverBlueGreenDeploymentInput{ BlueGreenDeploymentIdentifier: aws.String(identifier), } _, err := tfresource.RetryWhen(ctx, 10*time.Minute, @@ -90,10 +90,10 @@ func (o *blueGreenOrchestrator) AddCleanupWaiter(f cleanupWaiterFunc) { } type instanceHandler struct { - conn *rds_sdkv2.Client + conn *rds.Client } -func newInstanceHandler(conn *rds_sdkv2.Client) *instanceHandler { +func newInstanceHandler(conn *rds.Client) *instanceHandler { return &instanceHandler{ conn: conn, } @@ -101,7 +101,7 @@ func newInstanceHandler(conn *rds_sdkv2.Client) *instanceHandler { func (h *instanceHandler) precondition(ctx context.Context, d *schema.ResourceData) error { needsPreConditions := false - input := &rds_sdkv2.ModifyDBInstanceInput{ + input := &rds.ModifyDBInstanceInput{ ApplyImmediately: aws.Bool(true), DBInstanceIdentifier: aws.String(d.Get(names.AttrIdentifier).(string)), } @@ -127,8 +127,8 @@ func (h *instanceHandler) precondition(ctx context.Context, d *schema.ResourceDa return nil } -func (h *instanceHandler) createBlueGreenInput(d *schema.ResourceData) *rds_sdkv2.CreateBlueGreenDeploymentInput { - input := &rds_sdkv2.CreateBlueGreenDeploymentInput{ +func (h *instanceHandler) createBlueGreenInput(d *schema.ResourceData) *rds.CreateBlueGreenDeploymentInput { + input := &rds.CreateBlueGreenDeploymentInput{ BlueGreenDeploymentName: aws.String(d.Get(names.AttrIdentifier).(string)), Source: aws.String(d.Get(names.AttrARN).(string)), } @@ -144,7 +144,7 @@ func (h *instanceHandler) createBlueGreenInput(d *schema.ResourceData) *rds_sdkv } func (h *instanceHandler) modifyTarget(ctx context.Context, identifier string, d *schema.ResourceData, timeout time.Duration, operation string) error { - modifyInput := &rds_sdkv2.ModifyDBInstanceInput{ + modifyInput := &rds.ModifyDBInstanceInput{ ApplyImmediately: aws.Bool(true), DBInstanceIdentifier: aws.String(identifier), } diff --git a/internal/service/rds/service_endpoint_resolver_gen.go b/internal/service/rds/service_endpoint_resolver_gen.go index ffa5506c1da..486582c554c 100644 --- a/internal/service/rds/service_endpoint_resolver_gen.go +++ b/internal/service/rds/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - rds_sdkv2 "github.com/aws/aws-sdk-go-v2/service/rds" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/rds" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ rds_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ rds.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver rds_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver rds.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: rds_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: rds.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params rds_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params rds.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params rds_sdkv2.End tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up rds endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params rds_sdkv2.End return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*rds_sdkv2.Options) { - return func(o *rds_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*rds.Options) { + return func(o *rds.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/rds/service_endpoints_gen_test.go b/internal/service/rds/service_endpoints_gen_test.go index d69a9005813..8a6dadf2367 100644 --- a/internal/service/rds/service_endpoints_gen_test.go +++ b/internal/service/rds/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - rds_sdkv2 "github.com/aws/aws-sdk-go-v2/service/rds" + "github.com/aws/aws-sdk-go-v2/service/rds" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := rds_sdkv2.NewDefaultEndpointResolverV2() + r := rds.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), rds_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), rds.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := rds_sdkv2.NewDefaultEndpointResolverV2() + r := rds.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), rds_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), rds.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.DescribeDBInstances(ctx, &rds_sdkv2.DescribeDBInstancesInput{}, - func(opts *rds_sdkv2.Options) { + _, err := client.DescribeDBInstances(ctx, &rds.DescribeDBInstancesInput{}, + func(opts *rds.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/rds/service_package_gen.go b/internal/service/rds/service_package_gen.go index d03891944e1..1a0ebab893f 100644 --- a/internal/service/rds/service_package_gen.go +++ b/internal/service/rds/service_package_gen.go @@ -5,8 +5,8 @@ package rds import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - rds_sdkv2 "github.com/aws/aws-sdk-go-v2/service/rds" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/rds" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -295,11 +295,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*rds_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*rds.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return rds_sdkv2.NewFromConfig(cfg, - rds_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return rds.NewFromConfig(cfg, + rds.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/redshift/service_endpoint_resolver_gen.go b/internal/service/redshift/service_endpoint_resolver_gen.go index b2e949f4c80..e58256a5194 100644 --- a/internal/service/redshift/service_endpoint_resolver_gen.go +++ b/internal/service/redshift/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - redshift_sdkv2 "github.com/aws/aws-sdk-go-v2/service/redshift" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/redshift" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ redshift_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ redshift.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver redshift_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver redshift.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: redshift_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: redshift.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params redshift_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params redshift.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params redshift_sdkv tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up redshift endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params redshift_sdkv return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*redshift_sdkv2.Options) { - return func(o *redshift_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*redshift.Options) { + return func(o *redshift.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/redshift/service_endpoints_gen_test.go b/internal/service/redshift/service_endpoints_gen_test.go index d26c09269c1..65b75cbc57e 100644 --- a/internal/service/redshift/service_endpoints_gen_test.go +++ b/internal/service/redshift/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - redshift_sdkv2 "github.com/aws/aws-sdk-go-v2/service/redshift" + "github.com/aws/aws-sdk-go-v2/service/redshift" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := redshift_sdkv2.NewDefaultEndpointResolverV2() + r := redshift.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), redshift_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), redshift.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := redshift_sdkv2.NewDefaultEndpointResolverV2() + r := redshift.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), redshift_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), redshift.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.DescribeClusters(ctx, &redshift_sdkv2.DescribeClustersInput{}, - func(opts *redshift_sdkv2.Options) { + _, err := client.DescribeClusters(ctx, &redshift.DescribeClustersInput{}, + func(opts *redshift.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/redshift/service_package_gen.go b/internal/service/redshift/service_package_gen.go index 1ac7d0b92f3..eaf48a85d0f 100644 --- a/internal/service/redshift/service_package_gen.go +++ b/internal/service/redshift/service_package_gen.go @@ -5,8 +5,8 @@ package redshift import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - redshift_sdkv2 "github.com/aws/aws-sdk-go-v2/service/redshift" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/redshift" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -210,11 +210,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*redshift_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*redshift.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return redshift_sdkv2.NewFromConfig(cfg, - redshift_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return redshift.NewFromConfig(cfg, + redshift.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/redshiftdata/service_endpoint_resolver_gen.go b/internal/service/redshiftdata/service_endpoint_resolver_gen.go index 1dcefd43622..aa9ae936fc3 100644 --- a/internal/service/redshiftdata/service_endpoint_resolver_gen.go +++ b/internal/service/redshiftdata/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - redshiftdata_sdkv2 "github.com/aws/aws-sdk-go-v2/service/redshiftdata" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/redshiftdata" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ redshiftdata_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ redshiftdata.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver redshiftdata_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver redshiftdata.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: redshiftdata_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: redshiftdata.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params redshiftdata_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params redshiftdata.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params redshiftdata_ tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up redshiftdata endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params redshiftdata_ return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*redshiftdata_sdkv2.Options) { - return func(o *redshiftdata_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*redshiftdata.Options) { + return func(o *redshiftdata.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/redshiftdata/service_endpoints_gen_test.go b/internal/service/redshiftdata/service_endpoints_gen_test.go index abff32bcec6..b367764e86e 100644 --- a/internal/service/redshiftdata/service_endpoints_gen_test.go +++ b/internal/service/redshiftdata/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - redshiftdata_sdkv2 "github.com/aws/aws-sdk-go-v2/service/redshiftdata" + "github.com/aws/aws-sdk-go-v2/service/redshiftdata" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -296,10 +296,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := redshiftdata_sdkv2.NewDefaultEndpointResolverV2() + r := redshiftdata.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), redshiftdata_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), redshiftdata.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -313,11 +313,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := redshiftdata_sdkv2.NewDefaultEndpointResolverV2() + r := redshiftdata.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), redshiftdata_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), redshiftdata.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -337,10 +337,10 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListDatabases(ctx, &redshiftdata_sdkv2.ListDatabasesInput{ - Database: aws_sdkv2.String("test"), + _, err := client.ListDatabases(ctx, &redshiftdata.ListDatabasesInput{ + Database: aws.String("test"), }, - func(opts *redshiftdata_sdkv2.Options) { + func(opts *redshiftdata.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/redshiftdata/service_package_gen.go b/internal/service/redshiftdata/service_package_gen.go index 21d6ae2a271..a3924b7affa 100644 --- a/internal/service/redshiftdata/service_package_gen.go +++ b/internal/service/redshiftdata/service_package_gen.go @@ -5,8 +5,8 @@ package redshiftdata import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - redshiftdata_sdkv2 "github.com/aws/aws-sdk-go-v2/service/redshiftdata" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/redshiftdata" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -40,11 +40,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*redshiftdata_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*redshiftdata.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return redshiftdata_sdkv2.NewFromConfig(cfg, - redshiftdata_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return redshiftdata.NewFromConfig(cfg, + redshiftdata.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/redshiftserverless/service_endpoint_resolver_gen.go b/internal/service/redshiftserverless/service_endpoint_resolver_gen.go index f5aab0139b8..cf7bfb53201 100644 --- a/internal/service/redshiftserverless/service_endpoint_resolver_gen.go +++ b/internal/service/redshiftserverless/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - redshiftserverless_sdkv2 "github.com/aws/aws-sdk-go-v2/service/redshiftserverless" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/redshiftserverless" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ redshiftserverless_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ redshiftserverless.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver redshiftserverless_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver redshiftserverless.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: redshiftserverless_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: redshiftserverless.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params redshiftserverless_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params redshiftserverless.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params redshiftserve tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up redshiftserverless endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params redshiftserve return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*redshiftserverless_sdkv2.Options) { - return func(o *redshiftserverless_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*redshiftserverless.Options) { + return func(o *redshiftserverless.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/redshiftserverless/service_endpoints_gen_test.go b/internal/service/redshiftserverless/service_endpoints_gen_test.go index 05bf218fb32..16c8901dcdd 100644 --- a/internal/service/redshiftserverless/service_endpoints_gen_test.go +++ b/internal/service/redshiftserverless/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - redshiftserverless_sdkv2 "github.com/aws/aws-sdk-go-v2/service/redshiftserverless" + "github.com/aws/aws-sdk-go-v2/service/redshiftserverless" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := redshiftserverless_sdkv2.NewDefaultEndpointResolverV2() + r := redshiftserverless.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), redshiftserverless_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), redshiftserverless.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := redshiftserverless_sdkv2.NewDefaultEndpointResolverV2() + r := redshiftserverless.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), redshiftserverless_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), redshiftserverless.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListNamespaces(ctx, &redshiftserverless_sdkv2.ListNamespacesInput{}, - func(opts *redshiftserverless_sdkv2.Options) { + _, err := client.ListNamespaces(ctx, &redshiftserverless.ListNamespacesInput{}, + func(opts *redshiftserverless.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/redshiftserverless/service_package_gen.go b/internal/service/redshiftserverless/service_package_gen.go index 0ef2fd6e08b..d2ddac41150 100644 --- a/internal/service/redshiftserverless/service_package_gen.go +++ b/internal/service/redshiftserverless/service_package_gen.go @@ -5,8 +5,8 @@ package redshiftserverless import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - redshiftserverless_sdkv2 "github.com/aws/aws-sdk-go-v2/service/redshiftserverless" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/redshiftserverless" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -93,11 +93,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*redshiftserverless_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*redshiftserverless.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return redshiftserverless_sdkv2.NewFromConfig(cfg, - redshiftserverless_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return redshiftserverless.NewFromConfig(cfg, + redshiftserverless.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/rekognition/service_endpoint_resolver_gen.go b/internal/service/rekognition/service_endpoint_resolver_gen.go index 5a8fe0a7ff1..aaaef06461e 100644 --- a/internal/service/rekognition/service_endpoint_resolver_gen.go +++ b/internal/service/rekognition/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - rekognition_sdkv2 "github.com/aws/aws-sdk-go-v2/service/rekognition" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/rekognition" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ rekognition_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ rekognition.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver rekognition_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver rekognition.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: rekognition_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: rekognition.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params rekognition_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params rekognition.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params rekognition_s tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up rekognition endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params rekognition_s return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*rekognition_sdkv2.Options) { - return func(o *rekognition_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*rekognition.Options) { + return func(o *rekognition.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/rekognition/service_endpoints_gen_test.go b/internal/service/rekognition/service_endpoints_gen_test.go index f840a7c9cbc..49e2d4acd86 100644 --- a/internal/service/rekognition/service_endpoints_gen_test.go +++ b/internal/service/rekognition/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - rekognition_sdkv2 "github.com/aws/aws-sdk-go-v2/service/rekognition" + "github.com/aws/aws-sdk-go-v2/service/rekognition" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := rekognition_sdkv2.NewDefaultEndpointResolverV2() + r := rekognition.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), rekognition_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), rekognition.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := rekognition_sdkv2.NewDefaultEndpointResolverV2() + r := rekognition.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), rekognition_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), rekognition.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListCollections(ctx, &rekognition_sdkv2.ListCollectionsInput{}, - func(opts *rekognition_sdkv2.Options) { + _, err := client.ListCollections(ctx, &rekognition.ListCollectionsInput{}, + func(opts *rekognition.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/rekognition/service_package_gen.go b/internal/service/rekognition/service_package_gen.go index 1ca8339efdd..c41ca1a544a 100644 --- a/internal/service/rekognition/service_package_gen.go +++ b/internal/service/rekognition/service_package_gen.go @@ -5,8 +5,8 @@ package rekognition import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - rekognition_sdkv2 "github.com/aws/aws-sdk-go-v2/service/rekognition" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/rekognition" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -54,11 +54,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*rekognition_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*rekognition.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return rekognition_sdkv2.NewFromConfig(cfg, - rekognition_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return rekognition.NewFromConfig(cfg, + rekognition.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/resiliencehub/service_endpoint_resolver_gen.go b/internal/service/resiliencehub/service_endpoint_resolver_gen.go index cc413c903fb..65ff86dc765 100644 --- a/internal/service/resiliencehub/service_endpoint_resolver_gen.go +++ b/internal/service/resiliencehub/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - resiliencehub_sdkv2 "github.com/aws/aws-sdk-go-v2/service/resiliencehub" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/resiliencehub" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ resiliencehub_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ resiliencehub.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver resiliencehub_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver resiliencehub.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: resiliencehub_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: resiliencehub.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params resiliencehub_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params resiliencehub.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params resiliencehub tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up resiliencehub endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params resiliencehub return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*resiliencehub_sdkv2.Options) { - return func(o *resiliencehub_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*resiliencehub.Options) { + return func(o *resiliencehub.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/resiliencehub/service_endpoints_gen_test.go b/internal/service/resiliencehub/service_endpoints_gen_test.go index c7e61aed281..baf29d605d0 100644 --- a/internal/service/resiliencehub/service_endpoints_gen_test.go +++ b/internal/service/resiliencehub/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - resiliencehub_sdkv2 "github.com/aws/aws-sdk-go-v2/service/resiliencehub" + "github.com/aws/aws-sdk-go-v2/service/resiliencehub" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := resiliencehub_sdkv2.NewDefaultEndpointResolverV2() + r := resiliencehub.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), resiliencehub_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), resiliencehub.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := resiliencehub_sdkv2.NewDefaultEndpointResolverV2() + r := resiliencehub.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), resiliencehub_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), resiliencehub.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListApps(ctx, &resiliencehub_sdkv2.ListAppsInput{}, - func(opts *resiliencehub_sdkv2.Options) { + _, err := client.ListApps(ctx, &resiliencehub.ListAppsInput{}, + func(opts *resiliencehub.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/resiliencehub/service_package_gen.go b/internal/service/resiliencehub/service_package_gen.go index 6cb1f1d7d1c..d551d2e14c1 100644 --- a/internal/service/resiliencehub/service_package_gen.go +++ b/internal/service/resiliencehub/service_package_gen.go @@ -5,8 +5,8 @@ package resiliencehub import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - resiliencehub_sdkv2 "github.com/aws/aws-sdk-go-v2/service/resiliencehub" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/resiliencehub" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -43,11 +43,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*resiliencehub_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*resiliencehub.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return resiliencehub_sdkv2.NewFromConfig(cfg, - resiliencehub_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return resiliencehub.NewFromConfig(cfg, + resiliencehub.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/resourceexplorer2/service_endpoint_resolver_gen.go b/internal/service/resourceexplorer2/service_endpoint_resolver_gen.go index f1bfe5122bf..ef6e3413679 100644 --- a/internal/service/resourceexplorer2/service_endpoint_resolver_gen.go +++ b/internal/service/resourceexplorer2/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - resourceexplorer2_sdkv2 "github.com/aws/aws-sdk-go-v2/service/resourceexplorer2" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/resourceexplorer2" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ resourceexplorer2_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ resourceexplorer2.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver resourceexplorer2_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver resourceexplorer2.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: resourceexplorer2_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: resourceexplorer2.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params resourceexplorer2_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params resourceexplorer2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params resourceexplo tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up resourceexplorer2 endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params resourceexplo return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*resourceexplorer2_sdkv2.Options) { - return func(o *resourceexplorer2_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*resourceexplorer2.Options) { + return func(o *resourceexplorer2.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/resourceexplorer2/service_endpoints_gen_test.go b/internal/service/resourceexplorer2/service_endpoints_gen_test.go index c597113c602..211f81a37ec 100644 --- a/internal/service/resourceexplorer2/service_endpoints_gen_test.go +++ b/internal/service/resourceexplorer2/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - resourceexplorer2_sdkv2 "github.com/aws/aws-sdk-go-v2/service/resourceexplorer2" + "github.com/aws/aws-sdk-go-v2/service/resourceexplorer2" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := resourceexplorer2_sdkv2.NewDefaultEndpointResolverV2() + r := resourceexplorer2.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), resourceexplorer2_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), resourceexplorer2.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := resourceexplorer2_sdkv2.NewDefaultEndpointResolverV2() + r := resourceexplorer2.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), resourceexplorer2_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), resourceexplorer2.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListIndexes(ctx, &resourceexplorer2_sdkv2.ListIndexesInput{}, - func(opts *resourceexplorer2_sdkv2.Options) { + _, err := client.ListIndexes(ctx, &resourceexplorer2.ListIndexesInput{}, + func(opts *resourceexplorer2.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/resourceexplorer2/service_package_gen.go b/internal/service/resourceexplorer2/service_package_gen.go index fcaf6bdd81e..94974560e57 100644 --- a/internal/service/resourceexplorer2/service_package_gen.go +++ b/internal/service/resourceexplorer2/service_package_gen.go @@ -5,8 +5,8 @@ package resourceexplorer2 import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - resourceexplorer2_sdkv2 "github.com/aws/aws-sdk-go-v2/service/resourceexplorer2" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/resourceexplorer2" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -55,11 +55,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*resourceexplorer2_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*resourceexplorer2.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return resourceexplorer2_sdkv2.NewFromConfig(cfg, - resourceexplorer2_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return resourceexplorer2.NewFromConfig(cfg, + resourceexplorer2.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/resourcegroups/service_endpoint_resolver_gen.go b/internal/service/resourcegroups/service_endpoint_resolver_gen.go index 5153c50eca9..f9caa3d5400 100644 --- a/internal/service/resourcegroups/service_endpoint_resolver_gen.go +++ b/internal/service/resourcegroups/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - resourcegroups_sdkv2 "github.com/aws/aws-sdk-go-v2/service/resourcegroups" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/resourcegroups" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ resourcegroups_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ resourcegroups.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver resourcegroups_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver resourcegroups.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: resourcegroups_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: resourcegroups.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params resourcegroups_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params resourcegroups.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params resourcegroup tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up resourcegroups endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params resourcegroup return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*resourcegroups_sdkv2.Options) { - return func(o *resourcegroups_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*resourcegroups.Options) { + return func(o *resourcegroups.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/resourcegroups/service_endpoints_gen_test.go b/internal/service/resourcegroups/service_endpoints_gen_test.go index d089416a447..bf6d24625aa 100644 --- a/internal/service/resourcegroups/service_endpoints_gen_test.go +++ b/internal/service/resourcegroups/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - resourcegroups_sdkv2 "github.com/aws/aws-sdk-go-v2/service/resourcegroups" + "github.com/aws/aws-sdk-go-v2/service/resourcegroups" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := resourcegroups_sdkv2.NewDefaultEndpointResolverV2() + r := resourcegroups.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), resourcegroups_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), resourcegroups.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := resourcegroups_sdkv2.NewDefaultEndpointResolverV2() + r := resourcegroups.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), resourcegroups_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), resourcegroups.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListGroups(ctx, &resourcegroups_sdkv2.ListGroupsInput{}, - func(opts *resourcegroups_sdkv2.Options) { + _, err := client.ListGroups(ctx, &resourcegroups.ListGroupsInput{}, + func(opts *resourcegroups.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/resourcegroups/service_package_gen.go b/internal/service/resourcegroups/service_package_gen.go index e678b38a0ff..192987d19b6 100644 --- a/internal/service/resourcegroups/service_package_gen.go +++ b/internal/service/resourcegroups/service_package_gen.go @@ -5,8 +5,8 @@ package resourcegroups import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - resourcegroups_sdkv2 "github.com/aws/aws-sdk-go-v2/service/resourcegroups" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/resourcegroups" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -49,11 +49,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*resourcegroups_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*resourcegroups.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return resourcegroups_sdkv2.NewFromConfig(cfg, - resourcegroups_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return resourcegroups.NewFromConfig(cfg, + resourcegroups.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/resourcegroupstaggingapi/service_endpoint_resolver_gen.go b/internal/service/resourcegroupstaggingapi/service_endpoint_resolver_gen.go index 470727433f2..9cdfcb5d725 100644 --- a/internal/service/resourcegroupstaggingapi/service_endpoint_resolver_gen.go +++ b/internal/service/resourcegroupstaggingapi/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - resourcegroupstaggingapi_sdkv2 "github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ resourcegroupstaggingapi_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ resourcegroupstaggingapi.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver resourcegroupstaggingapi_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver resourcegroupstaggingapi.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: resourcegroupstaggingapi_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: resourcegroupstaggingapi.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params resourcegroupstaggingapi_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params resourcegroupstaggingapi.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params resourcegroup tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up resourcegroupstaggingapi endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params resourcegroup return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*resourcegroupstaggingapi_sdkv2.Options) { - return func(o *resourcegroupstaggingapi_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*resourcegroupstaggingapi.Options) { + return func(o *resourcegroupstaggingapi.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/resourcegroupstaggingapi/service_endpoints_gen_test.go b/internal/service/resourcegroupstaggingapi/service_endpoints_gen_test.go index 95212e15650..bfdcc6909f1 100644 --- a/internal/service/resourcegroupstaggingapi/service_endpoints_gen_test.go +++ b/internal/service/resourcegroupstaggingapi/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - resourcegroupstaggingapi_sdkv2 "github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi" + "github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -296,10 +296,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := resourcegroupstaggingapi_sdkv2.NewDefaultEndpointResolverV2() + r := resourcegroupstaggingapi.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), resourcegroupstaggingapi_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), resourcegroupstaggingapi.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -313,11 +313,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := resourcegroupstaggingapi_sdkv2.NewDefaultEndpointResolverV2() + r := resourcegroupstaggingapi.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), resourcegroupstaggingapi_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), resourcegroupstaggingapi.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -337,8 +337,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.GetResources(ctx, &resourcegroupstaggingapi_sdkv2.GetResourcesInput{}, - func(opts *resourcegroupstaggingapi_sdkv2.Options) { + _, err := client.GetResources(ctx, &resourcegroupstaggingapi.GetResourcesInput{}, + func(opts *resourcegroupstaggingapi.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/resourcegroupstaggingapi/service_package_gen.go b/internal/service/resourcegroupstaggingapi/service_package_gen.go index 32348897fe6..f8f2999f31f 100644 --- a/internal/service/resourcegroupstaggingapi/service_package_gen.go +++ b/internal/service/resourcegroupstaggingapi/service_package_gen.go @@ -5,8 +5,8 @@ package resourcegroupstaggingapi import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - resourcegroupstaggingapi_sdkv2 "github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -40,11 +40,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*resourcegroupstaggingapi_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*resourcegroupstaggingapi.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return resourcegroupstaggingapi_sdkv2.NewFromConfig(cfg, - resourcegroupstaggingapi_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return resourcegroupstaggingapi.NewFromConfig(cfg, + resourcegroupstaggingapi.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/rolesanywhere/service_endpoint_resolver_gen.go b/internal/service/rolesanywhere/service_endpoint_resolver_gen.go index 5d03433d57c..d9a4c06680a 100644 --- a/internal/service/rolesanywhere/service_endpoint_resolver_gen.go +++ b/internal/service/rolesanywhere/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - rolesanywhere_sdkv2 "github.com/aws/aws-sdk-go-v2/service/rolesanywhere" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/rolesanywhere" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ rolesanywhere_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ rolesanywhere.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver rolesanywhere_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver rolesanywhere.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: rolesanywhere_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: rolesanywhere.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params rolesanywhere_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params rolesanywhere.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params rolesanywhere tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up rolesanywhere endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params rolesanywhere return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*rolesanywhere_sdkv2.Options) { - return func(o *rolesanywhere_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*rolesanywhere.Options) { + return func(o *rolesanywhere.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/rolesanywhere/service_endpoints_gen_test.go b/internal/service/rolesanywhere/service_endpoints_gen_test.go index ba6b0957bfa..aa2984b5af4 100644 --- a/internal/service/rolesanywhere/service_endpoints_gen_test.go +++ b/internal/service/rolesanywhere/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - rolesanywhere_sdkv2 "github.com/aws/aws-sdk-go-v2/service/rolesanywhere" + "github.com/aws/aws-sdk-go-v2/service/rolesanywhere" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := rolesanywhere_sdkv2.NewDefaultEndpointResolverV2() + r := rolesanywhere.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), rolesanywhere_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), rolesanywhere.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := rolesanywhere_sdkv2.NewDefaultEndpointResolverV2() + r := rolesanywhere.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), rolesanywhere_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), rolesanywhere.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListProfiles(ctx, &rolesanywhere_sdkv2.ListProfilesInput{}, - func(opts *rolesanywhere_sdkv2.Options) { + _, err := client.ListProfiles(ctx, &rolesanywhere.ListProfilesInput{}, + func(opts *rolesanywhere.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/rolesanywhere/service_package_gen.go b/internal/service/rolesanywhere/service_package_gen.go index 05183b5675c..27eb797f843 100644 --- a/internal/service/rolesanywhere/service_package_gen.go +++ b/internal/service/rolesanywhere/service_package_gen.go @@ -5,8 +5,8 @@ package rolesanywhere import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - rolesanywhere_sdkv2 "github.com/aws/aws-sdk-go-v2/service/rolesanywhere" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/rolesanywhere" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -52,11 +52,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*rolesanywhere_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*rolesanywhere.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return rolesanywhere_sdkv2.NewFromConfig(cfg, - rolesanywhere_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return rolesanywhere.NewFromConfig(cfg, + rolesanywhere.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/route53/service_endpoint_resolver_gen.go b/internal/service/route53/service_endpoint_resolver_gen.go index db1d4a68e6c..b0f533b789d 100644 --- a/internal/service/route53/service_endpoint_resolver_gen.go +++ b/internal/service/route53/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - route53_sdkv2 "github.com/aws/aws-sdk-go-v2/service/route53" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/route53" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ route53_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ route53.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver route53_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver route53.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: route53_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: route53.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params route53_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params route53.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params route53_sdkv2 tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up route53 endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params route53_sdkv2 return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*route53_sdkv2.Options) { - return func(o *route53_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*route53.Options) { + return func(o *route53.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/route53/service_endpoints_gen_test.go b/internal/service/route53/service_endpoints_gen_test.go index bb74a0f7102..c99e9a86c2b 100644 --- a/internal/service/route53/service_endpoints_gen_test.go +++ b/internal/service/route53/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - route53_sdkv2 "github.com/aws/aws-sdk-go-v2/service/route53" + "github.com/aws/aws-sdk-go-v2/service/route53" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := route53_sdkv2.NewDefaultEndpointResolverV2() + r := route53.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), route53_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), route53.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := route53_sdkv2.NewDefaultEndpointResolverV2() + r := route53.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), route53_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), route53.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListHostedZones(ctx, &route53_sdkv2.ListHostedZonesInput{}, - func(opts *route53_sdkv2.Options) { + _, err := client.ListHostedZones(ctx, &route53.ListHostedZonesInput{}, + func(opts *route53.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/route53/service_package.go b/internal/service/route53/service_package.go index cb1a94c876f..1b84a77adec 100644 --- a/internal/service/route53/service_package.go +++ b/internal/service/route53/service_package.go @@ -17,7 +17,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return route53.NewFromConfig(cfg, - route53.WithEndpointResolverV2(newEndpointResolverSDKv2()), + route53.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), func(o *route53.Options) { // Always override the service region diff --git a/internal/service/route53domains/service_endpoint_resolver_gen.go b/internal/service/route53domains/service_endpoint_resolver_gen.go index 7ef9fe3f5af..ab817541091 100644 --- a/internal/service/route53domains/service_endpoint_resolver_gen.go +++ b/internal/service/route53domains/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - route53domains_sdkv2 "github.com/aws/aws-sdk-go-v2/service/route53domains" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/route53domains" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ route53domains_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ route53domains.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver route53domains_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver route53domains.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: route53domains_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: route53domains.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params route53domains_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params route53domains.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params route53domain tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up route53domains endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params route53domain return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*route53domains_sdkv2.Options) { - return func(o *route53domains_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*route53domains.Options) { + return func(o *route53domains.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/route53domains/service_endpoints_gen_test.go b/internal/service/route53domains/service_endpoints_gen_test.go index 262e075d1bf..eef4df7704a 100644 --- a/internal/service/route53domains/service_endpoints_gen_test.go +++ b/internal/service/route53domains/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - route53domains_sdkv2 "github.com/aws/aws-sdk-go-v2/service/route53domains" + "github.com/aws/aws-sdk-go-v2/service/route53domains" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -244,10 +244,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := route53domains_sdkv2.NewDefaultEndpointResolverV2() + r := route53domains.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), route53domains_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), route53domains.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -261,11 +261,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := route53domains_sdkv2.NewDefaultEndpointResolverV2() + r := route53domains.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), route53domains_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), route53domains.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -285,8 +285,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListDomains(ctx, &route53domains_sdkv2.ListDomainsInput{}, - func(opts *route53domains_sdkv2.Options) { + _, err := client.ListDomains(ctx, &route53domains.ListDomainsInput{}, + func(opts *route53domains.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/route53domains/service_package.go b/internal/service/route53domains/service_package.go index 864905dd906..61d598743f1 100644 --- a/internal/service/route53domains/service_package.go +++ b/internal/service/route53domains/service_package.go @@ -17,7 +17,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return route53domains.NewFromConfig(cfg, - route53domains.WithEndpointResolverV2(newEndpointResolverSDKv2()), + route53domains.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), func(o *route53domains.Options) { if config["partition"].(string) == names.StandardPartitionID { diff --git a/internal/service/route53profiles/association.go b/internal/service/route53profiles/association.go index 9b1a0d4230b..7511a8a5544 100644 --- a/internal/service/route53profiles/association.go +++ b/internal/service/route53profiles/association.go @@ -11,9 +11,9 @@ import ( "github.com/YakDriver/regexache" "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws/arn" "github.com/aws/aws-sdk-go-v2/service/route53profiles" awstypes "github.com/aws/aws-sdk-go-v2/service/route53profiles/types" - "github.com/aws/aws-sdk-go/aws/arn" "github.com/hashicorp/terraform-plugin-framework-timeouts/resource/timeouts" "github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator" "github.com/hashicorp/terraform-plugin-framework/path" diff --git a/internal/service/route53profiles/service_endpoint_resolver_gen.go b/internal/service/route53profiles/service_endpoint_resolver_gen.go index d15c75fb9dc..47b741a4826 100644 --- a/internal/service/route53profiles/service_endpoint_resolver_gen.go +++ b/internal/service/route53profiles/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - route53profiles_sdkv2 "github.com/aws/aws-sdk-go-v2/service/route53profiles" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/route53profiles" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ route53profiles_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ route53profiles.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver route53profiles_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver route53profiles.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: route53profiles_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: route53profiles.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params route53profiles_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params route53profiles.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params route53profil tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up route53profiles endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params route53profil return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*route53profiles_sdkv2.Options) { - return func(o *route53profiles_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*route53profiles.Options) { + return func(o *route53profiles.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/route53profiles/service_package_gen.go b/internal/service/route53profiles/service_package_gen.go index 6ed7e3c8580..1eb644948a0 100644 --- a/internal/service/route53profiles/service_package_gen.go +++ b/internal/service/route53profiles/service_package_gen.go @@ -5,8 +5,8 @@ package route53profiles import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - route53profiles_sdkv2 "github.com/aws/aws-sdk-go-v2/service/route53profiles" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/route53profiles" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -59,11 +59,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*route53profiles_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*route53profiles.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return route53profiles_sdkv2.NewFromConfig(cfg, - route53profiles_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return route53profiles.NewFromConfig(cfg, + route53profiles.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/route53recoverycontrolconfig/service_endpoint_resolver_gen.go b/internal/service/route53recoverycontrolconfig/service_endpoint_resolver_gen.go index 7c86edfea6e..e2ba03523c0 100644 --- a/internal/service/route53recoverycontrolconfig/service_endpoint_resolver_gen.go +++ b/internal/service/route53recoverycontrolconfig/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - route53recoverycontrolconfig_sdkv2 "github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ route53recoverycontrolconfig_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ route53recoverycontrolconfig.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver route53recoverycontrolconfig_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver route53recoverycontrolconfig.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: route53recoverycontrolconfig_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: route53recoverycontrolconfig.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params route53recoverycontrolconfig_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params route53recoverycontrolconfig.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params route53recove tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up route53recoverycontrolconfig endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params route53recove return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*route53recoverycontrolconfig_sdkv2.Options) { - return func(o *route53recoverycontrolconfig_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*route53recoverycontrolconfig.Options) { + return func(o *route53recoverycontrolconfig.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/route53recoverycontrolconfig/service_endpoints_gen_test.go b/internal/service/route53recoverycontrolconfig/service_endpoints_gen_test.go index 7722a9407c0..c3f0a6d57fa 100644 --- a/internal/service/route53recoverycontrolconfig/service_endpoints_gen_test.go +++ b/internal/service/route53recoverycontrolconfig/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - route53recoverycontrolconfig_sdkv2 "github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig" + "github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := route53recoverycontrolconfig_sdkv2.NewDefaultEndpointResolverV2() + r := route53recoverycontrolconfig.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), route53recoverycontrolconfig_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), route53recoverycontrolconfig.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := route53recoverycontrolconfig_sdkv2.NewDefaultEndpointResolverV2() + r := route53recoverycontrolconfig.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), route53recoverycontrolconfig_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), route53recoverycontrolconfig.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListClusters(ctx, &route53recoverycontrolconfig_sdkv2.ListClustersInput{}, - func(opts *route53recoverycontrolconfig_sdkv2.Options) { + _, err := client.ListClusters(ctx, &route53recoverycontrolconfig.ListClustersInput{}, + func(opts *route53recoverycontrolconfig.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/route53recoverycontrolconfig/service_package.go b/internal/service/route53recoverycontrolconfig/service_package.go index b0cd55431e4..deecc258267 100644 --- a/internal/service/route53recoverycontrolconfig/service_package.go +++ b/internal/service/route53recoverycontrolconfig/service_package.go @@ -17,7 +17,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return r53rcc.NewFromConfig(cfg, - r53rcc.WithEndpointResolverV2(newEndpointResolverSDKv2()), + r53rcc.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), func(o *r53rcc.Options) { // Always override the service region diff --git a/internal/service/route53recoveryreadiness/service_endpoint_resolver_gen.go b/internal/service/route53recoveryreadiness/service_endpoint_resolver_gen.go index 0a4ee9472a2..81057239e99 100644 --- a/internal/service/route53recoveryreadiness/service_endpoint_resolver_gen.go +++ b/internal/service/route53recoveryreadiness/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - route53recoveryreadiness_sdkv2 "github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ route53recoveryreadiness_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ route53recoveryreadiness.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver route53recoveryreadiness_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver route53recoveryreadiness.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: route53recoveryreadiness_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: route53recoveryreadiness.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params route53recoveryreadiness_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params route53recoveryreadiness.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params route53recove tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up route53recoveryreadiness endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params route53recove return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*route53recoveryreadiness_sdkv2.Options) { - return func(o *route53recoveryreadiness_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*route53recoveryreadiness.Options) { + return func(o *route53recoveryreadiness.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/route53recoveryreadiness/service_endpoints_gen_test.go b/internal/service/route53recoveryreadiness/service_endpoints_gen_test.go index c4d07b12b97..854b1c2350b 100644 --- a/internal/service/route53recoveryreadiness/service_endpoints_gen_test.go +++ b/internal/service/route53recoveryreadiness/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - route53recoveryreadiness_sdkv2 "github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness" + "github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := route53recoveryreadiness_sdkv2.NewDefaultEndpointResolverV2() + r := route53recoveryreadiness.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), route53recoveryreadiness_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), route53recoveryreadiness.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := route53recoveryreadiness_sdkv2.NewDefaultEndpointResolverV2() + r := route53recoveryreadiness.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), route53recoveryreadiness_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), route53recoveryreadiness.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListCells(ctx, &route53recoveryreadiness_sdkv2.ListCellsInput{}, - func(opts *route53recoveryreadiness_sdkv2.Options) { + _, err := client.ListCells(ctx, &route53recoveryreadiness.ListCellsInput{}, + func(opts *route53recoveryreadiness.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/route53recoveryreadiness/service_package.go b/internal/service/route53recoveryreadiness/service_package.go index d6d475b3690..779b964ede9 100644 --- a/internal/service/route53recoveryreadiness/service_package.go +++ b/internal/service/route53recoveryreadiness/service_package.go @@ -17,7 +17,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return route53recoveryreadiness.NewFromConfig(cfg, - route53recoveryreadiness.WithEndpointResolverV2(newEndpointResolverSDKv2()), + route53recoveryreadiness.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), func(o *route53recoveryreadiness.Options) { // Always override the service region diff --git a/internal/service/route53resolver/service_endpoint_resolver_gen.go b/internal/service/route53resolver/service_endpoint_resolver_gen.go index 493496fc66f..7164590704a 100644 --- a/internal/service/route53resolver/service_endpoint_resolver_gen.go +++ b/internal/service/route53resolver/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - route53resolver_sdkv2 "github.com/aws/aws-sdk-go-v2/service/route53resolver" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/route53resolver" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ route53resolver_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ route53resolver.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver route53resolver_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver route53resolver.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: route53resolver_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: route53resolver.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params route53resolver_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params route53resolver.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params route53resolv tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up route53resolver endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params route53resolv return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*route53resolver_sdkv2.Options) { - return func(o *route53resolver_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*route53resolver.Options) { + return func(o *route53resolver.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/route53resolver/service_endpoints_gen_test.go b/internal/service/route53resolver/service_endpoints_gen_test.go index e2795c18f0e..7da8273ca84 100644 --- a/internal/service/route53resolver/service_endpoints_gen_test.go +++ b/internal/service/route53resolver/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - route53resolver_sdkv2 "github.com/aws/aws-sdk-go-v2/service/route53resolver" + "github.com/aws/aws-sdk-go-v2/service/route53resolver" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := route53resolver_sdkv2.NewDefaultEndpointResolverV2() + r := route53resolver.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), route53resolver_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), route53resolver.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := route53resolver_sdkv2.NewDefaultEndpointResolverV2() + r := route53resolver.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), route53resolver_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), route53resolver.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListFirewallDomainLists(ctx, &route53resolver_sdkv2.ListFirewallDomainListsInput{}, - func(opts *route53resolver_sdkv2.Options) { + _, err := client.ListFirewallDomainLists(ctx, &route53resolver.ListFirewallDomainListsInput{}, + func(opts *route53resolver.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/route53resolver/service_package_gen.go b/internal/service/route53resolver/service_package_gen.go index 9faa421f7d2..f6ea7987fbe 100644 --- a/internal/service/route53resolver/service_package_gen.go +++ b/internal/service/route53resolver/service_package_gen.go @@ -5,8 +5,8 @@ package route53resolver import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - route53resolver_sdkv2 "github.com/aws/aws-sdk-go-v2/service/route53resolver" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/route53resolver" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -160,11 +160,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*route53resolver_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*route53resolver.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return route53resolver_sdkv2.NewFromConfig(cfg, - route53resolver_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return route53resolver.NewFromConfig(cfg, + route53resolver.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/rum/service_endpoint_resolver_gen.go b/internal/service/rum/service_endpoint_resolver_gen.go index 1c954121cf4..6c385f7c4a3 100644 --- a/internal/service/rum/service_endpoint_resolver_gen.go +++ b/internal/service/rum/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - rum_sdkv2 "github.com/aws/aws-sdk-go-v2/service/rum" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/rum" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ rum_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ rum.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver rum_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver rum.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: rum_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: rum.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params rum_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params rum.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params rum_sdkv2.End tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up rum endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params rum_sdkv2.End return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*rum_sdkv2.Options) { - return func(o *rum_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*rum.Options) { + return func(o *rum.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/rum/service_endpoints_gen_test.go b/internal/service/rum/service_endpoints_gen_test.go index c4796b1b661..34f4c585da7 100644 --- a/internal/service/rum/service_endpoints_gen_test.go +++ b/internal/service/rum/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - rum_sdkv2 "github.com/aws/aws-sdk-go-v2/service/rum" + "github.com/aws/aws-sdk-go-v2/service/rum" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -296,10 +296,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := rum_sdkv2.NewDefaultEndpointResolverV2() + r := rum.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), rum_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), rum.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -313,11 +313,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := rum_sdkv2.NewDefaultEndpointResolverV2() + r := rum.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), rum_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), rum.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -337,8 +337,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListAppMonitors(ctx, &rum_sdkv2.ListAppMonitorsInput{}, - func(opts *rum_sdkv2.Options) { + _, err := client.ListAppMonitors(ctx, &rum.ListAppMonitorsInput{}, + func(opts *rum.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/rum/service_package_gen.go b/internal/service/rum/service_package_gen.go index 45c6405a230..7a3e2decd9b 100644 --- a/internal/service/rum/service_package_gen.go +++ b/internal/service/rum/service_package_gen.go @@ -5,8 +5,8 @@ package rum import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - rum_sdkv2 "github.com/aws/aws-sdk-go-v2/service/rum" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/rum" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -49,11 +49,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*rum_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*rum.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return rum_sdkv2.NewFromConfig(cfg, - rum_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return rum.NewFromConfig(cfg, + rum.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/s3/service_endpoint_resolver_gen.go b/internal/service/s3/service_endpoint_resolver_gen.go index 85140be3a69..09052d858cf 100644 --- a/internal/service/s3/service_endpoint_resolver_gen.go +++ b/internal/service/s3/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - s3_sdkv2 "github.com/aws/aws-sdk-go-v2/service/s3" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/s3" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ s3_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ s3.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver s3_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver s3.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: s3_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: s3.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params s3_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params s3.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params s3_sdkv2.Endp tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up s3 endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params s3_sdkv2.Endp return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*s3_sdkv2.Options) { - return func(o *s3_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*s3.Options) { + return func(o *s3.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/s3/service_endpoints_gen_test.go b/internal/service/s3/service_endpoints_gen_test.go index a64d2210cde..4b9d357b354 100644 --- a/internal/service/s3/service_endpoints_gen_test.go +++ b/internal/service/s3/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - s3_sdkv2 "github.com/aws/aws-sdk-go-v2/service/s3" + "github.com/aws/aws-sdk-go-v2/service/s3" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -420,10 +420,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := s3_sdkv2.NewDefaultEndpointResolverV2() + r := s3.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), s3_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), s3.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -437,11 +437,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := s3_sdkv2.NewDefaultEndpointResolverV2() + r := s3.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), s3_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), s3.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -461,8 +461,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListBuckets(ctx, &s3_sdkv2.ListBucketsInput{}, - func(opts *s3_sdkv2.Options) { + _, err := client.ListBuckets(ctx, &s3.ListBucketsInput{}, + func(opts *s3.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/s3/service_package.go b/internal/service/s3/service_package.go index 0c9b6d78f72..3f95940d0c3 100644 --- a/internal/service/s3/service_package.go +++ b/internal/service/s3/service_package.go @@ -20,7 +20,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return s3.NewFromConfig(cfg, - s3.WithEndpointResolverV2(newEndpointResolverSDKv2()), + s3.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), func(o *s3.Options) { if o.Region == names.USEast1RegionID && config["s3_us_east_1_regional_endpoint"].(string) != "regional" { diff --git a/internal/service/s3control/service_endpoint_resolver_gen.go b/internal/service/s3control/service_endpoint_resolver_gen.go index 2446353f251..29593cd2fde 100644 --- a/internal/service/s3control/service_endpoint_resolver_gen.go +++ b/internal/service/s3control/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - s3control_sdkv2 "github.com/aws/aws-sdk-go-v2/service/s3control" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/s3control" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ s3control_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ s3control.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver s3control_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver s3control.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: s3control_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: s3control.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params s3control_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params s3control.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params s3control_sdk tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up s3control endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params s3control_sdk return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*s3control_sdkv2.Options) { - return func(o *s3control_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*s3control.Options) { + return func(o *s3control.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/s3control/service_package_gen.go b/internal/service/s3control/service_package_gen.go index f0eb92a7942..eced01274e6 100644 --- a/internal/service/s3control/service_package_gen.go +++ b/internal/service/s3control/service_package_gen.go @@ -5,8 +5,8 @@ package s3control import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - s3control_sdkv2 "github.com/aws/aws-sdk-go-v2/service/s3control" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/s3control" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -115,11 +115,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*s3control_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*s3control.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return s3control_sdkv2.NewFromConfig(cfg, - s3control_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return s3control.NewFromConfig(cfg, + s3control.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/s3outposts/service_endpoint_resolver_gen.go b/internal/service/s3outposts/service_endpoint_resolver_gen.go index f35e76b6608..f457b581e30 100644 --- a/internal/service/s3outposts/service_endpoint_resolver_gen.go +++ b/internal/service/s3outposts/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - s3outposts_sdkv2 "github.com/aws/aws-sdk-go-v2/service/s3outposts" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/s3outposts" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ s3outposts_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ s3outposts.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver s3outposts_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver s3outposts.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: s3outposts_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: s3outposts.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params s3outposts_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params s3outposts.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params s3outposts_sd tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up s3outposts endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params s3outposts_sd return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*s3outposts_sdkv2.Options) { - return func(o *s3outposts_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*s3outposts.Options) { + return func(o *s3outposts.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/s3outposts/service_endpoints_gen_test.go b/internal/service/s3outposts/service_endpoints_gen_test.go index 77db070505f..39714787d68 100644 --- a/internal/service/s3outposts/service_endpoints_gen_test.go +++ b/internal/service/s3outposts/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - s3outposts_sdkv2 "github.com/aws/aws-sdk-go-v2/service/s3outposts" + "github.com/aws/aws-sdk-go-v2/service/s3outposts" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := s3outposts_sdkv2.NewDefaultEndpointResolverV2() + r := s3outposts.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), s3outposts_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), s3outposts.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := s3outposts_sdkv2.NewDefaultEndpointResolverV2() + r := s3outposts.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), s3outposts_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), s3outposts.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListEndpoints(ctx, &s3outposts_sdkv2.ListEndpointsInput{}, - func(opts *s3outposts_sdkv2.Options) { + _, err := client.ListEndpoints(ctx, &s3outposts.ListEndpointsInput{}, + func(opts *s3outposts.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/s3outposts/service_package_gen.go b/internal/service/s3outposts/service_package_gen.go index 02b8d4c104a..c4536217967 100644 --- a/internal/service/s3outposts/service_package_gen.go +++ b/internal/service/s3outposts/service_package_gen.go @@ -5,8 +5,8 @@ package s3outposts import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - s3outposts_sdkv2 "github.com/aws/aws-sdk-go-v2/service/s3outposts" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/s3outposts" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -41,11 +41,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*s3outposts_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*s3outposts.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return s3outposts_sdkv2.NewFromConfig(cfg, - s3outposts_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return s3outposts.NewFromConfig(cfg, + s3outposts.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/sagemaker/service_endpoint_resolver_gen.go b/internal/service/sagemaker/service_endpoint_resolver_gen.go index 66eeb066d7f..59805710c05 100644 --- a/internal/service/sagemaker/service_endpoint_resolver_gen.go +++ b/internal/service/sagemaker/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - sagemaker_sdkv2 "github.com/aws/aws-sdk-go-v2/service/sagemaker" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/sagemaker" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ sagemaker_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ sagemaker.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver sagemaker_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver sagemaker.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: sagemaker_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: sagemaker.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params sagemaker_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params sagemaker.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params sagemaker_sdk tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up sagemaker endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params sagemaker_sdk return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*sagemaker_sdkv2.Options) { - return func(o *sagemaker_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*sagemaker.Options) { + return func(o *sagemaker.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/sagemaker/service_endpoints_gen_test.go b/internal/service/sagemaker/service_endpoints_gen_test.go index cf3e4873ad3..9aed3fb2303 100644 --- a/internal/service/sagemaker/service_endpoints_gen_test.go +++ b/internal/service/sagemaker/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - sagemaker_sdkv2 "github.com/aws/aws-sdk-go-v2/service/sagemaker" + "github.com/aws/aws-sdk-go-v2/service/sagemaker" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := sagemaker_sdkv2.NewDefaultEndpointResolverV2() + r := sagemaker.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), sagemaker_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), sagemaker.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := sagemaker_sdkv2.NewDefaultEndpointResolverV2() + r := sagemaker.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), sagemaker_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), sagemaker.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListClusters(ctx, &sagemaker_sdkv2.ListClustersInput{}, - func(opts *sagemaker_sdkv2.Options) { + _, err := client.ListClusters(ctx, &sagemaker.ListClustersInput{}, + func(opts *sagemaker.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/sagemaker/service_package_gen.go b/internal/service/sagemaker/service_package_gen.go index 84587e5993a..e7fbad7398c 100644 --- a/internal/service/sagemaker/service_package_gen.go +++ b/internal/service/sagemaker/service_package_gen.go @@ -5,8 +5,8 @@ package sagemaker import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - sagemaker_sdkv2 "github.com/aws/aws-sdk-go-v2/service/sagemaker" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/sagemaker" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -264,11 +264,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*sagemaker_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*sagemaker.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return sagemaker_sdkv2.NewFromConfig(cfg, - sagemaker_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return sagemaker.NewFromConfig(cfg, + sagemaker.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/scheduler/service_endpoint_resolver_gen.go b/internal/service/scheduler/service_endpoint_resolver_gen.go index 44b5b63e288..17dae075033 100644 --- a/internal/service/scheduler/service_endpoint_resolver_gen.go +++ b/internal/service/scheduler/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - scheduler_sdkv2 "github.com/aws/aws-sdk-go-v2/service/scheduler" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/scheduler" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ scheduler_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ scheduler.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver scheduler_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver scheduler.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: scheduler_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: scheduler.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params scheduler_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params scheduler.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params scheduler_sdk tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up scheduler endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params scheduler_sdk return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*scheduler_sdkv2.Options) { - return func(o *scheduler_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*scheduler.Options) { + return func(o *scheduler.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/scheduler/service_endpoints_gen_test.go b/internal/service/scheduler/service_endpoints_gen_test.go index e5fa55efc7f..a6b5ed0cd10 100644 --- a/internal/service/scheduler/service_endpoints_gen_test.go +++ b/internal/service/scheduler/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - scheduler_sdkv2 "github.com/aws/aws-sdk-go-v2/service/scheduler" + "github.com/aws/aws-sdk-go-v2/service/scheduler" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := scheduler_sdkv2.NewDefaultEndpointResolverV2() + r := scheduler.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), scheduler_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), scheduler.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := scheduler_sdkv2.NewDefaultEndpointResolverV2() + r := scheduler.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), scheduler_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), scheduler.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListSchedules(ctx, &scheduler_sdkv2.ListSchedulesInput{}, - func(opts *scheduler_sdkv2.Options) { + _, err := client.ListSchedules(ctx, &scheduler.ListSchedulesInput{}, + func(opts *scheduler.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/scheduler/service_package_gen.go b/internal/service/scheduler/service_package_gen.go index ec194e82f3d..4bfb82c79c5 100644 --- a/internal/service/scheduler/service_package_gen.go +++ b/internal/service/scheduler/service_package_gen.go @@ -5,8 +5,8 @@ package scheduler import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - scheduler_sdkv2 "github.com/aws/aws-sdk-go-v2/service/scheduler" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/scheduler" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -48,11 +48,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*scheduler_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*scheduler.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return scheduler_sdkv2.NewFromConfig(cfg, - scheduler_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return scheduler.NewFromConfig(cfg, + scheduler.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/schemas/service_endpoint_resolver_gen.go b/internal/service/schemas/service_endpoint_resolver_gen.go index 7cc298f1c7d..7168432f8af 100644 --- a/internal/service/schemas/service_endpoint_resolver_gen.go +++ b/internal/service/schemas/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - schemas_sdkv2 "github.com/aws/aws-sdk-go-v2/service/schemas" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/schemas" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ schemas_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ schemas.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver schemas_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver schemas.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: schemas_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: schemas.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params schemas_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params schemas.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params schemas_sdkv2 tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up schemas endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params schemas_sdkv2 return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*schemas_sdkv2.Options) { - return func(o *schemas_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*schemas.Options) { + return func(o *schemas.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/schemas/service_endpoints_gen_test.go b/internal/service/schemas/service_endpoints_gen_test.go index d4c3ef09445..7d72eb7e8df 100644 --- a/internal/service/schemas/service_endpoints_gen_test.go +++ b/internal/service/schemas/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - schemas_sdkv2 "github.com/aws/aws-sdk-go-v2/service/schemas" + "github.com/aws/aws-sdk-go-v2/service/schemas" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := schemas_sdkv2.NewDefaultEndpointResolverV2() + r := schemas.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), schemas_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), schemas.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := schemas_sdkv2.NewDefaultEndpointResolverV2() + r := schemas.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), schemas_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), schemas.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListRegistries(ctx, &schemas_sdkv2.ListRegistriesInput{}, - func(opts *schemas_sdkv2.Options) { + _, err := client.ListRegistries(ctx, &schemas.ListRegistriesInput{}, + func(opts *schemas.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/schemas/service_package.go b/internal/service/schemas/service_package.go index 7b949c08f55..81fba75dac5 100644 --- a/internal/service/schemas/service_package.go +++ b/internal/service/schemas/service_package.go @@ -20,7 +20,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return schemas.NewFromConfig(cfg, - schemas.WithEndpointResolverV2(newEndpointResolverSDKv2()), + schemas.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), func(o *schemas.Options) { o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(func(err error) aws.Ternary { diff --git a/internal/service/secretsmanager/service_endpoint_resolver_gen.go b/internal/service/secretsmanager/service_endpoint_resolver_gen.go index 1bbe5694033..41ea6fde8b0 100644 --- a/internal/service/secretsmanager/service_endpoint_resolver_gen.go +++ b/internal/service/secretsmanager/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - secretsmanager_sdkv2 "github.com/aws/aws-sdk-go-v2/service/secretsmanager" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/secretsmanager" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ secretsmanager_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ secretsmanager.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver secretsmanager_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver secretsmanager.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: secretsmanager_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: secretsmanager.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params secretsmanager_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params secretsmanager.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params secretsmanage tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up secretsmanager endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params secretsmanage return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*secretsmanager_sdkv2.Options) { - return func(o *secretsmanager_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*secretsmanager.Options) { + return func(o *secretsmanager.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/secretsmanager/service_endpoints_gen_test.go b/internal/service/secretsmanager/service_endpoints_gen_test.go index 205f0423bd3..5381fd42941 100644 --- a/internal/service/secretsmanager/service_endpoints_gen_test.go +++ b/internal/service/secretsmanager/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - secretsmanager_sdkv2 "github.com/aws/aws-sdk-go-v2/service/secretsmanager" + "github.com/aws/aws-sdk-go-v2/service/secretsmanager" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := secretsmanager_sdkv2.NewDefaultEndpointResolverV2() + r := secretsmanager.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), secretsmanager_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), secretsmanager.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := secretsmanager_sdkv2.NewDefaultEndpointResolverV2() + r := secretsmanager.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), secretsmanager_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), secretsmanager.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListSecrets(ctx, &secretsmanager_sdkv2.ListSecretsInput{}, - func(opts *secretsmanager_sdkv2.Options) { + _, err := client.ListSecrets(ctx, &secretsmanager.ListSecretsInput{}, + func(opts *secretsmanager.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/secretsmanager/service_package_gen.go b/internal/service/secretsmanager/service_package_gen.go index 0521d637f8c..1527362abd3 100644 --- a/internal/service/secretsmanager/service_package_gen.go +++ b/internal/service/secretsmanager/service_package_gen.go @@ -5,8 +5,8 @@ package secretsmanager import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - secretsmanager_sdkv2 "github.com/aws/aws-sdk-go-v2/service/secretsmanager" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/secretsmanager" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -93,11 +93,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*secretsmanager_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*secretsmanager.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return secretsmanager_sdkv2.NewFromConfig(cfg, - secretsmanager_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return secretsmanager.NewFromConfig(cfg, + secretsmanager.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/securityhub/service_endpoint_resolver_gen.go b/internal/service/securityhub/service_endpoint_resolver_gen.go index 260276a3d68..0df275daeb9 100644 --- a/internal/service/securityhub/service_endpoint_resolver_gen.go +++ b/internal/service/securityhub/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - securityhub_sdkv2 "github.com/aws/aws-sdk-go-v2/service/securityhub" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/securityhub" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ securityhub_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ securityhub.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver securityhub_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver securityhub.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: securityhub_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: securityhub.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params securityhub_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params securityhub.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params securityhub_s tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up securityhub endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params securityhub_s return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*securityhub_sdkv2.Options) { - return func(o *securityhub_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*securityhub.Options) { + return func(o *securityhub.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/securityhub/service_endpoints_gen_test.go b/internal/service/securityhub/service_endpoints_gen_test.go index b81c7bd63af..5048484f751 100644 --- a/internal/service/securityhub/service_endpoints_gen_test.go +++ b/internal/service/securityhub/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - securityhub_sdkv2 "github.com/aws/aws-sdk-go-v2/service/securityhub" + "github.com/aws/aws-sdk-go-v2/service/securityhub" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := securityhub_sdkv2.NewDefaultEndpointResolverV2() + r := securityhub.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), securityhub_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), securityhub.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := securityhub_sdkv2.NewDefaultEndpointResolverV2() + r := securityhub.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), securityhub_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), securityhub.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListAutomationRules(ctx, &securityhub_sdkv2.ListAutomationRulesInput{}, - func(opts *securityhub_sdkv2.Options) { + _, err := client.ListAutomationRules(ctx, &securityhub.ListAutomationRulesInput{}, + func(opts *securityhub.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/securityhub/service_package_gen.go b/internal/service/securityhub/service_package_gen.go index acd4673ff47..34b6c8ba799 100644 --- a/internal/service/securityhub/service_package_gen.go +++ b/internal/service/securityhub/service_package_gen.go @@ -5,8 +5,8 @@ package securityhub import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - securityhub_sdkv2 "github.com/aws/aws-sdk-go-v2/service/securityhub" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/securityhub" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -118,11 +118,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*securityhub_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*securityhub.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return securityhub_sdkv2.NewFromConfig(cfg, - securityhub_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return securityhub.NewFromConfig(cfg, + securityhub.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/securitylake/service_endpoint_resolver_gen.go b/internal/service/securitylake/service_endpoint_resolver_gen.go index 3b3ebacd62b..778dbe06460 100644 --- a/internal/service/securitylake/service_endpoint_resolver_gen.go +++ b/internal/service/securitylake/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - securitylake_sdkv2 "github.com/aws/aws-sdk-go-v2/service/securitylake" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/securitylake" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ securitylake_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ securitylake.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver securitylake_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver securitylake.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: securitylake_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: securitylake.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params securitylake_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params securitylake.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params securitylake_ tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up securitylake endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params securitylake_ return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*securitylake_sdkv2.Options) { - return func(o *securitylake_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*securitylake.Options) { + return func(o *securitylake.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/securitylake/service_endpoints_gen_test.go b/internal/service/securitylake/service_endpoints_gen_test.go index 880f1889987..47e5b8fa904 100644 --- a/internal/service/securitylake/service_endpoints_gen_test.go +++ b/internal/service/securitylake/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - securitylake_sdkv2 "github.com/aws/aws-sdk-go-v2/service/securitylake" + "github.com/aws/aws-sdk-go-v2/service/securitylake" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := securitylake_sdkv2.NewDefaultEndpointResolverV2() + r := securitylake.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), securitylake_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), securitylake.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := securitylake_sdkv2.NewDefaultEndpointResolverV2() + r := securitylake.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), securitylake_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), securitylake.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListDataLakes(ctx, &securitylake_sdkv2.ListDataLakesInput{}, - func(opts *securitylake_sdkv2.Options) { + _, err := client.ListDataLakes(ctx, &securitylake.ListDataLakesInput{}, + func(opts *securitylake.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/securitylake/service_package_gen.go b/internal/service/securitylake/service_package_gen.go index 1e3b5cb5d1f..7fd10deca17 100644 --- a/internal/service/securitylake/service_package_gen.go +++ b/internal/service/securitylake/service_package_gen.go @@ -5,8 +5,8 @@ package securitylake import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - securitylake_sdkv2 "github.com/aws/aws-sdk-go-v2/service/securitylake" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/securitylake" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -62,11 +62,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*securitylake_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*securitylake.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return securitylake_sdkv2.NewFromConfig(cfg, - securitylake_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return securitylake.NewFromConfig(cfg, + securitylake.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/serverlessrepo/service_endpoint_resolver_gen.go b/internal/service/serverlessrepo/service_endpoint_resolver_gen.go index fb2d0158e0d..1425a6a4ad4 100644 --- a/internal/service/serverlessrepo/service_endpoint_resolver_gen.go +++ b/internal/service/serverlessrepo/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - serverlessapplicationrepository_sdkv2 "github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ serverlessapplicationrepository_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ serverlessapplicationrepository.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver serverlessapplicationrepository_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver serverlessapplicationrepository.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: serverlessapplicationrepository_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: serverlessapplicationrepository.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params serverlessapplicationrepository_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params serverlessapplicationrepository.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params serverlessapp tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up serverlessapplicationrepository endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params serverlessapp return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*serverlessapplicationrepository_sdkv2.Options) { - return func(o *serverlessapplicationrepository_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*serverlessapplicationrepository.Options) { + return func(o *serverlessapplicationrepository.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/serverlessrepo/service_endpoints_gen_test.go b/internal/service/serverlessrepo/service_endpoints_gen_test.go index b7837043ae7..0221d9496a6 100644 --- a/internal/service/serverlessrepo/service_endpoints_gen_test.go +++ b/internal/service/serverlessrepo/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - serverlessapplicationrepository_sdkv2 "github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository" + "github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -355,10 +355,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := serverlessapplicationrepository_sdkv2.NewDefaultEndpointResolverV2() + r := serverlessapplicationrepository.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), serverlessapplicationrepository_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), serverlessapplicationrepository.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -372,11 +372,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := serverlessapplicationrepository_sdkv2.NewDefaultEndpointResolverV2() + r := serverlessapplicationrepository.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), serverlessapplicationrepository_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), serverlessapplicationrepository.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -396,8 +396,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListApplications(ctx, &serverlessapplicationrepository_sdkv2.ListApplicationsInput{}, - func(opts *serverlessapplicationrepository_sdkv2.Options) { + _, err := client.ListApplications(ctx, &serverlessapplicationrepository.ListApplicationsInput{}, + func(opts *serverlessapplicationrepository.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/serverlessrepo/service_package_gen.go b/internal/service/serverlessrepo/service_package_gen.go index 9745aa007e1..801aef886f2 100644 --- a/internal/service/serverlessrepo/service_package_gen.go +++ b/internal/service/serverlessrepo/service_package_gen.go @@ -5,8 +5,8 @@ package serverlessrepo import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - serverlessapplicationrepository_sdkv2 "github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -47,11 +47,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*serverlessapplicationrepository_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*serverlessapplicationrepository.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return serverlessapplicationrepository_sdkv2.NewFromConfig(cfg, - serverlessapplicationrepository_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return serverlessapplicationrepository.NewFromConfig(cfg, + serverlessapplicationrepository.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/servicecatalog/service_endpoint_resolver_gen.go b/internal/service/servicecatalog/service_endpoint_resolver_gen.go index b6009030edf..2bb71adfe74 100644 --- a/internal/service/servicecatalog/service_endpoint_resolver_gen.go +++ b/internal/service/servicecatalog/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - servicecatalog_sdkv2 "github.com/aws/aws-sdk-go-v2/service/servicecatalog" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/servicecatalog" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ servicecatalog_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ servicecatalog.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver servicecatalog_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver servicecatalog.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: servicecatalog_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: servicecatalog.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params servicecatalog_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params servicecatalog.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params servicecatalo tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up servicecatalog endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params servicecatalo return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*servicecatalog_sdkv2.Options) { - return func(o *servicecatalog_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*servicecatalog.Options) { + return func(o *servicecatalog.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/servicecatalog/service_endpoints_gen_test.go b/internal/service/servicecatalog/service_endpoints_gen_test.go index 28217b7c2b1..bf5ffc3d0fa 100644 --- a/internal/service/servicecatalog/service_endpoints_gen_test.go +++ b/internal/service/servicecatalog/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - servicecatalog_sdkv2 "github.com/aws/aws-sdk-go-v2/service/servicecatalog" + "github.com/aws/aws-sdk-go-v2/service/servicecatalog" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := servicecatalog_sdkv2.NewDefaultEndpointResolverV2() + r := servicecatalog.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), servicecatalog_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), servicecatalog.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := servicecatalog_sdkv2.NewDefaultEndpointResolverV2() + r := servicecatalog.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), servicecatalog_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), servicecatalog.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListPortfolios(ctx, &servicecatalog_sdkv2.ListPortfoliosInput{}, - func(opts *servicecatalog_sdkv2.Options) { + _, err := client.ListPortfolios(ctx, &servicecatalog.ListPortfoliosInput{}, + func(opts *servicecatalog.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/servicecatalog/service_package_gen.go b/internal/service/servicecatalog/service_package_gen.go index 6eb2fe3f0cf..e887a5ada39 100644 --- a/internal/service/servicecatalog/service_package_gen.go +++ b/internal/service/servicecatalog/service_package_gen.go @@ -5,8 +5,8 @@ package servicecatalog import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - servicecatalog_sdkv2 "github.com/aws/aws-sdk-go-v2/service/servicecatalog" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/servicecatalog" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -137,11 +137,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*servicecatalog_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*servicecatalog.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return servicecatalog_sdkv2.NewFromConfig(cfg, - servicecatalog_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return servicecatalog.NewFromConfig(cfg, + servicecatalog.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/servicecatalogappregistry/service_endpoint_resolver_gen.go b/internal/service/servicecatalogappregistry/service_endpoint_resolver_gen.go index f1bb6b26621..f83021f4124 100644 --- a/internal/service/servicecatalogappregistry/service_endpoint_resolver_gen.go +++ b/internal/service/servicecatalogappregistry/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - servicecatalogappregistry_sdkv2 "github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ servicecatalogappregistry_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ servicecatalogappregistry.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver servicecatalogappregistry_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver servicecatalogappregistry.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: servicecatalogappregistry_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: servicecatalogappregistry.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params servicecatalogappregistry_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params servicecatalogappregistry.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params servicecatalo tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up servicecatalogappregistry endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params servicecatalo return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*servicecatalogappregistry_sdkv2.Options) { - return func(o *servicecatalogappregistry_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*servicecatalogappregistry.Options) { + return func(o *servicecatalogappregistry.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/servicecatalogappregistry/service_endpoints_gen_test.go b/internal/service/servicecatalogappregistry/service_endpoints_gen_test.go index 54e0855d0b1..fcf3b29af89 100644 --- a/internal/service/servicecatalogappregistry/service_endpoints_gen_test.go +++ b/internal/service/servicecatalogappregistry/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - servicecatalogappregistry_sdkv2 "github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry" + "github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -296,10 +296,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := servicecatalogappregistry_sdkv2.NewDefaultEndpointResolverV2() + r := servicecatalogappregistry.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), servicecatalogappregistry_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), servicecatalogappregistry.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -313,11 +313,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := servicecatalogappregistry_sdkv2.NewDefaultEndpointResolverV2() + r := servicecatalogappregistry.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), servicecatalogappregistry_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), servicecatalogappregistry.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -337,8 +337,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListApplications(ctx, &servicecatalogappregistry_sdkv2.ListApplicationsInput{}, - func(opts *servicecatalogappregistry_sdkv2.Options) { + _, err := client.ListApplications(ctx, &servicecatalogappregistry.ListApplicationsInput{}, + func(opts *servicecatalogappregistry.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/servicecatalogappregistry/service_package_gen.go b/internal/service/servicecatalogappregistry/service_package_gen.go index affcfd818e4..e51b33828b6 100644 --- a/internal/service/servicecatalogappregistry/service_package_gen.go +++ b/internal/service/servicecatalogappregistry/service_package_gen.go @@ -5,8 +5,8 @@ package servicecatalogappregistry import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - servicecatalogappregistry_sdkv2 "github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -45,11 +45,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*servicecatalogappregistry_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*servicecatalogappregistry.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return servicecatalogappregistry_sdkv2.NewFromConfig(cfg, - servicecatalogappregistry_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return servicecatalogappregistry.NewFromConfig(cfg, + servicecatalogappregistry.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/servicediscovery/service_endpoint_resolver_gen.go b/internal/service/servicediscovery/service_endpoint_resolver_gen.go index 55fb327fef9..fd594064d49 100644 --- a/internal/service/servicediscovery/service_endpoint_resolver_gen.go +++ b/internal/service/servicediscovery/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - servicediscovery_sdkv2 "github.com/aws/aws-sdk-go-v2/service/servicediscovery" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/servicediscovery" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ servicediscovery_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ servicediscovery.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver servicediscovery_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver servicediscovery.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: servicediscovery_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: servicediscovery.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params servicediscovery_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params servicediscovery.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params servicediscov tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up servicediscovery endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params servicediscov return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*servicediscovery_sdkv2.Options) { - return func(o *servicediscovery_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*servicediscovery.Options) { + return func(o *servicediscovery.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/servicediscovery/service_endpoints_gen_test.go b/internal/service/servicediscovery/service_endpoints_gen_test.go index be14ff4c01e..286d5b863a1 100644 --- a/internal/service/servicediscovery/service_endpoints_gen_test.go +++ b/internal/service/servicediscovery/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - servicediscovery_sdkv2 "github.com/aws/aws-sdk-go-v2/service/servicediscovery" + "github.com/aws/aws-sdk-go-v2/service/servicediscovery" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := servicediscovery_sdkv2.NewDefaultEndpointResolverV2() + r := servicediscovery.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), servicediscovery_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), servicediscovery.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := servicediscovery_sdkv2.NewDefaultEndpointResolverV2() + r := servicediscovery.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), servicediscovery_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), servicediscovery.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListNamespaces(ctx, &servicediscovery_sdkv2.ListNamespacesInput{}, - func(opts *servicediscovery_sdkv2.Options) { + _, err := client.ListNamespaces(ctx, &servicediscovery.ListNamespacesInput{}, + func(opts *servicediscovery.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/servicediscovery/service_package_gen.go b/internal/service/servicediscovery/service_package_gen.go index a6a8c608190..15fdc896cf3 100644 --- a/internal/service/servicediscovery/service_package_gen.go +++ b/internal/service/servicediscovery/service_package_gen.go @@ -5,8 +5,8 @@ package servicediscovery import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - servicediscovery_sdkv2 "github.com/aws/aws-sdk-go-v2/service/servicediscovery" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/servicediscovery" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -89,11 +89,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*servicediscovery_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*servicediscovery.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return servicediscovery_sdkv2.NewFromConfig(cfg, - servicediscovery_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return servicediscovery.NewFromConfig(cfg, + servicediscovery.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/servicequotas/service_endpoint_resolver_gen.go b/internal/service/servicequotas/service_endpoint_resolver_gen.go index f461cb7eb56..c8782ad4935 100644 --- a/internal/service/servicequotas/service_endpoint_resolver_gen.go +++ b/internal/service/servicequotas/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - servicequotas_sdkv2 "github.com/aws/aws-sdk-go-v2/service/servicequotas" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/servicequotas" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ servicequotas_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ servicequotas.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver servicequotas_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver servicequotas.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: servicequotas_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: servicequotas.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params servicequotas_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params servicequotas.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params servicequotas tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up servicequotas endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params servicequotas return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*servicequotas_sdkv2.Options) { - return func(o *servicequotas_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*servicequotas.Options) { + return func(o *servicequotas.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/servicequotas/service_endpoints_gen_test.go b/internal/service/servicequotas/service_endpoints_gen_test.go index 230b908f04a..e7ce9f9441c 100644 --- a/internal/service/servicequotas/service_endpoints_gen_test.go +++ b/internal/service/servicequotas/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - servicequotas_sdkv2 "github.com/aws/aws-sdk-go-v2/service/servicequotas" + "github.com/aws/aws-sdk-go-v2/service/servicequotas" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := servicequotas_sdkv2.NewDefaultEndpointResolverV2() + r := servicequotas.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), servicequotas_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), servicequotas.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := servicequotas_sdkv2.NewDefaultEndpointResolverV2() + r := servicequotas.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), servicequotas_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), servicequotas.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListServices(ctx, &servicequotas_sdkv2.ListServicesInput{}, - func(opts *servicequotas_sdkv2.Options) { + _, err := client.ListServices(ctx, &servicequotas.ListServicesInput{}, + func(opts *servicequotas.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/servicequotas/service_package_gen.go b/internal/service/servicequotas/service_package_gen.go index 7f1ccd410fb..21176eaab84 100644 --- a/internal/service/servicequotas/service_package_gen.go +++ b/internal/service/servicequotas/service_package_gen.go @@ -5,8 +5,8 @@ package servicequotas import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - servicequotas_sdkv2 "github.com/aws/aws-sdk-go-v2/service/servicequotas" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/servicequotas" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -63,11 +63,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*servicequotas_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*servicequotas.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return servicequotas_sdkv2.NewFromConfig(cfg, - servicequotas_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return servicequotas.NewFromConfig(cfg, + servicequotas.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/ses/service_endpoint_resolver_gen.go b/internal/service/ses/service_endpoint_resolver_gen.go index 26208041d98..18d0abf603b 100644 --- a/internal/service/ses/service_endpoint_resolver_gen.go +++ b/internal/service/ses/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - ses_sdkv2 "github.com/aws/aws-sdk-go-v2/service/ses" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/ses" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ ses_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ ses.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver ses_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver ses.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: ses_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: ses.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params ses_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params ses.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params ses_sdkv2.End tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up ses endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params ses_sdkv2.End return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*ses_sdkv2.Options) { - return func(o *ses_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*ses.Options) { + return func(o *ses.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/ses/service_endpoints_gen_test.go b/internal/service/ses/service_endpoints_gen_test.go index 07bf3c623d9..0e5de43ae24 100644 --- a/internal/service/ses/service_endpoints_gen_test.go +++ b/internal/service/ses/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - ses_sdkv2 "github.com/aws/aws-sdk-go-v2/service/ses" + "github.com/aws/aws-sdk-go-v2/service/ses" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := ses_sdkv2.NewDefaultEndpointResolverV2() + r := ses.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), ses_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), ses.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := ses_sdkv2.NewDefaultEndpointResolverV2() + r := ses.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), ses_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), ses.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListIdentities(ctx, &ses_sdkv2.ListIdentitiesInput{}, - func(opts *ses_sdkv2.Options) { + _, err := client.ListIdentities(ctx, &ses.ListIdentitiesInput{}, + func(opts *ses.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/ses/service_package_gen.go b/internal/service/ses/service_package_gen.go index 7f08851ebaf..6f94aa11f3e 100644 --- a/internal/service/ses/service_package_gen.go +++ b/internal/service/ses/service_package_gen.go @@ -5,8 +5,8 @@ package ses import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - ses_sdkv2 "github.com/aws/aws-sdk-go-v2/service/ses" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/ses" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -122,11 +122,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*ses_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*ses.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return ses_sdkv2.NewFromConfig(cfg, - ses_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return ses.NewFromConfig(cfg, + ses.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/sesv2/service_endpoint_resolver_gen.go b/internal/service/sesv2/service_endpoint_resolver_gen.go index 9ca7f81bec2..7bb572de143 100644 --- a/internal/service/sesv2/service_endpoint_resolver_gen.go +++ b/internal/service/sesv2/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - sesv2_sdkv2 "github.com/aws/aws-sdk-go-v2/service/sesv2" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/sesv2" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ sesv2_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ sesv2.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver sesv2_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver sesv2.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: sesv2_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: sesv2.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params sesv2_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params sesv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params sesv2_sdkv2.E tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up sesv2 endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params sesv2_sdkv2.E return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*sesv2_sdkv2.Options) { - return func(o *sesv2_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*sesv2.Options) { + return func(o *sesv2.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/sesv2/service_endpoints_gen_test.go b/internal/service/sesv2/service_endpoints_gen_test.go index c485b414702..32c34eadf7d 100644 --- a/internal/service/sesv2/service_endpoints_gen_test.go +++ b/internal/service/sesv2/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - sesv2_sdkv2 "github.com/aws/aws-sdk-go-v2/service/sesv2" + "github.com/aws/aws-sdk-go-v2/service/sesv2" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := sesv2_sdkv2.NewDefaultEndpointResolverV2() + r := sesv2.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), sesv2_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), sesv2.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := sesv2_sdkv2.NewDefaultEndpointResolverV2() + r := sesv2.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), sesv2_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), sesv2.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListContactLists(ctx, &sesv2_sdkv2.ListContactListsInput{}, - func(opts *sesv2_sdkv2.Options) { + _, err := client.ListContactLists(ctx, &sesv2.ListContactListsInput{}, + func(opts *sesv2.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/sesv2/service_package_gen.go b/internal/service/sesv2/service_package_gen.go index 00afc4bbc2b..055a446a204 100644 --- a/internal/service/sesv2/service_package_gen.go +++ b/internal/service/sesv2/service_package_gen.go @@ -5,8 +5,8 @@ package sesv2 import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - sesv2_sdkv2 "github.com/aws/aws-sdk-go-v2/service/sesv2" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/sesv2" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -133,11 +133,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*sesv2_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*sesv2.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return sesv2_sdkv2.NewFromConfig(cfg, - sesv2_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return sesv2.NewFromConfig(cfg, + sesv2.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/sfn/service_endpoint_resolver_gen.go b/internal/service/sfn/service_endpoint_resolver_gen.go index 2abda1cfad8..8a46a815fab 100644 --- a/internal/service/sfn/service_endpoint_resolver_gen.go +++ b/internal/service/sfn/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - sfn_sdkv2 "github.com/aws/aws-sdk-go-v2/service/sfn" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/sfn" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ sfn_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ sfn.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver sfn_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver sfn.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: sfn_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: sfn.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params sfn_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params sfn.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params sfn_sdkv2.End tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up sfn endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params sfn_sdkv2.End return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*sfn_sdkv2.Options) { - return func(o *sfn_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*sfn.Options) { + return func(o *sfn.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/sfn/service_endpoints_gen_test.go b/internal/service/sfn/service_endpoints_gen_test.go index 7b3cb4c7bc6..b597f73a0f4 100644 --- a/internal/service/sfn/service_endpoints_gen_test.go +++ b/internal/service/sfn/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - sfn_sdkv2 "github.com/aws/aws-sdk-go-v2/service/sfn" + "github.com/aws/aws-sdk-go-v2/service/sfn" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -296,10 +296,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := sfn_sdkv2.NewDefaultEndpointResolverV2() + r := sfn.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), sfn_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), sfn.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -313,11 +313,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := sfn_sdkv2.NewDefaultEndpointResolverV2() + r := sfn.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), sfn_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), sfn.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -337,8 +337,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListActivities(ctx, &sfn_sdkv2.ListActivitiesInput{}, - func(opts *sfn_sdkv2.Options) { + _, err := client.ListActivities(ctx, &sfn.ListActivitiesInput{}, + func(opts *sfn.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/sfn/service_package_gen.go b/internal/service/sfn/service_package_gen.go index 1234eb55fc1..c213f0bfd59 100644 --- a/internal/service/sfn/service_package_gen.go +++ b/internal/service/sfn/service_package_gen.go @@ -5,8 +5,8 @@ package sfn import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - sfn_sdkv2 "github.com/aws/aws-sdk-go-v2/service/sfn" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/sfn" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -78,11 +78,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*sfn_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*sfn.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return sfn_sdkv2.NewFromConfig(cfg, - sfn_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return sfn.NewFromConfig(cfg, + sfn.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/shield/service_endpoint_resolver_gen.go b/internal/service/shield/service_endpoint_resolver_gen.go index c5b364751a9..23d84b65d32 100644 --- a/internal/service/shield/service_endpoint_resolver_gen.go +++ b/internal/service/shield/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - shield_sdkv2 "github.com/aws/aws-sdk-go-v2/service/shield" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/shield" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ shield_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ shield.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver shield_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver shield.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: shield_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: shield.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params shield_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params shield.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params shield_sdkv2. tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up shield endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params shield_sdkv2. return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*shield_sdkv2.Options) { - return func(o *shield_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*shield.Options) { + return func(o *shield.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/shield/service_endpoints_gen_test.go b/internal/service/shield/service_endpoints_gen_test.go index d9d54034547..e253983b2b3 100644 --- a/internal/service/shield/service_endpoints_gen_test.go +++ b/internal/service/shield/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - shield_sdkv2 "github.com/aws/aws-sdk-go-v2/service/shield" + "github.com/aws/aws-sdk-go-v2/service/shield" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := shield_sdkv2.NewDefaultEndpointResolverV2() + r := shield.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), shield_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), shield.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := shield_sdkv2.NewDefaultEndpointResolverV2() + r := shield.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), shield_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), shield.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListProtectionGroups(ctx, &shield_sdkv2.ListProtectionGroupsInput{}, - func(opts *shield_sdkv2.Options) { + _, err := client.ListProtectionGroups(ctx, &shield.ListProtectionGroupsInput{}, + func(opts *shield.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/shield/service_package.go b/internal/service/shield/service_package.go index 675d3e9e449..b6a97bb68e8 100644 --- a/internal/service/shield/service_package.go +++ b/internal/service/shield/service_package.go @@ -17,7 +17,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return shield.NewFromConfig(cfg, - shield.WithEndpointResolverV2(newEndpointResolverSDKv2()), + shield.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), func(o *shield.Options) { // Force "global" services to correct Regions. diff --git a/internal/service/signer/service_endpoint_resolver_gen.go b/internal/service/signer/service_endpoint_resolver_gen.go index 298c6e9901e..4456d20a21b 100644 --- a/internal/service/signer/service_endpoint_resolver_gen.go +++ b/internal/service/signer/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - signer_sdkv2 "github.com/aws/aws-sdk-go-v2/service/signer" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/signer" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ signer_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ signer.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver signer_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver signer.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: signer_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: signer.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params signer_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params signer.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params signer_sdkv2. tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up signer endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params signer_sdkv2. return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*signer_sdkv2.Options) { - return func(o *signer_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*signer.Options) { + return func(o *signer.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/signer/service_endpoints_gen_test.go b/internal/service/signer/service_endpoints_gen_test.go index 60d0bd85784..1417f066054 100644 --- a/internal/service/signer/service_endpoints_gen_test.go +++ b/internal/service/signer/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - signer_sdkv2 "github.com/aws/aws-sdk-go-v2/service/signer" + "github.com/aws/aws-sdk-go-v2/service/signer" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := signer_sdkv2.NewDefaultEndpointResolverV2() + r := signer.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), signer_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), signer.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := signer_sdkv2.NewDefaultEndpointResolverV2() + r := signer.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), signer_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), signer.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListSigningJobs(ctx, &signer_sdkv2.ListSigningJobsInput{}, - func(opts *signer_sdkv2.Options) { + _, err := client.ListSigningJobs(ctx, &signer.ListSigningJobsInput{}, + func(opts *signer.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/signer/service_package_gen.go b/internal/service/signer/service_package_gen.go index b5629cb5327..1cd88d5fdfe 100644 --- a/internal/service/signer/service_package_gen.go +++ b/internal/service/signer/service_package_gen.go @@ -5,8 +5,8 @@ package signer import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - signer_sdkv2 "github.com/aws/aws-sdk-go-v2/service/signer" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/signer" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -61,11 +61,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*signer_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*signer.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return signer_sdkv2.NewFromConfig(cfg, - signer_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return signer.NewFromConfig(cfg, + signer.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/simpledb/conn.go b/internal/service/simpledb/conn.go new file mode 100644 index 00000000000..42643163fb3 --- /dev/null +++ b/internal/service/simpledb/conn.go @@ -0,0 +1,175 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 + +package simpledb + +import ( + "context" + "fmt" + "net" + "net/url" + "os" + + "github.com/aws/aws-sdk-go-v2/config" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/endpoints" + "github.com/aws/aws-sdk-go/service/simpledb" + "github.com/hashicorp/terraform-plugin-log/tflog" + "github.com/hashicorp/terraform-provider-aws/internal/conns" + "github.com/hashicorp/terraform-provider-aws/internal/errs" + "github.com/hashicorp/terraform-provider-aws/names" +) + +var ( + conn *simpledb.SimpleDB +) + +// Adapted from +// internal/conns/awsclient_gen.go: func (c *AWSClient) SimpleDBConn(ctx context.Context) *simpledb_sdkv1.SimpleDB +// internal/conns/awsclient.go: func conn[T any](ctx context.Context, c *AWSClient, servicePackageName string, extra map[string]any) (T, error) +// internal/service/simpledb/service_package_gen.go: func (p *servicePackage) NewConn(ctx context.Context, config map[string]any) (*simpledb_sdkv1.SimpleDB, error) + +func simpleDBConn(ctx context.Context, c *conns.AWSClient) *simpledb.SimpleDB { // nosemgrep:ci.simpledb-in-func-name + const servicePackageName = names.SimpleDB + ctx = tflog.SetField(ctx, "tf_aws.service_package", servicePackageName) + + const mutexKey = "simpledb-conn" + conns.GlobalMutexKV.Lock(mutexKey) + defer conns.GlobalMutexKV.Unlock(mutexKey) + + if conn != nil { + return conn + } + + cfg := aws.Config{} + + if endpoint := resolveEndpoint(ctx, c); endpoint != "" { + tflog.Debug(ctx, "setting endpoint", map[string]any{ + "tf_aws.endpoint": endpoint, + }) + cfg.Endpoint = aws.String(endpoint) + } else { + cfg.EndpointResolver = newEndpointResolverSDKv1(ctx) + } + + conn = simpledb.New(c.AwsSession(ctx).Copy(&cfg)) + + return conn +} + +// Adapted from +// internal/conns/awsclient_resolveendpoint_gen.go: func (c *AWSClient) ResolveEndpoint(ctx context.Context, servicePackageName string) string + +func resolveEndpoint(ctx context.Context, c *conns.AWSClient) string { + endpoint := c.Endpoints(ctx)[names.SimpleDB] + if endpoint != "" { + return endpoint + } + + //endpoint = aws.StringValue(c.AwsConfig(ctx).BaseEndpoint) + svc := os.Getenv("AWS_ENDPOINT_URL_SIMPLEDB") + if svc != "" { + return svc + } + + if base := os.Getenv("AWS_ENDPOINT_URL"); base != "" { + return base + } + + endpoint, found, err := resolveServiceBaseEndpoint(ctx, "SimpleDB", c.AwsConfig(ctx).ConfigSources) + if found && err == nil { + return endpoint + } + + return endpoint +} + +// Copied from internal/conns/awsclient.go. + +// serviceBaseEndpointProvider is needed to search for all providers +// that provide a configured service endpoint +type serviceBaseEndpointProvider interface { + GetServiceBaseEndpoint(ctx context.Context, sdkID string) (string, bool, error) +} + +// resolveServiceBaseEndpoint is used to retrieve service endpoints from configured sources +// while allowing for configured endpoints to be disabled +func resolveServiceBaseEndpoint(ctx context.Context, sdkID string, configs []any) (value string, found bool, err error) { + if val, found, _ := config.GetIgnoreConfiguredEndpoints(ctx, configs); found && val { + return "", false, nil + } + + for _, cs := range configs { + if p, ok := cs.(serviceBaseEndpointProvider); ok { + value, found, err = p.GetServiceBaseEndpoint(ctx, sdkID) + if err != nil || found { + break + } + } + } + return +} + +// Copied from internal/service/simpledb/service_endpoint_resolver_gen.go. + +var _ endpoints.Resolver = resolverSDKv1{} + +type resolverSDKv1 struct { + ctx context.Context //nolint:containedctx // Was in generated code +} + +func newEndpointResolverSDKv1(ctx context.Context) resolverSDKv1 { + return resolverSDKv1{ + ctx: ctx, + } +} + +func (r resolverSDKv1) EndpointFor(service, region string, opts ...func(*endpoints.Options)) (endpoints.ResolvedEndpoint, error) { + ctx := r.ctx + + var opt endpoints.Options + opt.Set(opts...) + + useFIPS := opt.UseFIPSEndpoint == endpoints.FIPSEndpointStateEnabled + + defaultResolver := endpoints.DefaultResolver() + + if useFIPS { + ctx = tflog.SetField(ctx, "tf_aws.use_fips", useFIPS) + + endpoint, err := defaultResolver.EndpointFor(service, region, opts...) + if err != nil { + return endpoint, err + } + + tflog.Debug(ctx, "endpoint resolved", map[string]any{ + "tf_aws.endpoint": endpoint.URL, + }) + + var endpointURL *url.URL + endpointURL, err = url.Parse(endpoint.URL) + if err != nil { + return endpoint, err + } + + hostname := endpointURL.Hostname() + _, err = net.LookupHost(hostname) + if err != nil { + if dnsErr, ok := errs.As[*net.DNSError](err); ok && dnsErr.IsNotFound { + tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ + "tf_aws.hostname": hostname, + }) + opts = append(opts, func(o *endpoints.Options) { + o.UseFIPSEndpoint = endpoints.FIPSEndpointStateDisabled + }) + } else { + err := fmt.Errorf("looking up simpledb endpoint %q: %s", hostname, err) + return endpoints.ResolvedEndpoint{}, err + } + } else { + return endpoint, err + } + } + + return defaultResolver.EndpointFor(service, region, opts...) +} diff --git a/internal/service/simpledb/domain.go b/internal/service/simpledb/domain.go index 9888c4eef61..c97a4a1f4c1 100644 --- a/internal/service/simpledb/domain.go +++ b/internal/service/simpledb/domain.go @@ -63,7 +63,7 @@ func (r *domainResource) Create(ctx context.Context, request resource.CreateRequ return } - conn := r.Meta().SimpleDBConn(ctx) + conn := simpleDBConn(ctx, r.Meta()) name := data.Name.ValueString() input := &simpledb.CreateDomainInput{ @@ -90,7 +90,7 @@ func (r *domainResource) Read(ctx context.Context, request resource.ReadRequest, return } - conn := r.Meta().SimpleDBConn(ctx) + conn := simpleDBConn(ctx, r.Meta()) _, err := findDomainByName(ctx, conn, data.ID.ValueString()) @@ -119,7 +119,7 @@ func (r *domainResource) Delete(ctx context.Context, request resource.DeleteRequ return } - conn := r.Meta().SimpleDBConn(ctx) + conn := simpleDBConn(ctx, r.Meta()) tflog.Debug(ctx, "deleting SimpleDB Domain", map[string]interface{}{ names.AttrID: data.ID.ValueString(), diff --git a/internal/service/simpledb/domain_test.go b/internal/service/simpledb/domain_test.go index fc15f8d7c12..6d556c0a284 100644 --- a/internal/service/simpledb/domain_test.go +++ b/internal/service/simpledb/domain_test.go @@ -103,7 +103,7 @@ func TestAccSimpleDBDomain_MigrateFromPluginSDK(t *testing.T) { func testAccCheckDomainDestroy(ctx context.Context) resource.TestCheckFunc { return func(s *terraform.State) error { - conn := acctest.Provider.Meta().(*conns.AWSClient).SimpleDBConn(ctx) + conn := tfsimpledb.SimpleDBConn(ctx, acctest.Provider.Meta().(*conns.AWSClient)) for _, rs := range s.RootModule().Resources { if rs.Type != "aws_simpledb_domain" { @@ -138,7 +138,7 @@ func testAccCheckDomainExists(ctx context.Context, n string) resource.TestCheckF return fmt.Errorf("No SimpleDB Domain ID is set") } - conn := acctest.Provider.Meta().(*conns.AWSClient).SimpleDBConn(ctx) + conn := tfsimpledb.SimpleDBConn(ctx, acctest.Provider.Meta().(*conns.AWSClient)) _, err := tfsimpledb.FindDomainByName(ctx, conn, rs.Primary.ID) diff --git a/internal/service/simpledb/exports_test.go b/internal/service/simpledb/exports_test.go index 8f32eaa4ec8..b99d616fbfa 100644 --- a/internal/service/simpledb/exports_test.go +++ b/internal/service/simpledb/exports_test.go @@ -8,4 +8,5 @@ var ( ResourceDomain = newDomainResource FindDomainByName = findDomainByName + SimpleDBConn = simpleDBConn // nosemgrep:ci.simpledb-in-var-name ) diff --git a/internal/service/simpledb/service_endpoint_resolver_gen.go b/internal/service/simpledb/service_endpoint_resolver_gen.go deleted file mode 100644 index a046e07c6c9..00000000000 --- a/internal/service/simpledb/service_endpoint_resolver_gen.go +++ /dev/null @@ -1,76 +0,0 @@ -// Code generated by internal/generate/servicepackage/main.go; DO NOT EDIT. - -package simpledb - -import ( - "context" - "fmt" - "net" - "net/url" - - endpoints_sdkv1 "github.com/aws/aws-sdk-go/aws/endpoints" - "github.com/hashicorp/terraform-plugin-log/tflog" - "github.com/hashicorp/terraform-provider-aws/internal/errs" -) - -var _ endpoints_sdkv1.Resolver = resolverSDKv1{} - -type resolverSDKv1 struct { - ctx context.Context -} - -func newEndpointResolverSDKv1(ctx context.Context) resolverSDKv1 { - return resolverSDKv1{ - ctx: ctx, - } -} - -func (r resolverSDKv1) EndpointFor(service, region string, opts ...func(*endpoints_sdkv1.Options)) (endpoint endpoints_sdkv1.ResolvedEndpoint, err error) { - ctx := r.ctx - - var opt endpoints_sdkv1.Options - opt.Set(opts...) - - useFIPS := opt.UseFIPSEndpoint == endpoints_sdkv1.FIPSEndpointStateEnabled - - defaultResolver := endpoints_sdkv1.DefaultResolver() - - if useFIPS { - ctx = tflog.SetField(ctx, "tf_aws.use_fips", useFIPS) - - endpoint, err = defaultResolver.EndpointFor(service, region, opts...) - if err != nil { - return endpoint, err - } - - tflog.Debug(ctx, "endpoint resolved", map[string]any{ - "tf_aws.endpoint": endpoint.URL, - }) - - var endpointURL *url.URL - endpointURL, err = url.Parse(endpoint.URL) - if err != nil { - return endpoint, err - } - - hostname := endpointURL.Hostname() - _, err = net.LookupHost(hostname) - if err != nil { - if dnsErr, ok := errs.As[*net.DNSError](err); ok && dnsErr.IsNotFound { - tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ - "tf_aws.hostname": hostname, - }) - opts = append(opts, func(o *endpoints_sdkv1.Options) { - o.UseFIPSEndpoint = endpoints_sdkv1.FIPSEndpointStateDisabled - }) - } else { - err = fmt.Errorf("looking up accessanalyzer endpoint %q: %s", hostname, err) - return - } - } else { - return endpoint, err - } - } - - return defaultResolver.EndpointFor(service, region, opts...) -} diff --git a/internal/service/simpledb/service_endpoints_gen_test.go b/internal/service/simpledb/service_endpoints_gen_test.go deleted file mode 100644 index 8b4b63303e3..00000000000 --- a/internal/service/simpledb/service_endpoints_gen_test.go +++ /dev/null @@ -1,592 +0,0 @@ -// Code generated by internal/generate/serviceendpointtests/main.go; DO NOT EDIT. - -package simpledb_test - -import ( - "context" - "fmt" - "maps" - "net" - "net/url" - "os" - "path/filepath" - "strings" - "testing" - - aws_sdkv1 "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/aws/endpoints" - simpledb_sdkv1 "github.com/aws/aws-sdk-go/service/simpledb" - "github.com/google/go-cmp/cmp" - "github.com/hashicorp/aws-sdk-go-base/v2/servicemocks" - "github.com/hashicorp/go-cty/cty" - "github.com/hashicorp/terraform-plugin-sdk/v2/diag" - terraformsdk "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/hashicorp/terraform-provider-aws/internal/conns" - "github.com/hashicorp/terraform-provider-aws/internal/errs" - "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" - "github.com/hashicorp/terraform-provider-aws/internal/provider" - "github.com/hashicorp/terraform-provider-aws/names" -) - -type endpointTestCase struct { - with []setupFunc - expected caseExpectations -} - -type caseSetup struct { - config map[string]any - configFile configFile - environmentVariables map[string]string -} - -type configFile struct { - baseUrl string - serviceUrl string -} - -type caseExpectations struct { - diags diag.Diagnostics - endpoint string - region string -} - -type apiCallParams struct { - endpoint string - region string -} - -type setupFunc func(setup *caseSetup) - -type callFunc func(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCallParams - -const ( - packageNameConfigEndpoint = "https://packagename-config.endpoint.test/" - awsServiceEnvvarEndpoint = "https://service-envvar.endpoint.test/" - baseEnvvarEndpoint = "https://base-envvar.endpoint.test/" - serviceConfigFileEndpoint = "https://service-configfile.endpoint.test/" - baseConfigFileEndpoint = "https://base-configfile.endpoint.test/" - - aliasName0ConfigEndpoint = "https://aliasname0-config.endpoint.test/" -) - -const ( - packageName = "simpledb" - awsEnvVar = "AWS_ENDPOINT_URL_SIMPLEDB" - baseEnvVar = "AWS_ENDPOINT_URL" - configParam = "simpledb" - - aliasName0 = "sdb" -) - -const ( - expectedCallRegion = "us-west-2" //lintignore:AWSAT003 -) - -func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.Setenv - const providerRegion = "us-west-2" //lintignore:AWSAT003 - const expectedEndpointRegion = providerRegion - - testcases := map[string]endpointTestCase{ - "no config": { - with: []setupFunc{withNoConfig}, - expected: expectDefaultEndpoint(t, expectedEndpointRegion), - }, - - // Package name endpoint on Config - - "package name endpoint config": { - with: []setupFunc{ - withPackageNameEndpointInConfig, - }, - expected: expectPackageNameConfigEndpoint(), - }, - - "package name endpoint config overrides alias name 0 config": { - with: []setupFunc{ - withPackageNameEndpointInConfig, - withAliasName0EndpointInConfig, - }, - expected: conflictsWith(expectPackageNameConfigEndpoint()), - }, - - "package name endpoint config overrides aws service envvar": { - with: []setupFunc{ - withPackageNameEndpointInConfig, - withAwsEnvVar, - }, - expected: expectPackageNameConfigEndpoint(), - }, - - "package name endpoint config overrides base envvar": { - with: []setupFunc{ - withPackageNameEndpointInConfig, - withBaseEnvVar, - }, - expected: expectPackageNameConfigEndpoint(), - }, - - "package name endpoint config overrides service config file": { - with: []setupFunc{ - withPackageNameEndpointInConfig, - withServiceEndpointInConfigFile, - }, - expected: expectPackageNameConfigEndpoint(), - }, - - "package name endpoint config overrides base config file": { - with: []setupFunc{ - withPackageNameEndpointInConfig, - withBaseEndpointInConfigFile, - }, - expected: expectPackageNameConfigEndpoint(), - }, - - // Alias name 0 endpoint on Config - - "alias name 0 endpoint config": { - with: []setupFunc{ - withAliasName0EndpointInConfig, - }, - expected: expectAliasName0ConfigEndpoint(), - }, - - "alias name 0 endpoint config overrides aws service envvar": { - with: []setupFunc{ - withAliasName0EndpointInConfig, - withAwsEnvVar, - }, - expected: expectAliasName0ConfigEndpoint(), - }, - - "alias name 0 endpoint config overrides base envvar": { - with: []setupFunc{ - withAliasName0EndpointInConfig, - withBaseEnvVar, - }, - expected: expectAliasName0ConfigEndpoint(), - }, - - "alias name 0 endpoint config overrides service config file": { - with: []setupFunc{ - withAliasName0EndpointInConfig, - withServiceEndpointInConfigFile, - }, - expected: expectAliasName0ConfigEndpoint(), - }, - - "alias name 0 endpoint config overrides base config file": { - with: []setupFunc{ - withAliasName0EndpointInConfig, - withBaseEndpointInConfigFile, - }, - expected: expectAliasName0ConfigEndpoint(), - }, - - // Service endpoint in AWS envvar - - "service aws envvar": { - with: []setupFunc{ - withAwsEnvVar, - }, - expected: expectAwsEnvVarEndpoint(), - }, - - "service aws envvar overrides base envvar": { - with: []setupFunc{ - withAwsEnvVar, - withBaseEnvVar, - }, - expected: expectAwsEnvVarEndpoint(), - }, - - "service aws envvar overrides service config file": { - with: []setupFunc{ - withAwsEnvVar, - withServiceEndpointInConfigFile, - }, - expected: expectAwsEnvVarEndpoint(), - }, - - "service aws envvar overrides base config file": { - with: []setupFunc{ - withAwsEnvVar, - withBaseEndpointInConfigFile, - }, - expected: expectAwsEnvVarEndpoint(), - }, - - // Base endpoint in envvar - - "base endpoint envvar": { - with: []setupFunc{ - withBaseEnvVar, - }, - expected: expectBaseEnvVarEndpoint(), - }, - - "base endpoint envvar overrides service config file": { - with: []setupFunc{ - withBaseEnvVar, - withServiceEndpointInConfigFile, - }, - expected: expectBaseEnvVarEndpoint(), - }, - - "base endpoint envvar overrides base config file": { - with: []setupFunc{ - withBaseEnvVar, - withBaseEndpointInConfigFile, - }, - expected: expectBaseEnvVarEndpoint(), - }, - - // Service endpoint in config file - - "service config file": { - with: []setupFunc{ - withServiceEndpointInConfigFile, - }, - expected: expectServiceConfigFileEndpoint(), - }, - - "service config file overrides base config file": { - with: []setupFunc{ - withServiceEndpointInConfigFile, - withBaseEndpointInConfigFile, - }, - expected: expectServiceConfigFileEndpoint(), - }, - - // Base endpoint in config file - - "base endpoint config file": { - with: []setupFunc{ - withBaseEndpointInConfigFile, - }, - expected: expectBaseConfigFileEndpoint(), - }, - - // Use FIPS endpoint on Config - - "use fips config": { - with: []setupFunc{ - withUseFIPSInConfig, - }, - expected: expectDefaultFIPSEndpoint(t, expectedEndpointRegion), - }, - - "use fips config with package name endpoint config": { - with: []setupFunc{ - withUseFIPSInConfig, - withPackageNameEndpointInConfig, - }, - expected: expectPackageNameConfigEndpoint(), - }, - } - - for name, testcase := range testcases { //nolint:paralleltest // uses t.Setenv - t.Run(name, func(t *testing.T) { - testEndpointCase(t, providerRegion, testcase, callService) - }) - } -} - -func defaultEndpoint(region string) (url.URL, error) { - r := endpoints.DefaultResolver() - - ep, err := r.EndpointFor(simpledb_sdkv1.EndpointsID, region) - if err != nil { - return url.URL{}, err - } - - url, _ := url.Parse(ep.URL) - - if url.Path == "" { - url.Path = "/" - } - - return *url, nil -} - -func defaultFIPSEndpoint(region string) (url.URL, error) { - r := endpoints.DefaultResolver() - - ep, err := r.EndpointFor(simpledb_sdkv1.EndpointsID, region, func(opt *endpoints.Options) { - opt.UseFIPSEndpoint = endpoints.FIPSEndpointStateEnabled - }) - if err != nil { - return url.URL{}, err - } - - url, _ := url.Parse(ep.URL) - - if url.Path == "" { - url.Path = "/" - } - - return *url, nil -} - -func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCallParams { - t.Helper() - - client := meta.SimpleDBConn(ctx) - - req, _ := client.ListDomainsRequest(&simpledb_sdkv1.ListDomainsInput{}) - - req.HTTPRequest.URL.Path = "/" - - return apiCallParams{ - endpoint: req.HTTPRequest.URL.String(), - region: aws_sdkv1.StringValue(client.Config.Region), - } -} - -func withNoConfig(_ *caseSetup) { - // no-op -} - -func withPackageNameEndpointInConfig(setup *caseSetup) { - if _, ok := setup.config[names.AttrEndpoints]; !ok { - setup.config[names.AttrEndpoints] = []any{ - map[string]any{}, - } - } - endpoints := setup.config[names.AttrEndpoints].([]any)[0].(map[string]any) - endpoints[packageName] = packageNameConfigEndpoint -} - -func withAliasName0EndpointInConfig(setup *caseSetup) { - if _, ok := setup.config[names.AttrEndpoints]; !ok { - setup.config[names.AttrEndpoints] = []any{ - map[string]any{}, - } - } - endpoints := setup.config[names.AttrEndpoints].([]any)[0].(map[string]any) - endpoints[aliasName0] = aliasName0ConfigEndpoint -} - -func conflictsWith(e caseExpectations) caseExpectations { - e.diags = append(e.diags, provider.ConflictingEndpointsWarningDiag( - cty.GetAttrPath(names.AttrEndpoints).IndexInt(0), - packageName, - aliasName0, - )) - return e -} - -func withAwsEnvVar(setup *caseSetup) { - setup.environmentVariables[awsEnvVar] = awsServiceEnvvarEndpoint -} - -func withBaseEnvVar(setup *caseSetup) { - setup.environmentVariables[baseEnvVar] = baseEnvvarEndpoint -} - -func withServiceEndpointInConfigFile(setup *caseSetup) { - setup.configFile.serviceUrl = serviceConfigFileEndpoint -} - -func withBaseEndpointInConfigFile(setup *caseSetup) { - setup.configFile.baseUrl = baseConfigFileEndpoint -} - -func withUseFIPSInConfig(setup *caseSetup) { - setup.config["use_fips_endpoint"] = true -} - -func expectDefaultEndpoint(t *testing.T, region string) caseExpectations { - t.Helper() - - endpoint, err := defaultEndpoint(region) - if err != nil { - t.Fatalf("resolving accessanalyzer default endpoint: %s", err) - } - - return caseExpectations{ - endpoint: endpoint.String(), - region: expectedCallRegion, - } -} - -func expectDefaultFIPSEndpoint(t *testing.T, region string) caseExpectations { - t.Helper() - - endpoint, err := defaultFIPSEndpoint(region) - if err != nil { - t.Fatalf("resolving accessanalyzer FIPS endpoint: %s", err) - } - - hostname := endpoint.Hostname() - _, err = net.LookupHost(hostname) - if dnsErr, ok := errs.As[*net.DNSError](err); ok && dnsErr.IsNotFound { - return expectDefaultEndpoint(t, region) - } else if err != nil { - t.Fatalf("looking up accessanalyzer endpoint %q: %s", hostname, err) - } - - return caseExpectations{ - endpoint: endpoint.String(), - region: expectedCallRegion, - } -} - -func expectPackageNameConfigEndpoint() caseExpectations { - return caseExpectations{ - endpoint: packageNameConfigEndpoint, - region: expectedCallRegion, - } -} - -func expectAliasName0ConfigEndpoint() caseExpectations { - return caseExpectations{ - endpoint: aliasName0ConfigEndpoint, - region: expectedCallRegion, - } -} - -func expectAwsEnvVarEndpoint() caseExpectations { - return caseExpectations{ - endpoint: awsServiceEnvvarEndpoint, - region: expectedCallRegion, - } -} - -func expectBaseEnvVarEndpoint() caseExpectations { - return caseExpectations{ - endpoint: baseEnvvarEndpoint, - region: expectedCallRegion, - } -} - -func expectServiceConfigFileEndpoint() caseExpectations { - return caseExpectations{ - endpoint: serviceConfigFileEndpoint, - region: expectedCallRegion, - } -} - -func expectBaseConfigFileEndpoint() caseExpectations { - return caseExpectations{ - endpoint: baseConfigFileEndpoint, - region: expectedCallRegion, - } -} - -func testEndpointCase(t *testing.T, region string, testcase endpointTestCase, callF callFunc) { - t.Helper() - - ctx := context.Background() - - setup := caseSetup{ - config: map[string]any{}, - environmentVariables: map[string]string{}, - } - - for _, f := range testcase.with { - f(&setup) - } - - config := map[string]any{ - names.AttrAccessKey: servicemocks.MockStaticAccessKey, - names.AttrSecretKey: servicemocks.MockStaticSecretKey, - names.AttrRegion: region, - names.AttrSkipCredentialsValidation: true, - names.AttrSkipRequestingAccountID: true, - } - - maps.Copy(config, setup.config) - - if setup.configFile.baseUrl != "" || setup.configFile.serviceUrl != "" { - config[names.AttrProfile] = "default" - tempDir := t.TempDir() - writeSharedConfigFile(t, &config, tempDir, generateSharedConfigFile(setup.configFile)) - } - - for k, v := range setup.environmentVariables { - t.Setenv(k, v) - } - - p, err := provider.New(ctx) - if err != nil { - t.Fatal(err) - } - - expectedDiags := testcase.expected.diags - expectedDiags = append( - expectedDiags, - errs.NewWarningDiagnostic( - "AWS account ID not found for provider", - "See https://registry.terraform.io/providers/hashicorp/aws/latest/docs#skip_requesting_account_id for implications.", - ), - ) - - diags := p.Configure(ctx, terraformsdk.NewResourceConfigRaw(config)) - - if diff := cmp.Diff(diags, expectedDiags, cmp.Comparer(sdkdiag.Comparer)); diff != "" { - t.Errorf("unexpected diagnostics difference: %s", diff) - } - - if diags.HasError() { - return - } - - meta := p.Meta().(*conns.AWSClient) - - callParams := callF(ctx, t, meta) - - if e, a := testcase.expected.endpoint, callParams.endpoint; e != a { - t.Errorf("expected endpoint %q, got %q", e, a) - } - - if e, a := testcase.expected.region, callParams.region; e != a { - t.Errorf("expected region %q, got %q", e, a) - } -} - -func generateSharedConfigFile(config configFile) string { - var buf strings.Builder - - buf.WriteString(` -[default] -aws_access_key_id = DefaultSharedCredentialsAccessKey -aws_secret_access_key = DefaultSharedCredentialsSecretKey -`) - if config.baseUrl != "" { - buf.WriteString(fmt.Sprintf("endpoint_url = %s\n", config.baseUrl)) - } - - if config.serviceUrl != "" { - buf.WriteString(fmt.Sprintf(` -services = endpoint-test - -[services endpoint-test] -%[1]s = - endpoint_url = %[2]s -`, configParam, serviceConfigFileEndpoint)) - } - - return buf.String() -} - -func writeSharedConfigFile(t *testing.T, config *map[string]any, tempDir, content string) string { - t.Helper() - - file, err := os.Create(filepath.Join(tempDir, "aws-sdk-go-base-shared-configuration-file")) - if err != nil { - t.Fatalf("creating shared configuration file: %s", err) - } - - _, err = file.WriteString(content) - if err != nil { - t.Fatalf(" writing shared configuration file: %s", err) - } - - if v, ok := (*config)[names.AttrSharedConfigFiles]; !ok { - (*config)[names.AttrSharedConfigFiles] = []any{file.Name()} - } else { - (*config)[names.AttrSharedConfigFiles] = append(v.([]any), file.Name()) - } - - return file.Name() -} diff --git a/internal/service/simpledb/service_package_gen.go b/internal/service/simpledb/service_package_gen.go index 2845ce69071..1e85dafa156 100644 --- a/internal/service/simpledb/service_package_gen.go +++ b/internal/service/simpledb/service_package_gen.go @@ -5,10 +5,6 @@ package simpledb import ( "context" - aws_sdkv1 "github.com/aws/aws-sdk-go/aws" - session_sdkv1 "github.com/aws/aws-sdk-go/aws/session" - simpledb_sdkv1 "github.com/aws/aws-sdk-go/service/simpledb" - "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -40,24 +36,6 @@ func (p *servicePackage) ServicePackageName() string { return names.SimpleDB } -// NewConn returns a new AWS SDK for Go v1 client for this service package's AWS API. -func (p *servicePackage) NewConn(ctx context.Context, config map[string]any) (*simpledb_sdkv1.SimpleDB, error) { - sess := config[names.AttrSession].(*session_sdkv1.Session) - - cfg := aws_sdkv1.Config{} - - if endpoint := config[names.AttrEndpoint].(string); endpoint != "" { - tflog.Debug(ctx, "setting endpoint", map[string]any{ - "tf_aws.endpoint": endpoint, - }) - cfg.Endpoint = aws_sdkv1.String(endpoint) - } else { - cfg.EndpointResolver = newEndpointResolverSDKv1(ctx) - } - - return simpledb_sdkv1.New(sess.Copy(&cfg)), nil -} - func ServicePackage(ctx context.Context) conns.ServicePackage { return &servicePackage{} } diff --git a/internal/service/simpledb/sweep.go b/internal/service/simpledb/sweep.go index 7d08b2ff175..22177ed4ed0 100644 --- a/internal/service/simpledb/sweep.go +++ b/internal/service/simpledb/sweep.go @@ -9,9 +9,9 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/simpledb" + "github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-aws/internal/sweep" - "github.com/hashicorp/terraform-provider-aws/internal/sweep/awsv1" "github.com/hashicorp/terraform-provider-aws/internal/sweep/framework" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -29,7 +29,7 @@ func sweepDomains(region string) error { if err != nil { return fmt.Errorf("error getting client: %s", err) } - conn := client.SimpleDBConn(ctx) + conn := simpleDBConn(ctx, client) input := &simpledb.ListDomainsInput{} sweepResources := make([]sweep.Sweepable, 0) @@ -47,7 +47,7 @@ func sweepDomains(region string) error { return !lastPage }) - if awsv1.SkipSweepError(err) { + if skipSweepError(err) { log.Printf("[WARN] Skipping SimpleDB Domain sweep for %s: %s", region, err) return nil } @@ -64,3 +64,87 @@ func sweepDomains(region string) error { return nil } + +// Check sweeper API call error for reasons to skip sweeping +// These include missing API endpoints and unsupported API calls +func skipSweepError(err error) bool { + // Ignore missing API endpoints for AWS SDK for Go v1 + if tfawserr.ErrMessageContains(err, "RequestError", "send request failed") { + return true + } + + // GovCloud has endpoints that respond with (no message provided): + // AccessDeniedException: + // Since acceptance test sweepers are best effort and this response is very common, + // we allow bypassing this error globally instead of individual test sweeper fixes. + if tfawserr.ErrCodeEquals(err, "AccessDeniedException") { + return true + } + // Example: BadRequestException: vpc link not supported for region us-gov-west-1 + if tfawserr.ErrMessageContains(err, "BadRequestException", "not supported") { + return true + } + // Example: InvalidAction: InvalidAction: Operation (ListPlatformApplications) is not supported in this region + if tfawserr.ErrMessageContains(err, "InvalidAction", "is not supported") { + return true + } + // Example: InvalidAction: The action DescribeTransitGatewayAttachments is not valid for this web service + if tfawserr.ErrMessageContains(err, "InvalidAction", "is not valid") { + return true + } + // For example from GovCloud SES.SetActiveReceiptRuleSet. + if tfawserr.ErrMessageContains(err, "InvalidAction", "Unavailable Operation") { + return true + } + // For example from us-west-2 Route53 key signing key + if tfawserr.ErrMessageContains(err, "InvalidKeySigningKeyStatus", "cannot be deleted because") { + return true + } + // InvalidParameterValue: Access Denied to API Version: APIGlobalDatabases + if tfawserr.ErrMessageContains(err, "InvalidParameterValue", "Access Denied to API Version") { + return true + } + // Ignore more unsupported API calls + // InvalidParameterValue: Use of cache security groups is not permitted in this API version for your account. + if tfawserr.ErrMessageContains(err, "InvalidParameterValue", "not permitted in this API version for your account") { + return true + } + // For example from us-gov-west-1 MemoryDB cluster + if tfawserr.ErrMessageContains(err, "InvalidParameterValueException", "Access Denied to API Version") { + return true + } + // For example from us-west-2 Route53 zone + if tfawserr.ErrMessageContains(err, "KeySigningKeyInParentDSRecord", "Due to DNS lookup failure") { + return true + } + // For example from us-gov-east-1 IoT domain configuration + if tfawserr.ErrMessageContains(err, "UnauthorizedException", "API is not available in") { + return true + } + // For example from us-gov-west-1 EventBridge archive + if tfawserr.ErrMessageContains(err, "UnknownOperationException", "Operation is disabled in this region") { + return true + } + // For example from us-east-1 SageMaker + if tfawserr.ErrMessageContains(err, "UnknownOperationException", "The requested operation is not supported in the called region") { + return true + } + // For example from us-west-2 ECR public repository + if tfawserr.ErrMessageContains(err, "UnsupportedCommandException", "command is only supported in") { + return true + } + // Ignore unsupported API calls + if tfawserr.ErrCodeEquals(err, "UnsupportedOperation") { + return true + } + // For example from us-west-1 EMR studio + if tfawserr.ErrMessageContains(err, "ValidationException", "Account is not whitelisted to use this feature") { + return true + } + // For example from us-west-2 SageMaker device fleet + if tfawserr.ErrMessageContains(err, "ValidationException", "We are retiring Amazon Sagemaker Edge") { + return true + } + + return false +} diff --git a/internal/service/sns/service_endpoint_resolver_gen.go b/internal/service/sns/service_endpoint_resolver_gen.go index 2d7084ab7b6..6fb32a73767 100644 --- a/internal/service/sns/service_endpoint_resolver_gen.go +++ b/internal/service/sns/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - sns_sdkv2 "github.com/aws/aws-sdk-go-v2/service/sns" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/sns" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ sns_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ sns.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver sns_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver sns.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: sns_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: sns.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params sns_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params sns.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params sns_sdkv2.End tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up sns endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params sns_sdkv2.End return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*sns_sdkv2.Options) { - return func(o *sns_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*sns.Options) { + return func(o *sns.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/sns/service_endpoints_gen_test.go b/internal/service/sns/service_endpoints_gen_test.go index 12949b7357b..029dbe90783 100644 --- a/internal/service/sns/service_endpoints_gen_test.go +++ b/internal/service/sns/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - sns_sdkv2 "github.com/aws/aws-sdk-go-v2/service/sns" + "github.com/aws/aws-sdk-go-v2/service/sns" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := sns_sdkv2.NewDefaultEndpointResolverV2() + r := sns.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), sns_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), sns.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := sns_sdkv2.NewDefaultEndpointResolverV2() + r := sns.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), sns_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), sns.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListSubscriptions(ctx, &sns_sdkv2.ListSubscriptionsInput{}, - func(opts *sns_sdkv2.Options) { + _, err := client.ListSubscriptions(ctx, &sns.ListSubscriptionsInput{}, + func(opts *sns.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/sns/service_package_gen.go b/internal/service/sns/service_package_gen.go index db6e88b545f..8e714e972d1 100644 --- a/internal/service/sns/service_package_gen.go +++ b/internal/service/sns/service_package_gen.go @@ -5,8 +5,8 @@ package sns import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - sns_sdkv2 "github.com/aws/aws-sdk-go-v2/service/sns" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/sns" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -72,11 +72,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*sns_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*sns.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return sns_sdkv2.NewFromConfig(cfg, - sns_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return sns.NewFromConfig(cfg, + sns.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/sqs/service_endpoint_resolver_gen.go b/internal/service/sqs/service_endpoint_resolver_gen.go index cbbbf1ebfc7..7f2413f026c 100644 --- a/internal/service/sqs/service_endpoint_resolver_gen.go +++ b/internal/service/sqs/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - sqs_sdkv2 "github.com/aws/aws-sdk-go-v2/service/sqs" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/sqs" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ sqs_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ sqs.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver sqs_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver sqs.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: sqs_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: sqs.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params sqs_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params sqs.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params sqs_sdkv2.End tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up sqs endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params sqs_sdkv2.End return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*sqs_sdkv2.Options) { - return func(o *sqs_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*sqs.Options) { + return func(o *sqs.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/sqs/service_endpoints_gen_test.go b/internal/service/sqs/service_endpoints_gen_test.go index f67b3382457..0ff8978e191 100644 --- a/internal/service/sqs/service_endpoints_gen_test.go +++ b/internal/service/sqs/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - sqs_sdkv2 "github.com/aws/aws-sdk-go-v2/service/sqs" + "github.com/aws/aws-sdk-go-v2/service/sqs" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := sqs_sdkv2.NewDefaultEndpointResolverV2() + r := sqs.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), sqs_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), sqs.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := sqs_sdkv2.NewDefaultEndpointResolverV2() + r := sqs.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), sqs_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), sqs.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListQueues(ctx, &sqs_sdkv2.ListQueuesInput{}, - func(opts *sqs_sdkv2.Options) { + _, err := client.ListQueues(ctx, &sqs.ListQueuesInput{}, + func(opts *sqs.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/sqs/service_package_gen.go b/internal/service/sqs/service_package_gen.go index 66485af9376..21b1d217ee0 100644 --- a/internal/service/sqs/service_package_gen.go +++ b/internal/service/sqs/service_package_gen.go @@ -5,8 +5,8 @@ package sqs import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - sqs_sdkv2 "github.com/aws/aws-sdk-go-v2/service/sqs" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/sqs" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -68,11 +68,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*sqs_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*sqs.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return sqs_sdkv2.NewFromConfig(cfg, - sqs_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return sqs.NewFromConfig(cfg, + sqs.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/ssm/service_endpoint_resolver_gen.go b/internal/service/ssm/service_endpoint_resolver_gen.go index e40aad9a4db..3c998074a29 100644 --- a/internal/service/ssm/service_endpoint_resolver_gen.go +++ b/internal/service/ssm/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - ssm_sdkv2 "github.com/aws/aws-sdk-go-v2/service/ssm" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/ssm" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ ssm_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ ssm.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver ssm_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver ssm.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: ssm_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: ssm.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params ssm_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params ssm.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params ssm_sdkv2.End tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up ssm endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params ssm_sdkv2.End return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*ssm_sdkv2.Options) { - return func(o *ssm_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*ssm.Options) { + return func(o *ssm.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/ssm/service_endpoints_gen_test.go b/internal/service/ssm/service_endpoints_gen_test.go index f8db521cb85..146052a71c5 100644 --- a/internal/service/ssm/service_endpoints_gen_test.go +++ b/internal/service/ssm/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - ssm_sdkv2 "github.com/aws/aws-sdk-go-v2/service/ssm" + "github.com/aws/aws-sdk-go-v2/service/ssm" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := ssm_sdkv2.NewDefaultEndpointResolverV2() + r := ssm.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), ssm_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), ssm.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := ssm_sdkv2.NewDefaultEndpointResolverV2() + r := ssm.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), ssm_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), ssm.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListDocuments(ctx, &ssm_sdkv2.ListDocumentsInput{}, - func(opts *ssm_sdkv2.Options) { + _, err := client.ListDocuments(ctx, &ssm.ListDocumentsInput{}, + func(opts *ssm.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/ssm/service_package_gen.go b/internal/service/ssm/service_package_gen.go index cc7f9049f31..275f94edf23 100644 --- a/internal/service/ssm/service_package_gen.go +++ b/internal/service/ssm/service_package_gen.go @@ -5,8 +5,8 @@ package ssm import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - ssm_sdkv2 "github.com/aws/aws-sdk-go-v2/service/ssm" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/ssm" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -153,11 +153,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*ssm_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*ssm.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return ssm_sdkv2.NewFromConfig(cfg, - ssm_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return ssm.NewFromConfig(cfg, + ssm.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/ssmcontacts/service_endpoint_resolver_gen.go b/internal/service/ssmcontacts/service_endpoint_resolver_gen.go index eb359b3c3bd..42d4dd09520 100644 --- a/internal/service/ssmcontacts/service_endpoint_resolver_gen.go +++ b/internal/service/ssmcontacts/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - ssmcontacts_sdkv2 "github.com/aws/aws-sdk-go-v2/service/ssmcontacts" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/ssmcontacts" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ ssmcontacts_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ ssmcontacts.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver ssmcontacts_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver ssmcontacts.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: ssmcontacts_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: ssmcontacts.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params ssmcontacts_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params ssmcontacts.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params ssmcontacts_s tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up ssmcontacts endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params ssmcontacts_s return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*ssmcontacts_sdkv2.Options) { - return func(o *ssmcontacts_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*ssmcontacts.Options) { + return func(o *ssmcontacts.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/ssmcontacts/service_endpoints_gen_test.go b/internal/service/ssmcontacts/service_endpoints_gen_test.go index d14100c0391..4c86b377747 100644 --- a/internal/service/ssmcontacts/service_endpoints_gen_test.go +++ b/internal/service/ssmcontacts/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - ssmcontacts_sdkv2 "github.com/aws/aws-sdk-go-v2/service/ssmcontacts" + "github.com/aws/aws-sdk-go-v2/service/ssmcontacts" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := ssmcontacts_sdkv2.NewDefaultEndpointResolverV2() + r := ssmcontacts.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), ssmcontacts_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), ssmcontacts.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := ssmcontacts_sdkv2.NewDefaultEndpointResolverV2() + r := ssmcontacts.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), ssmcontacts_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), ssmcontacts.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListContacts(ctx, &ssmcontacts_sdkv2.ListContactsInput{}, - func(opts *ssmcontacts_sdkv2.Options) { + _, err := client.ListContacts(ctx, &ssmcontacts.ListContactsInput{}, + func(opts *ssmcontacts.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/ssmcontacts/service_package_gen.go b/internal/service/ssmcontacts/service_package_gen.go index 9211147a0f4..3cb483807b0 100644 --- a/internal/service/ssmcontacts/service_package_gen.go +++ b/internal/service/ssmcontacts/service_package_gen.go @@ -5,8 +5,8 @@ package ssmcontacts import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - ssmcontacts_sdkv2 "github.com/aws/aws-sdk-go-v2/service/ssmcontacts" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/ssmcontacts" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -80,11 +80,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*ssmcontacts_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*ssmcontacts.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return ssmcontacts_sdkv2.NewFromConfig(cfg, - ssmcontacts_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return ssmcontacts.NewFromConfig(cfg, + ssmcontacts.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/ssmincidents/service_endpoint_resolver_gen.go b/internal/service/ssmincidents/service_endpoint_resolver_gen.go index 873f96d0978..7569f5b26b3 100644 --- a/internal/service/ssmincidents/service_endpoint_resolver_gen.go +++ b/internal/service/ssmincidents/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - ssmincidents_sdkv2 "github.com/aws/aws-sdk-go-v2/service/ssmincidents" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/ssmincidents" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ ssmincidents_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ ssmincidents.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver ssmincidents_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver ssmincidents.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: ssmincidents_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: ssmincidents.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params ssmincidents_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params ssmincidents.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params ssmincidents_ tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up ssmincidents endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params ssmincidents_ return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*ssmincidents_sdkv2.Options) { - return func(o *ssmincidents_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*ssmincidents.Options) { + return func(o *ssmincidents.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/ssmincidents/service_endpoints_gen_test.go b/internal/service/ssmincidents/service_endpoints_gen_test.go index b84ee10c6e2..0c1b1781e5d 100644 --- a/internal/service/ssmincidents/service_endpoints_gen_test.go +++ b/internal/service/ssmincidents/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - ssmincidents_sdkv2 "github.com/aws/aws-sdk-go-v2/service/ssmincidents" + "github.com/aws/aws-sdk-go-v2/service/ssmincidents" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := ssmincidents_sdkv2.NewDefaultEndpointResolverV2() + r := ssmincidents.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), ssmincidents_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), ssmincidents.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := ssmincidents_sdkv2.NewDefaultEndpointResolverV2() + r := ssmincidents.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), ssmincidents_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), ssmincidents.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListResponsePlans(ctx, &ssmincidents_sdkv2.ListResponsePlansInput{}, - func(opts *ssmincidents_sdkv2.Options) { + _, err := client.ListResponsePlans(ctx, &ssmincidents.ListResponsePlansInput{}, + func(opts *ssmincidents.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/ssmincidents/service_package_gen.go b/internal/service/ssmincidents/service_package_gen.go index af1214566f8..837ead63079 100644 --- a/internal/service/ssmincidents/service_package_gen.go +++ b/internal/service/ssmincidents/service_package_gen.go @@ -5,8 +5,8 @@ package ssmincidents import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - ssmincidents_sdkv2 "github.com/aws/aws-sdk-go-v2/service/ssmincidents" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/ssmincidents" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -61,11 +61,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*ssmincidents_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*ssmincidents.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return ssmincidents_sdkv2.NewFromConfig(cfg, - ssmincidents_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return ssmincidents.NewFromConfig(cfg, + ssmincidents.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/ssmquicksetup/service_endpoint_resolver_gen.go b/internal/service/ssmquicksetup/service_endpoint_resolver_gen.go index 2653b663979..c2830fd2dff 100644 --- a/internal/service/ssmquicksetup/service_endpoint_resolver_gen.go +++ b/internal/service/ssmquicksetup/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - ssmquicksetup_sdkv2 "github.com/aws/aws-sdk-go-v2/service/ssmquicksetup" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/ssmquicksetup" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ ssmquicksetup_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ ssmquicksetup.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver ssmquicksetup_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver ssmquicksetup.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: ssmquicksetup_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: ssmquicksetup.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params ssmquicksetup_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params ssmquicksetup.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params ssmquicksetup tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up ssmquicksetup endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params ssmquicksetup return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*ssmquicksetup_sdkv2.Options) { - return func(o *ssmquicksetup_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*ssmquicksetup.Options) { + return func(o *ssmquicksetup.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/ssmquicksetup/service_endpoints_gen_test.go b/internal/service/ssmquicksetup/service_endpoints_gen_test.go index df9988b1cec..4f351792957 100644 --- a/internal/service/ssmquicksetup/service_endpoints_gen_test.go +++ b/internal/service/ssmquicksetup/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - ssmquicksetup_sdkv2 "github.com/aws/aws-sdk-go-v2/service/ssmquicksetup" + "github.com/aws/aws-sdk-go-v2/service/ssmquicksetup" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := ssmquicksetup_sdkv2.NewDefaultEndpointResolverV2() + r := ssmquicksetup.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), ssmquicksetup_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), ssmquicksetup.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := ssmquicksetup_sdkv2.NewDefaultEndpointResolverV2() + r := ssmquicksetup.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), ssmquicksetup_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), ssmquicksetup.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListConfigurationManagers(ctx, &ssmquicksetup_sdkv2.ListConfigurationManagersInput{}, - func(opts *ssmquicksetup_sdkv2.Options) { + _, err := client.ListConfigurationManagers(ctx, &ssmquicksetup.ListConfigurationManagersInput{}, + func(opts *ssmquicksetup.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/ssmquicksetup/service_package_gen.go b/internal/service/ssmquicksetup/service_package_gen.go index 0096da90fac..9180511d137 100644 --- a/internal/service/ssmquicksetup/service_package_gen.go +++ b/internal/service/ssmquicksetup/service_package_gen.go @@ -5,8 +5,8 @@ package ssmquicksetup import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - ssmquicksetup_sdkv2 "github.com/aws/aws-sdk-go-v2/service/ssmquicksetup" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/ssmquicksetup" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -35,11 +35,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*ssmquicksetup_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*ssmquicksetup.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return ssmquicksetup_sdkv2.NewFromConfig(cfg, - ssmquicksetup_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return ssmquicksetup.NewFromConfig(cfg, + ssmquicksetup.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/ssmsap/service_endpoint_resolver_gen.go b/internal/service/ssmsap/service_endpoint_resolver_gen.go index b0849ab8fbd..bb2cb6c76f4 100644 --- a/internal/service/ssmsap/service_endpoint_resolver_gen.go +++ b/internal/service/ssmsap/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - ssmsap_sdkv2 "github.com/aws/aws-sdk-go-v2/service/ssmsap" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/ssmsap" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ ssmsap_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ ssmsap.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver ssmsap_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver ssmsap.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: ssmsap_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: ssmsap.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params ssmsap_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params ssmsap.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params ssmsap_sdkv2. tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up ssmsap endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params ssmsap_sdkv2. return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*ssmsap_sdkv2.Options) { - return func(o *ssmsap_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*ssmsap.Options) { + return func(o *ssmsap.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/ssmsap/service_endpoints_gen_test.go b/internal/service/ssmsap/service_endpoints_gen_test.go index a2bbe6cc947..be0cfe0fa7e 100644 --- a/internal/service/ssmsap/service_endpoints_gen_test.go +++ b/internal/service/ssmsap/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - ssmsap_sdkv2 "github.com/aws/aws-sdk-go-v2/service/ssmsap" + "github.com/aws/aws-sdk-go-v2/service/ssmsap" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := ssmsap_sdkv2.NewDefaultEndpointResolverV2() + r := ssmsap.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), ssmsap_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), ssmsap.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := ssmsap_sdkv2.NewDefaultEndpointResolverV2() + r := ssmsap.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), ssmsap_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), ssmsap.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListApplications(ctx, &ssmsap_sdkv2.ListApplicationsInput{}, - func(opts *ssmsap_sdkv2.Options) { + _, err := client.ListApplications(ctx, &ssmsap.ListApplicationsInput{}, + func(opts *ssmsap.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/ssmsap/service_package_gen.go b/internal/service/ssmsap/service_package_gen.go index 113b09ac754..b69538d93d4 100644 --- a/internal/service/ssmsap/service_package_gen.go +++ b/internal/service/ssmsap/service_package_gen.go @@ -5,8 +5,8 @@ package ssmsap import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - ssmsap_sdkv2 "github.com/aws/aws-sdk-go-v2/service/ssmsap" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/ssmsap" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -35,11 +35,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*ssmsap_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*ssmsap.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return ssmsap_sdkv2.NewFromConfig(cfg, - ssmsap_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return ssmsap.NewFromConfig(cfg, + ssmsap.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/sso/service_endpoint_resolver_gen.go b/internal/service/sso/service_endpoint_resolver_gen.go index a2318fec977..95ed5d597c3 100644 --- a/internal/service/sso/service_endpoint_resolver_gen.go +++ b/internal/service/sso/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - sso_sdkv2 "github.com/aws/aws-sdk-go-v2/service/sso" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/sso" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ sso_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ sso.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver sso_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver sso.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: sso_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: sso.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params sso_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params sso.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params sso_sdkv2.End tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up sso endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params sso_sdkv2.End return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*sso_sdkv2.Options) { - return func(o *sso_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*sso.Options) { + return func(o *sso.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/sso/service_endpoints_gen_test.go b/internal/service/sso/service_endpoints_gen_test.go index db952c1bc0b..d5d40e5c62d 100644 --- a/internal/service/sso/service_endpoints_gen_test.go +++ b/internal/service/sso/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - sso_sdkv2 "github.com/aws/aws-sdk-go-v2/service/sso" + "github.com/aws/aws-sdk-go-v2/service/sso" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := sso_sdkv2.NewDefaultEndpointResolverV2() + r := sso.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), sso_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), sso.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := sso_sdkv2.NewDefaultEndpointResolverV2() + r := sso.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), sso_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), sso.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,10 +283,10 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListAccounts(ctx, &sso_sdkv2.ListAccountsInput{ - AccessToken: aws_sdkv2.String("mock-access-token"), + _, err := client.ListAccounts(ctx, &sso.ListAccountsInput{ + AccessToken: aws.String("mock-access-token"), }, - func(opts *sso_sdkv2.Options) { + func(opts *sso.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/sso/service_package_gen.go b/internal/service/sso/service_package_gen.go index 5ca1868e97b..6361d438169 100644 --- a/internal/service/sso/service_package_gen.go +++ b/internal/service/sso/service_package_gen.go @@ -5,8 +5,8 @@ package sso import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - sso_sdkv2 "github.com/aws/aws-sdk-go-v2/service/sso" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/sso" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -35,11 +35,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*sso_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*sso.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return sso_sdkv2.NewFromConfig(cfg, - sso_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return sso.NewFromConfig(cfg, + sso.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/ssoadmin/service_endpoint_resolver_gen.go b/internal/service/ssoadmin/service_endpoint_resolver_gen.go index 01948c036ac..b05be0b0520 100644 --- a/internal/service/ssoadmin/service_endpoint_resolver_gen.go +++ b/internal/service/ssoadmin/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - ssoadmin_sdkv2 "github.com/aws/aws-sdk-go-v2/service/ssoadmin" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/ssoadmin" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ ssoadmin_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ ssoadmin.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver ssoadmin_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver ssoadmin.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: ssoadmin_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: ssoadmin.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params ssoadmin_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params ssoadmin.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params ssoadmin_sdkv tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up ssoadmin endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params ssoadmin_sdkv return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*ssoadmin_sdkv2.Options) { - return func(o *ssoadmin_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*ssoadmin.Options) { + return func(o *ssoadmin.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/ssoadmin/service_endpoints_gen_test.go b/internal/service/ssoadmin/service_endpoints_gen_test.go index 2529b804269..0cd8bcb969a 100644 --- a/internal/service/ssoadmin/service_endpoints_gen_test.go +++ b/internal/service/ssoadmin/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - ssoadmin_sdkv2 "github.com/aws/aws-sdk-go-v2/service/ssoadmin" + "github.com/aws/aws-sdk-go-v2/service/ssoadmin" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := ssoadmin_sdkv2.NewDefaultEndpointResolverV2() + r := ssoadmin.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), ssoadmin_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), ssoadmin.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := ssoadmin_sdkv2.NewDefaultEndpointResolverV2() + r := ssoadmin.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), ssoadmin_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), ssoadmin.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListInstances(ctx, &ssoadmin_sdkv2.ListInstancesInput{}, - func(opts *ssoadmin_sdkv2.Options) { + _, err := client.ListInstances(ctx, &ssoadmin.ListInstancesInput{}, + func(opts *ssoadmin.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/ssoadmin/service_package.go b/internal/service/ssoadmin/service_package.go index 17763dd8e3b..b2cbc31619c 100644 --- a/internal/service/ssoadmin/service_package.go +++ b/internal/service/ssoadmin/service_package.go @@ -20,7 +20,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return ssoadmin.NewFromConfig(cfg, - ssoadmin.WithEndpointResolverV2(newEndpointResolverSDKv2()), + ssoadmin.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), func(o *ssoadmin.Options) { o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(func(err error) aws.Ternary { diff --git a/internal/service/storagegateway/service_endpoint_resolver_gen.go b/internal/service/storagegateway/service_endpoint_resolver_gen.go index c8134416e82..53a0721391a 100644 --- a/internal/service/storagegateway/service_endpoint_resolver_gen.go +++ b/internal/service/storagegateway/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - storagegateway_sdkv2 "github.com/aws/aws-sdk-go-v2/service/storagegateway" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/storagegateway" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ storagegateway_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ storagegateway.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver storagegateway_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver storagegateway.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: storagegateway_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: storagegateway.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params storagegateway_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params storagegateway.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params storagegatewa tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up storagegateway endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params storagegatewa return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*storagegateway_sdkv2.Options) { - return func(o *storagegateway_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*storagegateway.Options) { + return func(o *storagegateway.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/storagegateway/service_endpoints_gen_test.go b/internal/service/storagegateway/service_endpoints_gen_test.go index 5cbdb500e67..14833be2cba 100644 --- a/internal/service/storagegateway/service_endpoints_gen_test.go +++ b/internal/service/storagegateway/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - storagegateway_sdkv2 "github.com/aws/aws-sdk-go-v2/service/storagegateway" + "github.com/aws/aws-sdk-go-v2/service/storagegateway" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := storagegateway_sdkv2.NewDefaultEndpointResolverV2() + r := storagegateway.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), storagegateway_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), storagegateway.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := storagegateway_sdkv2.NewDefaultEndpointResolverV2() + r := storagegateway.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), storagegateway_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), storagegateway.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListGateways(ctx, &storagegateway_sdkv2.ListGatewaysInput{}, - func(opts *storagegateway_sdkv2.Options) { + _, err := client.ListGateways(ctx, &storagegateway.ListGatewaysInput{}, + func(opts *storagegateway.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/storagegateway/service_package_gen.go b/internal/service/storagegateway/service_package_gen.go index 7fda39d7bc2..1245fcc18ee 100644 --- a/internal/service/storagegateway/service_package_gen.go +++ b/internal/service/storagegateway/service_package_gen.go @@ -5,8 +5,8 @@ package storagegateway import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - storagegateway_sdkv2 "github.com/aws/aws-sdk-go-v2/service/storagegateway" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/storagegateway" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -113,11 +113,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*storagegateway_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*storagegateway.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return storagegateway_sdkv2.NewFromConfig(cfg, - storagegateway_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return storagegateway.NewFromConfig(cfg, + storagegateway.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/sts/service_endpoint_resolver_gen.go b/internal/service/sts/service_endpoint_resolver_gen.go index ce9a1b1df5a..a004a0d5457 100644 --- a/internal/service/sts/service_endpoint_resolver_gen.go +++ b/internal/service/sts/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - sts_sdkv2 "github.com/aws/aws-sdk-go-v2/service/sts" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/sts" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ sts_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ sts.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver sts_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver sts.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: sts_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: sts.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params sts_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params sts.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params sts_sdkv2.End tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up sts endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params sts_sdkv2.End return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*sts_sdkv2.Options) { - return func(o *sts_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*sts.Options) { + return func(o *sts.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/sts/service_endpoints_gen_test.go b/internal/service/sts/service_endpoints_gen_test.go index 2863e8c5f65..d7a759d0ff7 100644 --- a/internal/service/sts/service_endpoints_gen_test.go +++ b/internal/service/sts/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - sts_sdkv2 "github.com/aws/aws-sdk-go-v2/service/sts" + "github.com/aws/aws-sdk-go-v2/service/sts" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -352,10 +352,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := sts_sdkv2.NewDefaultEndpointResolverV2() + r := sts.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), sts_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), sts.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -369,11 +369,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := sts_sdkv2.NewDefaultEndpointResolverV2() + r := sts.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), sts_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), sts.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -393,8 +393,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.GetCallerIdentity(ctx, &sts_sdkv2.GetCallerIdentityInput{}, - func(opts *sts_sdkv2.Options) { + _, err := client.GetCallerIdentity(ctx, &sts.GetCallerIdentityInput{}, + func(opts *sts.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/sts/service_package.go b/internal/service/sts/service_package.go index 803f30fb751..d5b05382683 100644 --- a/internal/service/sts/service_package.go +++ b/internal/service/sts/service_package.go @@ -17,7 +17,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return sts.NewFromConfig(cfg, - sts.WithEndpointResolverV2(newEndpointResolverSDKv2()), + sts.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), func(o *sts.Options) { if stsRegion := config["sts_region"].(string); stsRegion != "" { diff --git a/internal/service/swf/service_endpoint_resolver_gen.go b/internal/service/swf/service_endpoint_resolver_gen.go index f5e0da6321d..42f649d27d2 100644 --- a/internal/service/swf/service_endpoint_resolver_gen.go +++ b/internal/service/swf/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - swf_sdkv2 "github.com/aws/aws-sdk-go-v2/service/swf" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/swf" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ swf_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ swf.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver swf_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver swf.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: swf_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: swf.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params swf_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params swf.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params swf_sdkv2.End tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up swf endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params swf_sdkv2.End return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*swf_sdkv2.Options) { - return func(o *swf_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*swf.Options) { + return func(o *swf.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/swf/service_endpoints_gen_test.go b/internal/service/swf/service_endpoints_gen_test.go index 8bfa684306c..3770ef7dce3 100644 --- a/internal/service/swf/service_endpoints_gen_test.go +++ b/internal/service/swf/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - swf_sdkv2 "github.com/aws/aws-sdk-go-v2/service/swf" + "github.com/aws/aws-sdk-go-v2/service/swf" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := swf_sdkv2.NewDefaultEndpointResolverV2() + r := swf.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), swf_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), swf.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := swf_sdkv2.NewDefaultEndpointResolverV2() + r := swf.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), swf_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), swf.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,10 +283,10 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListDomains(ctx, &swf_sdkv2.ListDomainsInput{ + _, err := client.ListDomains(ctx, &swf.ListDomainsInput{ RegistrationStatus: "REGISTERED", }, - func(opts *swf_sdkv2.Options) { + func(opts *swf.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/swf/service_package_gen.go b/internal/service/swf/service_package_gen.go index 86cefe5d9b0..4e40b247c1c 100644 --- a/internal/service/swf/service_package_gen.go +++ b/internal/service/swf/service_package_gen.go @@ -5,8 +5,8 @@ package swf import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - swf_sdkv2 "github.com/aws/aws-sdk-go-v2/service/swf" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/swf" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -44,11 +44,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*swf_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*swf.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return swf_sdkv2.NewFromConfig(cfg, - swf_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return swf.NewFromConfig(cfg, + swf.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/synthetics/service_endpoint_resolver_gen.go b/internal/service/synthetics/service_endpoint_resolver_gen.go index 1d34dd22c25..c9f76544d5c 100644 --- a/internal/service/synthetics/service_endpoint_resolver_gen.go +++ b/internal/service/synthetics/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - synthetics_sdkv2 "github.com/aws/aws-sdk-go-v2/service/synthetics" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/synthetics" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ synthetics_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ synthetics.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver synthetics_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver synthetics.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: synthetics_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: synthetics.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params synthetics_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params synthetics.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params synthetics_sd tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up synthetics endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params synthetics_sd return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*synthetics_sdkv2.Options) { - return func(o *synthetics_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*synthetics.Options) { + return func(o *synthetics.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/synthetics/service_endpoints_gen_test.go b/internal/service/synthetics/service_endpoints_gen_test.go index dc7f104f4e4..197e0e958c1 100644 --- a/internal/service/synthetics/service_endpoints_gen_test.go +++ b/internal/service/synthetics/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - synthetics_sdkv2 "github.com/aws/aws-sdk-go-v2/service/synthetics" + "github.com/aws/aws-sdk-go-v2/service/synthetics" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := synthetics_sdkv2.NewDefaultEndpointResolverV2() + r := synthetics.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), synthetics_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), synthetics.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := synthetics_sdkv2.NewDefaultEndpointResolverV2() + r := synthetics.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), synthetics_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), synthetics.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListGroups(ctx, &synthetics_sdkv2.ListGroupsInput{}, - func(opts *synthetics_sdkv2.Options) { + _, err := client.ListGroups(ctx, &synthetics.ListGroupsInput{}, + func(opts *synthetics.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/synthetics/service_package_gen.go b/internal/service/synthetics/service_package_gen.go index 7dfe81a556c..29bcb75c8ce 100644 --- a/internal/service/synthetics/service_package_gen.go +++ b/internal/service/synthetics/service_package_gen.go @@ -5,8 +5,8 @@ package synthetics import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - synthetics_sdkv2 "github.com/aws/aws-sdk-go-v2/service/synthetics" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/synthetics" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -66,11 +66,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*synthetics_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*synthetics.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return synthetics_sdkv2.NewFromConfig(cfg, - synthetics_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return synthetics.NewFromConfig(cfg, + synthetics.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/timestreaminfluxdb/service_endpoint_resolver_gen.go b/internal/service/timestreaminfluxdb/service_endpoint_resolver_gen.go index 1899dc095c1..6e6d8616c87 100644 --- a/internal/service/timestreaminfluxdb/service_endpoint_resolver_gen.go +++ b/internal/service/timestreaminfluxdb/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - timestreaminfluxdb_sdkv2 "github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ timestreaminfluxdb_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ timestreaminfluxdb.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver timestreaminfluxdb_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver timestreaminfluxdb.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: timestreaminfluxdb_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: timestreaminfluxdb.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params timestreaminfluxdb_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params timestreaminfluxdb.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params timestreaminf tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up timestreaminfluxdb endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params timestreaminf return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*timestreaminfluxdb_sdkv2.Options) { - return func(o *timestreaminfluxdb_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*timestreaminfluxdb.Options) { + return func(o *timestreaminfluxdb.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/timestreaminfluxdb/service_endpoints_gen_test.go b/internal/service/timestreaminfluxdb/service_endpoints_gen_test.go index 6fa8464ece1..e09334e09a8 100644 --- a/internal/service/timestreaminfluxdb/service_endpoints_gen_test.go +++ b/internal/service/timestreaminfluxdb/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - timestreaminfluxdb_sdkv2 "github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb" + "github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := timestreaminfluxdb_sdkv2.NewDefaultEndpointResolverV2() + r := timestreaminfluxdb.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), timestreaminfluxdb_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), timestreaminfluxdb.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := timestreaminfluxdb_sdkv2.NewDefaultEndpointResolverV2() + r := timestreaminfluxdb.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), timestreaminfluxdb_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), timestreaminfluxdb.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListDbInstances(ctx, ×treaminfluxdb_sdkv2.ListDbInstancesInput{}, - func(opts *timestreaminfluxdb_sdkv2.Options) { + _, err := client.ListDbInstances(ctx, ×treaminfluxdb.ListDbInstancesInput{}, + func(opts *timestreaminfluxdb.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/timestreaminfluxdb/service_package_gen.go b/internal/service/timestreaminfluxdb/service_package_gen.go index b0e4d990ed2..a2e1ba818bb 100644 --- a/internal/service/timestreaminfluxdb/service_package_gen.go +++ b/internal/service/timestreaminfluxdb/service_package_gen.go @@ -5,8 +5,8 @@ package timestreaminfluxdb import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - timestreaminfluxdb_sdkv2 "github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -43,11 +43,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*timestreaminfluxdb_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*timestreaminfluxdb.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return timestreaminfluxdb_sdkv2.NewFromConfig(cfg, - timestreaminfluxdb_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return timestreaminfluxdb.NewFromConfig(cfg, + timestreaminfluxdb.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/timestreamwrite/service_endpoint_resolver_gen.go b/internal/service/timestreamwrite/service_endpoint_resolver_gen.go index 0c8cf804610..60605316f15 100644 --- a/internal/service/timestreamwrite/service_endpoint_resolver_gen.go +++ b/internal/service/timestreamwrite/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - timestreamwrite_sdkv2 "github.com/aws/aws-sdk-go-v2/service/timestreamwrite" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/timestreamwrite" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ timestreamwrite_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ timestreamwrite.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver timestreamwrite_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver timestreamwrite.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: timestreamwrite_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: timestreamwrite.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params timestreamwrite_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params timestreamwrite.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params timestreamwri tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up timestreamwrite endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params timestreamwri return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*timestreamwrite_sdkv2.Options) { - return func(o *timestreamwrite_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*timestreamwrite.Options) { + return func(o *timestreamwrite.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/timestreamwrite/service_package_gen.go b/internal/service/timestreamwrite/service_package_gen.go index 24d7b689b5d..62fee889e3d 100644 --- a/internal/service/timestreamwrite/service_package_gen.go +++ b/internal/service/timestreamwrite/service_package_gen.go @@ -5,8 +5,8 @@ package timestreamwrite import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - timestreamwrite_sdkv2 "github.com/aws/aws-sdk-go-v2/service/timestreamwrite" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/timestreamwrite" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -61,11 +61,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*timestreamwrite_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*timestreamwrite.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return timestreamwrite_sdkv2.NewFromConfig(cfg, - timestreamwrite_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return timestreamwrite.NewFromConfig(cfg, + timestreamwrite.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/transcribe/service_endpoint_resolver_gen.go b/internal/service/transcribe/service_endpoint_resolver_gen.go index d915cb32bd2..408d3986098 100644 --- a/internal/service/transcribe/service_endpoint_resolver_gen.go +++ b/internal/service/transcribe/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - transcribe_sdkv2 "github.com/aws/aws-sdk-go-v2/service/transcribe" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/transcribe" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ transcribe_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ transcribe.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver transcribe_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver transcribe.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: transcribe_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: transcribe.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params transcribe_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params transcribe.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params transcribe_sd tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up transcribe endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params transcribe_sd return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*transcribe_sdkv2.Options) { - return func(o *transcribe_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*transcribe.Options) { + return func(o *transcribe.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/transcribe/service_endpoints_gen_test.go b/internal/service/transcribe/service_endpoints_gen_test.go index 1a67ffa0676..20ce4111b72 100644 --- a/internal/service/transcribe/service_endpoints_gen_test.go +++ b/internal/service/transcribe/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - transcribe_sdkv2 "github.com/aws/aws-sdk-go-v2/service/transcribe" + "github.com/aws/aws-sdk-go-v2/service/transcribe" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -296,10 +296,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := transcribe_sdkv2.NewDefaultEndpointResolverV2() + r := transcribe.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), transcribe_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), transcribe.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -313,11 +313,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := transcribe_sdkv2.NewDefaultEndpointResolverV2() + r := transcribe.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), transcribe_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), transcribe.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -337,8 +337,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListLanguageModels(ctx, &transcribe_sdkv2.ListLanguageModelsInput{}, - func(opts *transcribe_sdkv2.Options) { + _, err := client.ListLanguageModels(ctx, &transcribe.ListLanguageModelsInput{}, + func(opts *transcribe.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/transcribe/service_package_gen.go b/internal/service/transcribe/service_package_gen.go index 375ceab73d9..6f3365477bc 100644 --- a/internal/service/transcribe/service_package_gen.go +++ b/internal/service/transcribe/service_package_gen.go @@ -5,8 +5,8 @@ package transcribe import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - transcribe_sdkv2 "github.com/aws/aws-sdk-go-v2/service/transcribe" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/transcribe" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -68,11 +68,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*transcribe_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*transcribe.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return transcribe_sdkv2.NewFromConfig(cfg, - transcribe_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return transcribe.NewFromConfig(cfg, + transcribe.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/transfer/service_endpoint_resolver_gen.go b/internal/service/transfer/service_endpoint_resolver_gen.go index e2fe2f0ea22..751de739bf9 100644 --- a/internal/service/transfer/service_endpoint_resolver_gen.go +++ b/internal/service/transfer/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - transfer_sdkv2 "github.com/aws/aws-sdk-go-v2/service/transfer" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/transfer" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ transfer_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ transfer.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver transfer_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver transfer.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: transfer_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: transfer.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params transfer_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params transfer.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params transfer_sdkv tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up transfer endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params transfer_sdkv return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*transfer_sdkv2.Options) { - return func(o *transfer_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*transfer.Options) { + return func(o *transfer.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/transfer/service_endpoints_gen_test.go b/internal/service/transfer/service_endpoints_gen_test.go index b9e3e7324ac..703702f3ed4 100644 --- a/internal/service/transfer/service_endpoints_gen_test.go +++ b/internal/service/transfer/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - transfer_sdkv2 "github.com/aws/aws-sdk-go-v2/service/transfer" + "github.com/aws/aws-sdk-go-v2/service/transfer" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := transfer_sdkv2.NewDefaultEndpointResolverV2() + r := transfer.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), transfer_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), transfer.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := transfer_sdkv2.NewDefaultEndpointResolverV2() + r := transfer.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), transfer_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), transfer.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListConnectors(ctx, &transfer_sdkv2.ListConnectorsInput{}, - func(opts *transfer_sdkv2.Options) { + _, err := client.ListConnectors(ctx, &transfer.ListConnectorsInput{}, + func(opts *transfer.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/transfer/service_package_gen.go b/internal/service/transfer/service_package_gen.go index 5add8876aa8..9b0bf6b2ef4 100644 --- a/internal/service/transfer/service_package_gen.go +++ b/internal/service/transfer/service_package_gen.go @@ -5,8 +5,8 @@ package transfer import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - transfer_sdkv2 "github.com/aws/aws-sdk-go-v2/service/transfer" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/transfer" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -121,11 +121,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*transfer_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*transfer.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return transfer_sdkv2.NewFromConfig(cfg, - transfer_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return transfer.NewFromConfig(cfg, + transfer.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/verifiedpermissions/service_endpoint_resolver_gen.go b/internal/service/verifiedpermissions/service_endpoint_resolver_gen.go index 984e26718e7..db962ad42bf 100644 --- a/internal/service/verifiedpermissions/service_endpoint_resolver_gen.go +++ b/internal/service/verifiedpermissions/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - verifiedpermissions_sdkv2 "github.com/aws/aws-sdk-go-v2/service/verifiedpermissions" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/verifiedpermissions" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ verifiedpermissions_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ verifiedpermissions.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver verifiedpermissions_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver verifiedpermissions.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: verifiedpermissions_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: verifiedpermissions.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params verifiedpermissions_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params verifiedpermissions.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params verifiedpermi tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up verifiedpermissions endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params verifiedpermi return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*verifiedpermissions_sdkv2.Options) { - return func(o *verifiedpermissions_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*verifiedpermissions.Options) { + return func(o *verifiedpermissions.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/verifiedpermissions/service_endpoints_gen_test.go b/internal/service/verifiedpermissions/service_endpoints_gen_test.go index 1e1b82a2d46..fb87621a74e 100644 --- a/internal/service/verifiedpermissions/service_endpoints_gen_test.go +++ b/internal/service/verifiedpermissions/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - verifiedpermissions_sdkv2 "github.com/aws/aws-sdk-go-v2/service/verifiedpermissions" + "github.com/aws/aws-sdk-go-v2/service/verifiedpermissions" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := verifiedpermissions_sdkv2.NewDefaultEndpointResolverV2() + r := verifiedpermissions.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), verifiedpermissions_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), verifiedpermissions.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := verifiedpermissions_sdkv2.NewDefaultEndpointResolverV2() + r := verifiedpermissions.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), verifiedpermissions_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), verifiedpermissions.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListPolicyStores(ctx, &verifiedpermissions_sdkv2.ListPolicyStoresInput{}, - func(opts *verifiedpermissions_sdkv2.Options) { + _, err := client.ListPolicyStores(ctx, &verifiedpermissions.ListPolicyStoresInput{}, + func(opts *verifiedpermissions.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/verifiedpermissions/service_package_gen.go b/internal/service/verifiedpermissions/service_package_gen.go index 59d4d2bfe9e..ce18b04e163 100644 --- a/internal/service/verifiedpermissions/service_package_gen.go +++ b/internal/service/verifiedpermissions/service_package_gen.go @@ -5,8 +5,8 @@ package verifiedpermissions import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - verifiedpermissions_sdkv2 "github.com/aws/aws-sdk-go-v2/service/verifiedpermissions" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/verifiedpermissions" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -61,11 +61,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*verifiedpermissions_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*verifiedpermissions.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return verifiedpermissions_sdkv2.NewFromConfig(cfg, - verifiedpermissions_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return verifiedpermissions.NewFromConfig(cfg, + verifiedpermissions.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/vpclattice/service_endpoint_resolver_gen.go b/internal/service/vpclattice/service_endpoint_resolver_gen.go index b517529cb12..72d43fd3808 100644 --- a/internal/service/vpclattice/service_endpoint_resolver_gen.go +++ b/internal/service/vpclattice/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - vpclattice_sdkv2 "github.com/aws/aws-sdk-go-v2/service/vpclattice" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/vpclattice" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ vpclattice_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ vpclattice.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver vpclattice_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver vpclattice.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: vpclattice_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: vpclattice.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params vpclattice_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params vpclattice.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params vpclattice_sd tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up vpclattice endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params vpclattice_sd return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*vpclattice_sdkv2.Options) { - return func(o *vpclattice_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*vpclattice.Options) { + return func(o *vpclattice.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/vpclattice/service_endpoints_gen_test.go b/internal/service/vpclattice/service_endpoints_gen_test.go index 1e5a2db3050..d3eca383193 100644 --- a/internal/service/vpclattice/service_endpoints_gen_test.go +++ b/internal/service/vpclattice/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - vpclattice_sdkv2 "github.com/aws/aws-sdk-go-v2/service/vpclattice" + "github.com/aws/aws-sdk-go-v2/service/vpclattice" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := vpclattice_sdkv2.NewDefaultEndpointResolverV2() + r := vpclattice.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), vpclattice_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), vpclattice.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := vpclattice_sdkv2.NewDefaultEndpointResolverV2() + r := vpclattice.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), vpclattice_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), vpclattice.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListServices(ctx, &vpclattice_sdkv2.ListServicesInput{}, - func(opts *vpclattice_sdkv2.Options) { + _, err := client.ListServices(ctx, &vpclattice.ListServicesInput{}, + func(opts *vpclattice.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/vpclattice/service_package_gen.go b/internal/service/vpclattice/service_package_gen.go index 1d57c12e072..c4de48eacc2 100644 --- a/internal/service/vpclattice/service_package_gen.go +++ b/internal/service/vpclattice/service_package_gen.go @@ -5,8 +5,8 @@ package vpclattice import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - vpclattice_sdkv2 "github.com/aws/aws-sdk-go-v2/service/vpclattice" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/vpclattice" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -140,11 +140,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*vpclattice_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*vpclattice.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return vpclattice_sdkv2.NewFromConfig(cfg, - vpclattice_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return vpclattice.NewFromConfig(cfg, + vpclattice.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/waf/service_endpoint_resolver_gen.go b/internal/service/waf/service_endpoint_resolver_gen.go index cb4177efb49..7250bd6d46e 100644 --- a/internal/service/waf/service_endpoint_resolver_gen.go +++ b/internal/service/waf/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - waf_sdkv2 "github.com/aws/aws-sdk-go-v2/service/waf" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/waf" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ waf_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ waf.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver waf_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver waf.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: waf_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: waf.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params waf_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params waf.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params waf_sdkv2.End tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up waf endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params waf_sdkv2.End return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*waf_sdkv2.Options) { - return func(o *waf_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*waf.Options) { + return func(o *waf.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/waf/service_endpoints_gen_test.go b/internal/service/waf/service_endpoints_gen_test.go index dd06d4c6f5c..9d3d5d968b2 100644 --- a/internal/service/waf/service_endpoints_gen_test.go +++ b/internal/service/waf/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - waf_sdkv2 "github.com/aws/aws-sdk-go-v2/service/waf" + "github.com/aws/aws-sdk-go-v2/service/waf" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := waf_sdkv2.NewDefaultEndpointResolverV2() + r := waf.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), waf_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), waf.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := waf_sdkv2.NewDefaultEndpointResolverV2() + r := waf.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), waf_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), waf.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListRules(ctx, &waf_sdkv2.ListRulesInput{}, - func(opts *waf_sdkv2.Options) { + _, err := client.ListRules(ctx, &waf.ListRulesInput{}, + func(opts *waf.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/waf/service_package_gen.go b/internal/service/waf/service_package_gen.go index 65f1b78d43a..b5108a075f3 100644 --- a/internal/service/waf/service_package_gen.go +++ b/internal/service/waf/service_package_gen.go @@ -5,8 +5,8 @@ package waf import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - waf_sdkv2 "github.com/aws/aws-sdk-go-v2/service/waf" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/waf" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -134,11 +134,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*waf_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*waf.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return waf_sdkv2.NewFromConfig(cfg, - waf_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return waf.NewFromConfig(cfg, + waf.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/wafregional/service_endpoint_resolver_gen.go b/internal/service/wafregional/service_endpoint_resolver_gen.go index 4b97d5e2387..1baaa5ef61c 100644 --- a/internal/service/wafregional/service_endpoint_resolver_gen.go +++ b/internal/service/wafregional/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - wafregional_sdkv2 "github.com/aws/aws-sdk-go-v2/service/wafregional" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/wafregional" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ wafregional_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ wafregional.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver wafregional_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver wafregional.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: wafregional_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: wafregional.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params wafregional_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params wafregional.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params wafregional_s tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up wafregional endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params wafregional_s return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*wafregional_sdkv2.Options) { - return func(o *wafregional_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*wafregional.Options) { + return func(o *wafregional.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/wafregional/service_endpoints_gen_test.go b/internal/service/wafregional/service_endpoints_gen_test.go index 3527bd51233..91cdb80f679 100644 --- a/internal/service/wafregional/service_endpoints_gen_test.go +++ b/internal/service/wafregional/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - wafregional_sdkv2 "github.com/aws/aws-sdk-go-v2/service/wafregional" + "github.com/aws/aws-sdk-go-v2/service/wafregional" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := wafregional_sdkv2.NewDefaultEndpointResolverV2() + r := wafregional.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), wafregional_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), wafregional.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := wafregional_sdkv2.NewDefaultEndpointResolverV2() + r := wafregional.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), wafregional_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), wafregional.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListRules(ctx, &wafregional_sdkv2.ListRulesInput{}, - func(opts *wafregional_sdkv2.Options) { + _, err := client.ListRules(ctx, &wafregional.ListRulesInput{}, + func(opts *wafregional.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/wafregional/service_package_gen.go b/internal/service/wafregional/service_package_gen.go index 73dd82adade..19294adb8a6 100644 --- a/internal/service/wafregional/service_package_gen.go +++ b/internal/service/wafregional/service_package_gen.go @@ -5,8 +5,8 @@ package wafregional import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - wafregional_sdkv2 "github.com/aws/aws-sdk-go-v2/service/wafregional" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/wafregional" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -139,11 +139,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*wafregional_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*wafregional.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return wafregional_sdkv2.NewFromConfig(cfg, - wafregional_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return wafregional.NewFromConfig(cfg, + wafregional.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/wafv2/service_endpoint_resolver_gen.go b/internal/service/wafv2/service_endpoint_resolver_gen.go index 27df5d8997d..bfaf551e2ca 100644 --- a/internal/service/wafv2/service_endpoint_resolver_gen.go +++ b/internal/service/wafv2/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - wafv2_sdkv2 "github.com/aws/aws-sdk-go-v2/service/wafv2" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/wafv2" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ wafv2_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ wafv2.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver wafv2_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver wafv2.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: wafv2_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: wafv2.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params wafv2_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params wafv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params wafv2_sdkv2.E tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up wafv2 endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params wafv2_sdkv2.E return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*wafv2_sdkv2.Options) { - return func(o *wafv2_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*wafv2.Options) { + return func(o *wafv2.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/wafv2/service_endpoints_gen_test.go b/internal/service/wafv2/service_endpoints_gen_test.go index cb8e8c3c800..2946c9e85ef 100644 --- a/internal/service/wafv2/service_endpoints_gen_test.go +++ b/internal/service/wafv2/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - wafv2_sdkv2 "github.com/aws/aws-sdk-go-v2/service/wafv2" + "github.com/aws/aws-sdk-go-v2/service/wafv2" awstypes "github.com/aws/aws-sdk-go-v2/service/wafv2/types" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" @@ -243,10 +243,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := wafv2_sdkv2.NewDefaultEndpointResolverV2() + r := wafv2.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), wafv2_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), wafv2.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -260,11 +260,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := wafv2_sdkv2.NewDefaultEndpointResolverV2() + r := wafv2.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), wafv2_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), wafv2.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -284,10 +284,10 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListRuleGroups(ctx, &wafv2_sdkv2.ListRuleGroupsInput{ + _, err := client.ListRuleGroups(ctx, &wafv2.ListRuleGroupsInput{ Scope: awstypes.ScopeRegional, }, - func(opts *wafv2_sdkv2.Options) { + func(opts *wafv2.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/wafv2/service_package_gen.go b/internal/service/wafv2/service_package_gen.go index cdf93312ee1..faaf5c12588 100644 --- a/internal/service/wafv2/service_package_gen.go +++ b/internal/service/wafv2/service_package_gen.go @@ -5,8 +5,8 @@ package wafv2 import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - wafv2_sdkv2 "github.com/aws/aws-sdk-go-v2/service/wafv2" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/wafv2" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -99,11 +99,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*wafv2_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*wafv2.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return wafv2_sdkv2.NewFromConfig(cfg, - wafv2_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return wafv2.NewFromConfig(cfg, + wafv2.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/wellarchitected/service_endpoint_resolver_gen.go b/internal/service/wellarchitected/service_endpoint_resolver_gen.go index 85faee69813..37d1771b72a 100644 --- a/internal/service/wellarchitected/service_endpoint_resolver_gen.go +++ b/internal/service/wellarchitected/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - wellarchitected_sdkv2 "github.com/aws/aws-sdk-go-v2/service/wellarchitected" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/wellarchitected" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ wellarchitected_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ wellarchitected.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver wellarchitected_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver wellarchitected.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: wellarchitected_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: wellarchitected.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params wellarchitected_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params wellarchitected.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params wellarchitect tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up wellarchitected endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params wellarchitect return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*wellarchitected_sdkv2.Options) { - return func(o *wellarchitected_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*wellarchitected.Options) { + return func(o *wellarchitected.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/wellarchitected/service_endpoints_gen_test.go b/internal/service/wellarchitected/service_endpoints_gen_test.go index a05d8ec029b..b87b57105cb 100644 --- a/internal/service/wellarchitected/service_endpoints_gen_test.go +++ b/internal/service/wellarchitected/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - wellarchitected_sdkv2 "github.com/aws/aws-sdk-go-v2/service/wellarchitected" + "github.com/aws/aws-sdk-go-v2/service/wellarchitected" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := wellarchitected_sdkv2.NewDefaultEndpointResolverV2() + r := wellarchitected.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), wellarchitected_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), wellarchitected.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := wellarchitected_sdkv2.NewDefaultEndpointResolverV2() + r := wellarchitected.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), wellarchitected_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), wellarchitected.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListProfiles(ctx, &wellarchitected_sdkv2.ListProfilesInput{}, - func(opts *wellarchitected_sdkv2.Options) { + _, err := client.ListProfiles(ctx, &wellarchitected.ListProfilesInput{}, + func(opts *wellarchitected.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/wellarchitected/service_package_gen.go b/internal/service/wellarchitected/service_package_gen.go index 5161d0e1870..33322af0ec6 100644 --- a/internal/service/wellarchitected/service_package_gen.go +++ b/internal/service/wellarchitected/service_package_gen.go @@ -5,8 +5,8 @@ package wellarchitected import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - wellarchitected_sdkv2 "github.com/aws/aws-sdk-go-v2/service/wellarchitected" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/wellarchitected" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -35,11 +35,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*wellarchitected_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*wellarchitected.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return wellarchitected_sdkv2.NewFromConfig(cfg, - wellarchitected_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return wellarchitected.NewFromConfig(cfg, + wellarchitected.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/worklink/service_endpoint_resolver_gen.go b/internal/service/worklink/service_endpoint_resolver_gen.go index 8a80889b03b..e35d7e1d6c4 100644 --- a/internal/service/worklink/service_endpoint_resolver_gen.go +++ b/internal/service/worklink/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - worklink_sdkv2 "github.com/aws/aws-sdk-go-v2/service/worklink" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/worklink" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ worklink_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ worklink.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver worklink_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver worklink.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: worklink_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: worklink.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params worklink_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params worklink.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params worklink_sdkv tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up worklink endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params worklink_sdkv return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*worklink_sdkv2.Options) { - return func(o *worklink_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*worklink.Options) { + return func(o *worklink.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/worklink/service_endpoints_gen_test.go b/internal/service/worklink/service_endpoints_gen_test.go index cef34abc814..aa464604a7d 100644 --- a/internal/service/worklink/service_endpoints_gen_test.go +++ b/internal/service/worklink/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - worklink_sdkv2 "github.com/aws/aws-sdk-go-v2/service/worklink" + "github.com/aws/aws-sdk-go-v2/service/worklink" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := worklink_sdkv2.NewDefaultEndpointResolverV2() + r := worklink.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), worklink_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), worklink.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := worklink_sdkv2.NewDefaultEndpointResolverV2() + r := worklink.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), worklink_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), worklink.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListFleets(ctx, &worklink_sdkv2.ListFleetsInput{}, - func(opts *worklink_sdkv2.Options) { + _, err := client.ListFleets(ctx, &worklink.ListFleetsInput{}, + func(opts *worklink.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/worklink/service_package_gen.go b/internal/service/worklink/service_package_gen.go index 9c2bb19e09d..48eb543cb67 100644 --- a/internal/service/worklink/service_package_gen.go +++ b/internal/service/worklink/service_package_gen.go @@ -5,8 +5,8 @@ package worklink import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - worklink_sdkv2 "github.com/aws/aws-sdk-go-v2/service/worklink" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/worklink" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -46,11 +46,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*worklink_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*worklink.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return worklink_sdkv2.NewFromConfig(cfg, - worklink_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return worklink.NewFromConfig(cfg, + worklink.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/workspaces/service_endpoint_resolver_gen.go b/internal/service/workspaces/service_endpoint_resolver_gen.go index 37a015e3e16..f490c10c28e 100644 --- a/internal/service/workspaces/service_endpoint_resolver_gen.go +++ b/internal/service/workspaces/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - workspaces_sdkv2 "github.com/aws/aws-sdk-go-v2/service/workspaces" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/workspaces" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ workspaces_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ workspaces.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver workspaces_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver workspaces.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: workspaces_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: workspaces.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params workspaces_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params workspaces.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params workspaces_sd tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up workspaces endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params workspaces_sd return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*workspaces_sdkv2.Options) { - return func(o *workspaces_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*workspaces.Options) { + return func(o *workspaces.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/workspaces/service_endpoints_gen_test.go b/internal/service/workspaces/service_endpoints_gen_test.go index 9261f889c0a..08f5e550afe 100644 --- a/internal/service/workspaces/service_endpoints_gen_test.go +++ b/internal/service/workspaces/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - workspaces_sdkv2 "github.com/aws/aws-sdk-go-v2/service/workspaces" + "github.com/aws/aws-sdk-go-v2/service/workspaces" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := workspaces_sdkv2.NewDefaultEndpointResolverV2() + r := workspaces.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), workspaces_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), workspaces.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := workspaces_sdkv2.NewDefaultEndpointResolverV2() + r := workspaces.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), workspaces_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), workspaces.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.DescribeWorkspaces(ctx, &workspaces_sdkv2.DescribeWorkspacesInput{}, - func(opts *workspaces_sdkv2.Options) { + _, err := client.DescribeWorkspaces(ctx, &workspaces.DescribeWorkspacesInput{}, + func(opts *workspaces.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/workspaces/service_package_gen.go b/internal/service/workspaces/service_package_gen.go index 701e6fd2eac..0b436e16392 100644 --- a/internal/service/workspaces/service_package_gen.go +++ b/internal/service/workspaces/service_package_gen.go @@ -5,8 +5,8 @@ package workspaces import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - workspaces_sdkv2 "github.com/aws/aws-sdk-go-v2/service/workspaces" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/workspaces" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -95,11 +95,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*workspaces_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*workspaces.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return workspaces_sdkv2.NewFromConfig(cfg, - workspaces_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return workspaces.NewFromConfig(cfg, + workspaces.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/workspacesweb/service_endpoint_resolver_gen.go b/internal/service/workspacesweb/service_endpoint_resolver_gen.go index 9775fb0a93d..cdb424937fc 100644 --- a/internal/service/workspacesweb/service_endpoint_resolver_gen.go +++ b/internal/service/workspacesweb/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - workspacesweb_sdkv2 "github.com/aws/aws-sdk-go-v2/service/workspacesweb" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/workspacesweb" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ workspacesweb_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ workspacesweb.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver workspacesweb_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver workspacesweb.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: workspacesweb_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: workspacesweb.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params workspacesweb_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params workspacesweb.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params workspacesweb tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up workspacesweb endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params workspacesweb return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*workspacesweb_sdkv2.Options) { - return func(o *workspacesweb_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*workspacesweb.Options) { + return func(o *workspacesweb.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/workspacesweb/service_endpoints_gen_test.go b/internal/service/workspacesweb/service_endpoints_gen_test.go index c398aff3c9c..f07d70b956c 100644 --- a/internal/service/workspacesweb/service_endpoints_gen_test.go +++ b/internal/service/workspacesweb/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - workspacesweb_sdkv2 "github.com/aws/aws-sdk-go-v2/service/workspacesweb" + "github.com/aws/aws-sdk-go-v2/service/workspacesweb" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := workspacesweb_sdkv2.NewDefaultEndpointResolverV2() + r := workspacesweb.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), workspacesweb_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), workspacesweb.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := workspacesweb_sdkv2.NewDefaultEndpointResolverV2() + r := workspacesweb.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), workspacesweb_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), workspacesweb.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListPortals(ctx, &workspacesweb_sdkv2.ListPortalsInput{}, - func(opts *workspacesweb_sdkv2.Options) { + _, err := client.ListPortals(ctx, &workspacesweb.ListPortalsInput{}, + func(opts *workspacesweb.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/workspacesweb/service_package_gen.go b/internal/service/workspacesweb/service_package_gen.go index 7fb1a4e3d37..c0172574841 100644 --- a/internal/service/workspacesweb/service_package_gen.go +++ b/internal/service/workspacesweb/service_package_gen.go @@ -5,8 +5,8 @@ package workspacesweb import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - workspacesweb_sdkv2 "github.com/aws/aws-sdk-go-v2/service/workspacesweb" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/workspacesweb" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -35,11 +35,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*workspacesweb_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*workspacesweb.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return workspacesweb_sdkv2.NewFromConfig(cfg, - workspacesweb_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return workspacesweb.NewFromConfig(cfg, + workspacesweb.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/service/xray/service_endpoint_resolver_gen.go b/internal/service/xray/service_endpoint_resolver_gen.go index a2aa0dedb3f..5af164b38b6 100644 --- a/internal/service/xray/service_endpoint_resolver_gen.go +++ b/internal/service/xray/service_endpoint_resolver_gen.go @@ -7,37 +7,37 @@ import ( "fmt" "net" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - xray_sdkv2 "github.com/aws/aws-sdk-go-v2/service/xray" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/xray" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ xray_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ xray.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { - defaultResolver xray_sdkv2.EndpointResolverV2 +type resolverV2 struct { + defaultResolver xray.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ - defaultResolver: xray_sdkv2.NewDefaultEndpointResolverV2(), +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: xray.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params xray_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverV2) ResolveEndpoint(ctx context.Context, params xray.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { params = params.WithDefaults() - useFIPS := aws_sdkv2.ToBool(params.UseFIPS) + useFIPS := aws.ToBool(params.UseFIPS) - if eps := params.Endpoint; aws_sdkv2.ToString(eps) != "" { + if eps := params.Endpoint; aws.ToString(eps) != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) if useFIPS { tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } return r.defaultResolver.ResolveEndpoint(ctx, params) @@ -60,7 +60,7 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params xray_sdkv2.En tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ "tf_aws.hostname": hostname, }) - params.UseFIPS = aws_sdkv2.Bool(false) + params.UseFIPS = aws.Bool(false) } else { err = fmt.Errorf("looking up xray endpoint %q: %s", hostname, err) return @@ -73,10 +73,10 @@ func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params xray_sdkv2.En return r.defaultResolver.ResolveEndpoint(ctx, params) } -func withBaseEndpoint(endpoint string) func(*xray_sdkv2.Options) { - return func(o *xray_sdkv2.Options) { +func withBaseEndpoint(endpoint string) func(*xray.Options) { + return func(o *xray.Options) { if endpoint != "" { - o.BaseEndpoint = aws_sdkv2.String(endpoint) + o.BaseEndpoint = aws.String(endpoint) } } } diff --git a/internal/service/xray/service_endpoints_gen_test.go b/internal/service/xray/service_endpoints_gen_test.go index 56a4665bade..7d153eedbc3 100644 --- a/internal/service/xray/service_endpoints_gen_test.go +++ b/internal/service/xray/service_endpoints_gen_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - xray_sdkv2 "github.com/aws/aws-sdk-go-v2/service/xray" + "github.com/aws/aws-sdk-go-v2/service/xray" "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" "github.com/google/go-cmp/cmp" @@ -242,10 +242,10 @@ func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.S } func defaultEndpoint(region string) (url.URL, error) { - r := xray_sdkv2.NewDefaultEndpointResolverV2() + r := xray.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), xray_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), + ep, err := r.ResolveEndpoint(context.Background(), xray.EndpointParameters{ + Region: aws.String(region), }) if err != nil { return url.URL{}, err @@ -259,11 +259,11 @@ func defaultEndpoint(region string) (url.URL, error) { } func defaultFIPSEndpoint(region string) (url.URL, error) { - r := xray_sdkv2.NewDefaultEndpointResolverV2() + r := xray.NewDefaultEndpointResolverV2() - ep, err := r.ResolveEndpoint(context.Background(), xray_sdkv2.EndpointParameters{ - Region: aws_sdkv2.String(region), - UseFIPS: aws_sdkv2.Bool(true), + ep, err := r.ResolveEndpoint(context.Background(), xray.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), }) if err != nil { return url.URL{}, err @@ -283,8 +283,8 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - _, err := client.ListResourcePolicies(ctx, &xray_sdkv2.ListResourcePoliciesInput{}, - func(opts *xray_sdkv2.Options) { + _, err := client.ListResourcePolicies(ctx, &xray.ListResourcePoliciesInput{}, + func(opts *xray.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), diff --git a/internal/service/xray/service_package_gen.go b/internal/service/xray/service_package_gen.go index 71fd0136436..cd8d7c85439 100644 --- a/internal/service/xray/service_package_gen.go +++ b/internal/service/xray/service_package_gen.go @@ -5,8 +5,8 @@ package xray import ( "context" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - xray_sdkv2 "github.com/aws/aws-sdk-go-v2/service/xray" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/xray" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" @@ -56,11 +56,11 @@ func (p *servicePackage) ServicePackageName() string { } // 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) (*xray_sdkv2.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*xray.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - return xray_sdkv2.NewFromConfig(cfg, - xray_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + return xray.NewFromConfig(cfg, + xray.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } diff --git a/internal/sweep/awsv1/skip.go b/internal/sweep/awsv1/skip.go deleted file mode 100644 index 16497392d3e..00000000000 --- a/internal/sweep/awsv1/skip.go +++ /dev/null @@ -1,92 +0,0 @@ -// Copyright (c) HashiCorp, Inc. -// SPDX-License-Identifier: MPL-2.0 - -package awsv1 - -import ( - "github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr" -) - -// Check sweeper API call error for reasons to skip sweeping -// These include missing API endpoints and unsupported API calls -func SkipSweepError(err error) bool { - // Ignore missing API endpoints for AWS SDK for Go v1 - if tfawserr.ErrMessageContains(err, "RequestError", "send request failed") { - return true - } - - // GovCloud has endpoints that respond with (no message provided): - // AccessDeniedException: - // Since acceptance test sweepers are best effort and this response is very common, - // we allow bypassing this error globally instead of individual test sweeper fixes. - if tfawserr.ErrCodeEquals(err, "AccessDeniedException") { - return true - } - // Example: BadRequestException: vpc link not supported for region us-gov-west-1 - if tfawserr.ErrMessageContains(err, "BadRequestException", "not supported") { - return true - } - // Example: InvalidAction: InvalidAction: Operation (ListPlatformApplications) is not supported in this region - if tfawserr.ErrMessageContains(err, "InvalidAction", "is not supported") { - return true - } - // Example: InvalidAction: The action DescribeTransitGatewayAttachments is not valid for this web service - if tfawserr.ErrMessageContains(err, "InvalidAction", "is not valid") { - return true - } - // For example from GovCloud SES.SetActiveReceiptRuleSet. - if tfawserr.ErrMessageContains(err, "InvalidAction", "Unavailable Operation") { - return true - } - // For example from us-west-2 Route53 key signing key - if tfawserr.ErrMessageContains(err, "InvalidKeySigningKeyStatus", "cannot be deleted because") { - return true - } - // InvalidParameterValue: Access Denied to API Version: APIGlobalDatabases - if tfawserr.ErrMessageContains(err, "InvalidParameterValue", "Access Denied to API Version") { - return true - } - // Ignore more unsupported API calls - // InvalidParameterValue: Use of cache security groups is not permitted in this API version for your account. - if tfawserr.ErrMessageContains(err, "InvalidParameterValue", "not permitted in this API version for your account") { - return true - } - // For example from us-gov-west-1 MemoryDB cluster - if tfawserr.ErrMessageContains(err, "InvalidParameterValueException", "Access Denied to API Version") { - return true - } - // For example from us-west-2 Route53 zone - if tfawserr.ErrMessageContains(err, "KeySigningKeyInParentDSRecord", "Due to DNS lookup failure") { - return true - } - // For example from us-gov-east-1 IoT domain configuration - if tfawserr.ErrMessageContains(err, "UnauthorizedException", "API is not available in") { - return true - } - // For example from us-gov-west-1 EventBridge archive - if tfawserr.ErrMessageContains(err, "UnknownOperationException", "Operation is disabled in this region") { - return true - } - // For example from us-east-1 SageMaker - if tfawserr.ErrMessageContains(err, "UnknownOperationException", "The requested operation is not supported in the called region") { - return true - } - // For example from us-west-2 ECR public repository - if tfawserr.ErrMessageContains(err, "UnsupportedCommandException", "command is only supported in") { - return true - } - // Ignore unsupported API calls - if tfawserr.ErrCodeEquals(err, "UnsupportedOperation") { - return true - } - // For example from us-west-1 EMR studio - if tfawserr.ErrMessageContains(err, "ValidationException", "Account is not whitelisted to use this feature") { - return true - } - // For example from us-west-2 SageMaker device fleet - if tfawserr.ErrMessageContains(err, "ValidationException", "We are retiring Amazon Sagemaker Edge") { - return true - } - - return false -} diff --git a/names/data/names_data.hcl b/names/data/names_data.hcl index 985bf531d03..16f5a38e8fd 100644 --- a/names/data/names_data.hcl +++ b/names/data/names_data.hcl @@ -630,7 +630,7 @@ service "appstream" { endpoint_info { endpoint_api_call = "ListAssociatedFleets" - endpoint_api_params = "StackName: aws_sdkv2.String(\"test\")" + endpoint_api_params = "StackName: aws.String(\"test\")" } resource_prefix { @@ -1346,7 +1346,7 @@ service "cloudformation" { endpoint_info { endpoint_api_call = "ListStackInstances" - endpoint_api_params = "StackSetName: aws_sdkv2.String(\"test\")" + endpoint_api_params = "StackSetName: aws.String(\"test\")" } resource_prefix { @@ -1403,7 +1403,7 @@ service "cloudfrontkeyvaluestore" { endpoint_info { endpoint_api_call = "ListKeys" - endpoint_api_params = "KvsARN: aws_sdkv2.String(\"arn:aws:cloudfront::111122223333:key-value-store/MaxAge\")" + endpoint_api_params = "KvsARN: aws.String(\"arn:aws:cloudfront::111122223333:key-value-store/MaxAge\")" } resource_prefix { @@ -2036,7 +2036,7 @@ service "cognitoidentity" { endpoint_info { endpoint_api_call = "ListIdentityPools" - endpoint_api_params = "MaxResults: aws_sdkv2.Int32(1)" + endpoint_api_params = "MaxResults: aws.Int32(1)" } resource_prefix { @@ -2076,7 +2076,7 @@ service "cognitoidp" { endpoint_info { endpoint_api_call = "ListUserPools" - endpoint_api_params = "MaxResults: aws_sdkv2.Int32(1)" + endpoint_api_params = "MaxResults: aws.Int32(1)" } resource_prefix { @@ -3758,7 +3758,7 @@ service "fms" { endpoint_info { endpoint_api_call = "ListAppsLists" - endpoint_api_params = "MaxResults: aws_sdkv2.Int32(1)" + endpoint_api_params = "MaxResults: aws.Int32(1)" } resource_prefix { @@ -6797,7 +6797,7 @@ service "quicksight" { endpoint_info { endpoint_api_call = "ListDashboards" - endpoint_api_params = "AwsAccountId: aws_sdkv2.String(\"123456789012\")" + endpoint_api_params = "AwsAccountId: aws.String(\"123456789012\")" } resource_prefix { @@ -6999,7 +6999,7 @@ service "redshiftdata" { endpoint_info { endpoint_api_call = "ListDatabases" - endpoint_api_params = "Database: aws_sdkv2.String(\"test\")" + endpoint_api_params = "Database: aws.String(\"test\")" } resource_prefix { @@ -7735,6 +7735,7 @@ service "simpledb" { client { go_v1_client_typename = "SimpleDB" + skip_client_generate = true } endpoint_info { @@ -8369,7 +8370,7 @@ service "sso" { endpoint_info { endpoint_api_call = "ListAccounts" - endpoint_api_params = "AccessToken: aws_sdkv2.String(\"mock-access-token\")" + endpoint_api_params = "AccessToken: aws.String(\"mock-access-token\")" endpoint_only = true } @@ -8427,7 +8428,7 @@ service "identitystore" { endpoint_info { endpoint_api_call = "ListUsers" - endpoint_api_params = "IdentityStoreId: aws_sdkv2.String(\"d-1234567890\")" + endpoint_api_params = "IdentityStoreId: aws.String(\"d-1234567890\")" } resource_prefix { @@ -8907,7 +8908,7 @@ service "budgets" { endpoint_info { endpoint_api_call = "DescribeBudgets" - endpoint_api_params = "AccountId: aws_sdkv2.String(\"012345678901\")" + endpoint_api_params = "AccountId: aws.String(\"012345678901\")" } resource_prefix { diff --git a/names/names.go b/names/names.go index 4f96482fb16..3a5970179a5 100644 --- a/names/names.go +++ b/names/names.go @@ -19,7 +19,6 @@ import ( "fmt" "log" "slices" - "strings" "github.com/hashicorp/terraform-provider-aws/names/data" ) @@ -356,17 +355,6 @@ func PartitionForRegion(region string) string { } } -// ReverseDNS switches a DNS hostname to reverse DNS and vice-versa. -func ReverseDNS(hostname string) string { - parts := strings.Split(hostname, ".") - - for i, j := 0, len(parts)-1; i < j; i, j = i+1, j-1 { - parts[i], parts[j] = parts[j], parts[i] - } - - return strings.Join(parts, ".") -} - // Type ServiceDatum corresponds closely to attributes and blocks in `data/names_data.hcl` and are // described in detail in README.md. type serviceDatum struct { diff --git a/names/names_test.go b/names/names_test.go index c1865827952..c9f1037a81d 100644 --- a/names/names_test.go +++ b/names/names_test.go @@ -149,52 +149,6 @@ func TestPartitionForRegion(t *testing.T) { } } -func TestReverseDNS(t *testing.T) { - t.Parallel() - - testCases := []struct { - name string - input string - expected string - }{ - { - name: "empty", - input: "", - expected: "", - }, - { - name: "amazonaws.com", - input: "amazonaws.com", - expected: "com.amazonaws", - }, - { - name: "amazonaws.com.cn", - input: "amazonaws.com.cn", - expected: "cn.com.amazonaws", - }, - { - name: "sc2s.sgov.gov", - input: "sc2s.sgov.gov", - expected: "gov.sgov.sc2s", - }, - { - name: "c2s.ic.gov", - input: "c2s.ic.gov", - expected: "gov.ic.c2s", - }, - } - - for _, testCase := range testCases { - t.Run(testCase.name, func(t *testing.T) { - t.Parallel() - - if got, want := ReverseDNS(testCase.input), testCase.expected; got != want { - t.Errorf("got: %s, expected: %s", got, want) - } - }) - } -} - func TestProviderPackageForAlias(t *testing.T) { t.Parallel()