From 1a9fb31ca08176641b02bfe6199412b173e32f9d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 18 Oct 2024 16:29:21 -0400 Subject: [PATCH 001/981] conns.AWSClient: Add 'AwsSession' method. Don't set 'session' key in API client config map. --- internal/conns/awsclient.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/internal/conns/awsclient.go b/internal/conns/awsclient.go index a519121ae5b..42b7c20a950 100644 --- a/internal/conns/awsclient.go +++ b/internal/conns/awsclient.go @@ -67,6 +67,10 @@ func (c *AWSClient) AwsConfig(context.Context) aws_sdkv2.Config { // nosemgrep:c return c.awsConfig.Copy() } +func (c *AWSClient) AwsSession(context.Context) *session_sdkv1.Session { // nosemgrep:ci.aws-in-func-name + return c.session.Copy() +} + // 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. @@ -233,7 +237,6 @@ func (c *AWSClient) apiClientConfig(ctx context.Context, servicePackageName stri "aws_sdkv2_config": c.awsConfig, "endpoint": c.resolveEndpoint(ctx, servicePackageName), "partition": c.Partition, - "session": c.session, } switch servicePackageName { case names.S3: From 053caaca405c604938c3f494aaf8d97d4283cfb2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 18 Oct 2024 16:30:43 -0400 Subject: [PATCH 002/981] generate/resolveendpoints: 'resolveEndpoint' -> 'ResolveEndpoint'. --- internal/generate/resolveendpoints/template.go.gtpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/generate/resolveendpoints/template.go.gtpl b/internal/generate/resolveendpoints/template.go.gtpl index cb280a1eb1e..0f004e6966e 100644 --- a/internal/generate/resolveendpoints/template.go.gtpl +++ b/internal/generate/resolveendpoints/template.go.gtpl @@ -12,7 +12,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws" ) -func (c *AWSClient) resolveEndpoint(ctx context.Context, servicePackageName string) string { +func (c *AWSClient) ResolveEndpoint(ctx context.Context, servicePackageName string) string { endpoint := c.endpoints[servicePackageName] if endpoint != "" { return endpoint From ab61b2660cc2729f57d48ef44ae16087282dfbad Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 18 Oct 2024 16:32:14 -0400 Subject: [PATCH 003/981] internal/conns: 'make gen'. --- internal/conns/awsclient.go | 2 +- internal/conns/awsclient_resolveendpoint_gen.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/conns/awsclient.go b/internal/conns/awsclient.go index 42b7c20a950..797695ad0bf 100644 --- a/internal/conns/awsclient.go +++ b/internal/conns/awsclient.go @@ -235,7 +235,7 @@ func convertIPToDashIP(ip string) string { func (c *AWSClient) apiClientConfig(ctx context.Context, servicePackageName string) map[string]any { m := map[string]any{ "aws_sdkv2_config": c.awsConfig, - "endpoint": c.resolveEndpoint(ctx, servicePackageName), + "endpoint": c.ResolveEndpoint(ctx, servicePackageName), "partition": c.Partition, } switch servicePackageName { diff --git a/internal/conns/awsclient_resolveendpoint_gen.go b/internal/conns/awsclient_resolveendpoint_gen.go index 539381e2a34..799995874e6 100644 --- a/internal/conns/awsclient_resolveendpoint_gen.go +++ b/internal/conns/awsclient_resolveendpoint_gen.go @@ -12,7 +12,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws" ) -func (c *AWSClient) resolveEndpoint(ctx context.Context, servicePackageName string) string { +func (c *AWSClient) ResolveEndpoint(ctx context.Context, servicePackageName string) string { endpoint := c.endpoints[servicePackageName] if endpoint != "" { return endpoint From 7526dd74c7820ad3ca564a7d37430f791528722e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 18 Oct 2024 16:47:30 -0400 Subject: [PATCH 004/981] generate/servicepackage: Remove AWS SDK for Go v1 endpoint resolver generation. --- .../servicepackage/endpoint_resolver.go.gtpl | 74 ------------------ internal/generate/servicepackage/main.go | 12 +-- .../simpledb/service_endpoint_resolver_gen.go | 76 ------------------- 3 files changed, 6 insertions(+), 156 deletions(-) delete mode 100644 internal/service/simpledb/service_endpoint_resolver_gen.go diff --git a/internal/generate/servicepackage/endpoint_resolver.go.gtpl b/internal/generate/servicepackage/endpoint_resolver.go.gtpl index bdc4c6e3294..3e21637f700 100644 --- a/internal/generate/servicepackage/endpoint_resolver.go.gtpl +++ b/internal/generate/servicepackage/endpoint_resolver.go.gtpl @@ -6,87 +6,14 @@ 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 }}" 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{} - -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...) -} -{{ end }} - -{{ if .ClientSDKV2 }} var _ {{ .GoV2Package }}_sdkv2.EndpointResolverV2 = resolverSDKv2{} type resolverSDKv2 struct { @@ -153,4 +80,3 @@ func withBaseEndpoint(endpoint string) func(*{{ .GoV2Package }}_sdkv2.Options) { } } } -{{ end }} diff --git a/internal/generate/servicepackage/main.go b/internal/generate/servicepackage/main.go index 9d2400a0eba..55054225c64 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() @@ -101,17 +101,17 @@ func main() { 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) } if err := d.Write(); err != nil { - g.Fatalf("generating file (%s): %s", endpointResolverFilenamne, err) + g.Fatalf("generating file (%s): %s", endpointResolverFilename, err) } } 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...) -} From 949f54dfd2acf6185b74a022d18d5f0bebba80a4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 18 Oct 2024 16:57:30 -0400 Subject: [PATCH 005/981] generate/servicepackage: Remove AWS SDK for Go v1 API client generation. --- internal/generate/servicepackage/file.gtpl | 30 ------------------- internal/generate/servicepackage/main.go | 17 ++++------- .../service/simpledb/service_package_gen.go | 22 -------------- names/data/names_data.hcl | 1 + 4 files changed, 7 insertions(+), 63 deletions(-) diff --git a/internal/generate/servicepackage/file.gtpl b/internal/generate/servicepackage/file.gtpl index 403cf19244b..0d000efc8d1 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 }} {{- end }} "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" @@ -129,27 +121,6 @@ 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)) @@ -159,7 +130,6 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( 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 55054225c64..0ce8754ce06 100644 --- a/internal/generate/servicepackage/main.go +++ b/internal/generate/servicepackage/main.go @@ -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,7 +92,7 @@ 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 { @@ -107,7 +105,7 @@ func main() { 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 { @@ -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/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/names/data/names_data.hcl b/names/data/names_data.hcl index 985bf531d03..d43091c6e14 100644 --- a/names/data/names_data.hcl +++ b/names/data/names_data.hcl @@ -7735,6 +7735,7 @@ service "simpledb" { client { go_v1_client_typename = "SimpleDB" + skip_client_generate = true } endpoint_info { From 7d736c9678b0b6b519117d152f15535f714a28b1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 18 Oct 2024 17:03:25 -0400 Subject: [PATCH 006/981] r/aws_simpledb_domain: Add and use 'simpleDBConn'. --- internal/service/simpledb/conn.go | 120 ++++++++++++++++++++++++++++ internal/service/simpledb/domain.go | 6 +- 2 files changed, 123 insertions(+), 3 deletions(-) create mode 100644 internal/service/simpledb/conn.go diff --git a/internal/service/simpledb/conn.go b/internal/service/simpledb/conn.go new file mode 100644 index 00000000000..b252da5dd27 --- /dev/null +++ b/internal/service/simpledb/conn.go @@ -0,0 +1,120 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 + +package simpledb + +import ( + "context" + "fmt" + "net" + "net/url" + + "github.com/aws/aws-sdk-go/aws" + endpoints_sdkv1 "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 { + 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 := c.ResolveEndpoint(ctx, servicePackageName); 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 +} + +// Copied from internal/service/simpledb/service_endpoint_resolver_gen.go. + +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 simpledb endpoint %q: %s", hostname, err) + return + } + } 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(), From c4feba502a9ddf3a5bde129f42bbfab24e088868 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 18 Oct 2024 17:07:19 -0400 Subject: [PATCH 007/981] generate/awsclient: Remove AWS SDK for Go v1 API client factory generation. --- internal/conns/awsclient.go | 62 --------------------------- internal/conns/awsclient_gen.go | 5 --- internal/generate/awsclient/file.gtpl | 10 ----- internal/generate/awsclient/main.go | 15 +++---- 4 files changed, 6 insertions(+), 86 deletions(-) diff --git a/internal/conns/awsclient.go b/internal/conns/awsclient.go index 797695ad0bf..1c3e537cd3a 100644 --- a/internal/conns/awsclient.go +++ b/internal/conns/awsclient.go @@ -278,68 +278,6 @@ func resolveServiceBaseEndpoint(ctx context.Context, sdkID string, configs []any 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..61f1570eead 100644 --- a/internal/conns/awsclient_gen.go +++ b/internal/conns/awsclient_gen.go @@ -247,7 +247,6 @@ import ( 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/hashicorp/terraform-provider-aws/internal/errs" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -1160,10 +1159,6 @@ 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) 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_sdkv2.Client { return errs.Must(client[*storagegateway_sdkv2.Client](ctx, c, names.StorageGateway, make(map[string]any))) } diff --git a/internal/generate/awsclient/file.gtpl b/internal/generate/awsclient/file.gtpl index 900b3e65b09..00ae28a2ca7 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 }} {{- 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))) -} - {{- 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) } From ca90a4d8cb00785a761d6e2f4744063ba38c71c2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 18 Oct 2024 17:12:54 -0400 Subject: [PATCH 008/981] generate/serviceendpointtests: Skip 'simpledb'. --- .../generate/serviceendpointtests/main.go | 1 + internal/service/simpledb/domain_test.go | 4 +- internal/service/simpledb/exports_test.go | 1 + .../simpledb/service_endpoints_gen_test.go | 592 ------------------ internal/service/simpledb/sweep.go | 2 +- 5 files changed, 5 insertions(+), 595 deletions(-) delete mode 100644 internal/service/simpledb/service_endpoints_gen_test.go diff --git a/internal/generate/serviceendpointtests/main.go b/internal/generate/serviceendpointtests/main.go index a4a8a71c480..8a56146d69f 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 } 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..d3fd4aa4738 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 ) 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/sweep.go b/internal/service/simpledb/sweep.go index 7d08b2ff175..4de411247c4 100644 --- a/internal/service/simpledb/sweep.go +++ b/internal/service/simpledb/sweep.go @@ -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) From 5884f9b4deff01bf1b0d2841ed4b35bfbc6f0e30 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 18 Oct 2024 17:14:43 -0400 Subject: [PATCH 009/981] Acceptance test output: % make testacc TESTARGS='-run=TestAccSimpleDBDomain_' PKG=simpledb make: Verifying source code with gofmt... ==> Checking that code complies with gofmt requirements... TF_ACC=1 go1.23.2 test ./internal/service/simpledb/... -v -count 1 -parallel 20 -run=TestAccSimpleDBDomain_ -timeout 360m 2024/10/18 17:14:03 Initializing Terraform AWS Provider... === RUN TestAccSimpleDBDomain_basic === PAUSE TestAccSimpleDBDomain_basic === RUN TestAccSimpleDBDomain_disappears === PAUSE TestAccSimpleDBDomain_disappears === RUN TestAccSimpleDBDomain_MigrateFromPluginSDK === PAUSE TestAccSimpleDBDomain_MigrateFromPluginSDK === CONT TestAccSimpleDBDomain_basic === CONT TestAccSimpleDBDomain_MigrateFromPluginSDK === CONT TestAccSimpleDBDomain_disappears --- PASS: TestAccSimpleDBDomain_disappears (11.17s) --- PASS: TestAccSimpleDBDomain_basic (12.84s) --- PASS: TestAccSimpleDBDomain_MigrateFromPluginSDK (26.76s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/simpledb 32.142s From af18c136da81d32f9d2635bba5213e40b760e746 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 07:55:48 -0400 Subject: [PATCH 010/981] Run 'make gen'. --- .teamcity/scripts/provider_tests/acceptance_tests.sh | 1 + .teamcity/scripts/provider_tests/unit_tests.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/.teamcity/scripts/provider_tests/acceptance_tests.sh b/.teamcity/scripts/provider_tests/acceptance_tests.sh index 86f8286a2d5..ef24a29fce4 100644 --- a/.teamcity/scripts/provider_tests/acceptance_tests.sh +++ b/.teamcity/scripts/provider_tests/acceptance_tests.sh @@ -45,6 +45,7 @@ TF_ACC=1 go test \ ./internal/framework/... \ ./internal/function/... \ ./internal/generate/... \ + ./internal/iam/... \ ./internal/io/... \ ./internal/json/... \ ./internal/logging/... \ diff --git a/.teamcity/scripts/provider_tests/unit_tests.sh b/.teamcity/scripts/provider_tests/unit_tests.sh index 23126fc25d4..0aef6b0239a 100644 --- a/.teamcity/scripts/provider_tests/unit_tests.sh +++ b/.teamcity/scripts/provider_tests/unit_tests.sh @@ -17,6 +17,7 @@ go test \ ./internal/framework/... \ ./internal/function/... \ ./internal/generate/... \ + ./internal/iam/... \ ./internal/io/... \ ./internal/json/... \ ./internal/logging/... \ From 4bf135349d674d0dab9144b7b6b79c07f8c973fe Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 08:31:08 -0400 Subject: [PATCH 011/981] Fix golangci-lint 'containedctx'. --- internal/service/simpledb/conn.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/simpledb/conn.go b/internal/service/simpledb/conn.go index b252da5dd27..f839cb01203 100644 --- a/internal/service/simpledb/conn.go +++ b/internal/service/simpledb/conn.go @@ -60,7 +60,7 @@ func simpleDBConn(ctx context.Context, c *conns.AWSClient) *simpledb.SimpleDB { var _ endpoints_sdkv1.Resolver = resolverSDKv1{} type resolverSDKv1 struct { - ctx context.Context + ctx context.Context //nolint:containedctx // Was in generated code } func newEndpointResolverSDKv1(ctx context.Context) resolverSDKv1 { From dcef15e8dd4d15a51d4d7f3112980d5f674ca5b1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 08:31:52 -0400 Subject: [PATCH 012/981] Remove 'Copy' from 'AWSClient.AwsSession'. --- internal/conns/awsclient.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/conns/awsclient.go b/internal/conns/awsclient.go index 1c3e537cd3a..f3bf94e8b42 100644 --- a/internal/conns/awsclient.go +++ b/internal/conns/awsclient.go @@ -68,7 +68,7 @@ func (c *AWSClient) AwsConfig(context.Context) aws_sdkv2.Config { // nosemgrep:c } func (c *AWSClient) AwsSession(context.Context) *session_sdkv1.Session { // nosemgrep:ci.aws-in-func-name - return c.session.Copy() + return c.session } // PartitionHostname returns a hostname with the provider domain suffix for the partition From c0f9077b9a577248a5836e7d91fc22df9cdec3e3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 08:34:34 -0400 Subject: [PATCH 013/981] Fix golangci-lint 'nakedret'. --- internal/service/simpledb/conn.go | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/internal/service/simpledb/conn.go b/internal/service/simpledb/conn.go index f839cb01203..99e20c5a9bd 100644 --- a/internal/service/simpledb/conn.go +++ b/internal/service/simpledb/conn.go @@ -10,7 +10,7 @@ import ( "net/url" "github.com/aws/aws-sdk-go/aws" - endpoints_sdkv1 "github.com/aws/aws-sdk-go/aws/endpoints" + "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" @@ -57,7 +57,7 @@ func simpleDBConn(ctx context.Context, c *conns.AWSClient) *simpledb.SimpleDB { // Copied from internal/service/simpledb/service_endpoint_resolver_gen.go. -var _ endpoints_sdkv1.Resolver = resolverSDKv1{} +var _ endpoints.Resolver = resolverSDKv1{} type resolverSDKv1 struct { ctx context.Context //nolint:containedctx // Was in generated code @@ -69,20 +69,20 @@ func newEndpointResolverSDKv1(ctx context.Context) resolverSDKv1 { } } -func (r resolverSDKv1) EndpointFor(service, region string, opts ...func(*endpoints_sdkv1.Options)) (endpoint endpoints_sdkv1.ResolvedEndpoint, err error) { +func (r resolverSDKv1) EndpointFor(service, region string, opts ...func(*endpoints.Options)) (endpoints.ResolvedEndpoint, error) { ctx := r.ctx - var opt endpoints_sdkv1.Options + var opt endpoints.Options opt.Set(opts...) - useFIPS := opt.UseFIPSEndpoint == endpoints_sdkv1.FIPSEndpointStateEnabled + useFIPS := opt.UseFIPSEndpoint == endpoints.FIPSEndpointStateEnabled - defaultResolver := endpoints_sdkv1.DefaultResolver() + defaultResolver := endpoints.DefaultResolver() if useFIPS { ctx = tflog.SetField(ctx, "tf_aws.use_fips", useFIPS) - endpoint, err = defaultResolver.EndpointFor(service, region, opts...) + endpoint, err := defaultResolver.EndpointFor(service, region, opts...) if err != nil { return endpoint, err } @@ -104,12 +104,12 @@ func (r resolverSDKv1) EndpointFor(service, region string, opts ...func(*endpoin 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 + opts = append(opts, func(o *endpoints.Options) { + o.UseFIPSEndpoint = endpoints.FIPSEndpointStateDisabled }) } else { - err = fmt.Errorf("looking up simpledb endpoint %q: %s", hostname, err) - return + err := fmt.Errorf("looking up simpledb endpoint %q: %s", hostname, err) + return endpoints.ResolvedEndpoint{}, err } } else { return endpoint, err From cf037ee7d915387c073457b41cc7dd726d4bcdce Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 08:35:58 -0400 Subject: [PATCH 014/981] Fix semgrep 'ci.simpledb-in-func-name'. --- internal/service/simpledb/conn.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/simpledb/conn.go b/internal/service/simpledb/conn.go index 99e20c5a9bd..3df46a3339e 100644 --- a/internal/service/simpledb/conn.go +++ b/internal/service/simpledb/conn.go @@ -27,7 +27,7 @@ var ( // 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 { +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) From fb88c0ace8f927c819ca87647cf0e3034d8d9242 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 08:36:29 -0400 Subject: [PATCH 015/981] Fix semgrep 'ci.simpledb-in-var-name'. --- internal/service/simpledb/exports_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/simpledb/exports_test.go b/internal/service/simpledb/exports_test.go index d3fd4aa4738..b99d616fbfa 100644 --- a/internal/service/simpledb/exports_test.go +++ b/internal/service/simpledb/exports_test.go @@ -8,5 +8,5 @@ var ( ResourceDomain = newDomainResource FindDomainByName = findDomainByName - SimpleDBConn = simpleDBConn + SimpleDBConn = simpleDBConn // nosemgrep:ci.simpledb-in-var-name ) From 0ce9582ac040150694f1fbe8d0f3edb1b9d34a44 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 10:15:08 -0400 Subject: [PATCH 016/981] Add 'AWSClient.Endpoints()'. --- internal/conns/awsclient.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/internal/conns/awsclient.go b/internal/conns/awsclient.go index f3bf94e8b42..16087e7997f 100644 --- a/internal/conns/awsclient.go +++ b/internal/conns/awsclient.go @@ -67,10 +67,15 @@ func (c *AWSClient) AwsConfig(context.Context) aws_sdkv2.Config { // nosemgrep:c 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. @@ -232,10 +237,10 @@ func convertIPToDashIP(ip string) string { } // 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, } switch servicePackageName { From b8a99b911c1659d4990730dd4d12077d464b1dfa Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 10:15:43 -0400 Subject: [PATCH 017/981] simpledb: Package local endpoint resolution. --- internal/service/simpledb/conn.go | 57 ++++++++++++++++++++++++++++++- 1 file changed, 56 insertions(+), 1 deletion(-) diff --git a/internal/service/simpledb/conn.go b/internal/service/simpledb/conn.go index 3df46a3339e..c07b8f62d4c 100644 --- a/internal/service/simpledb/conn.go +++ b/internal/service/simpledb/conn.go @@ -8,7 +8,9 @@ import ( "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" @@ -41,7 +43,7 @@ func simpleDBConn(ctx context.Context, c *conns.AWSClient) *simpledb.SimpleDB { cfg := aws.Config{} - if endpoint := c.ResolveEndpoint(ctx, servicePackageName); endpoint != "" { + if endpoint := resolveEndpoint(ctx, c); endpoint != "" { tflog.Debug(ctx, "setting endpoint", map[string]any{ "tf_aws.endpoint": endpoint, }) @@ -55,6 +57,59 @@ func simpleDBConn(ctx context.Context, c *conns.AWSClient) *simpledb.SimpleDB { 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{} From f4668ce34e72ba6644e6fca41d322f50ea25d209 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 10:18:15 -0400 Subject: [PATCH 018/981] internal/conns: Remove AWS SDK for Go v1 endpoint resolution. --- internal/conns/awsclient.go | 25 ------- .../conns/awsclient_resolveendpoint_gen.go | 43 ------------ internal/conns/generate.go | 1 - internal/generate/resolveendpoints/main.go | 67 ------------------- .../resolveendpoints/template.go.gtpl | 43 ------------ 5 files changed, 179 deletions(-) delete mode 100644 internal/conns/awsclient_resolveendpoint_gen.go delete mode 100644 internal/generate/resolveendpoints/main.go delete mode 100644 internal/generate/resolveendpoints/template.go.gtpl diff --git a/internal/conns/awsclient.go b/internal/conns/awsclient.go index 16087e7997f..3d27fceb2c1 100644 --- a/internal/conns/awsclient.go +++ b/internal/conns/awsclient.go @@ -13,7 +13,6 @@ import ( "sync" aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" - config_sdkv2 "github.com/aws/aws-sdk-go-v2/config" apigatewayv2_types "github.com/aws/aws-sdk-go-v2/service/apigatewayv2/types" s3_sdkv2 "github.com/aws/aws-sdk-go-v2/service/s3" session_sdkv1 "github.com/aws/aws-sdk-go/aws/session" @@ -259,30 +258,6 @@ func (c *AWSClient) apiClientConfig(_ context.Context, servicePackageName string 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 -} - // 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_resolveendpoint_gen.go b/internal/conns/awsclient_resolveendpoint_gen.go deleted file mode 100644 index 799995874e6..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/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/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 0f004e6966e..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 -} From a2c28e4eeaf02a753ce0e7ecf13108231835140f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 13:29:45 -0400 Subject: [PATCH 019/981] Fix golangci-lint 'ineffassign'. --- internal/service/simpledb/conn.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/simpledb/conn.go b/internal/service/simpledb/conn.go index c07b8f62d4c..42643163fb3 100644 --- a/internal/service/simpledb/conn.go +++ b/internal/service/simpledb/conn.go @@ -66,7 +66,7 @@ func resolveEndpoint(ctx context.Context, c *conns.AWSClient) string { return endpoint } - endpoint = aws.StringValue(c.AwsConfig(ctx).BaseEndpoint) + //endpoint = aws.StringValue(c.AwsConfig(ctx).BaseEndpoint) svc := os.Getenv("AWS_ENDPOINT_URL_SIMPLEDB") if svc != "" { return svc From dab2feb4d429dd5d7777643af59135fe47cc4cad Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 13:58:57 -0400 Subject: [PATCH 020/981] Run 'make gen'. --- .teamcity/scripts/provider_tests/acceptance_tests.sh | 1 - .teamcity/scripts/provider_tests/unit_tests.sh | 1 - 2 files changed, 2 deletions(-) diff --git a/.teamcity/scripts/provider_tests/acceptance_tests.sh b/.teamcity/scripts/provider_tests/acceptance_tests.sh index ef24a29fce4..86f8286a2d5 100644 --- a/.teamcity/scripts/provider_tests/acceptance_tests.sh +++ b/.teamcity/scripts/provider_tests/acceptance_tests.sh @@ -45,7 +45,6 @@ TF_ACC=1 go test \ ./internal/framework/... \ ./internal/function/... \ ./internal/generate/... \ - ./internal/iam/... \ ./internal/io/... \ ./internal/json/... \ ./internal/logging/... \ diff --git a/.teamcity/scripts/provider_tests/unit_tests.sh b/.teamcity/scripts/provider_tests/unit_tests.sh index 0aef6b0239a..23126fc25d4 100644 --- a/.teamcity/scripts/provider_tests/unit_tests.sh +++ b/.teamcity/scripts/provider_tests/unit_tests.sh @@ -17,7 +17,6 @@ go test \ ./internal/framework/... \ ./internal/function/... \ ./internal/generate/... \ - ./internal/iam/... \ ./internal/io/... \ ./internal/json/... \ ./internal/logging/... \ From 12dd3ef6e3f6dc224478e64ce5a358b2e1f23c8b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 15:12:18 -0400 Subject: [PATCH 021/981] internal/generate/awsclient: No need to generate import aliases. --- internal/conns/awsclient_gen.go | 1458 ++++++++++++------------- internal/generate/awsclient/file.gtpl | 6 +- 2 files changed, 732 insertions(+), 732 deletions(-) diff --git a/internal/conns/awsclient_gen.go b/internal/conns/awsclient_gen.go index 61f1570eead..58cc7034cbb 100644 --- a/internal/conns/awsclient_gen.go +++ b/internal/conns/awsclient_gen.go @@ -4,1221 +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" + "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) 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) StorageGatewayClient(ctx context.Context) *storagegateway.Client { + return errs.Must(client[*storagegateway.Client](ctx, c, names.StorageGateway, 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) SyntheticsClient(ctx context.Context) *synthetics.Client { + return errs.Must(client[*synthetics.Client](ctx, c, names.Synthetics, 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) TimestreamInfluxDBClient(ctx context.Context) *timestreaminfluxdb.Client { + return errs.Must(client[*timestreaminfluxdb.Client](ctx, c, names.TimestreamInfluxDB, 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) TimestreamWriteClient(ctx context.Context) *timestreamwrite.Client { + return errs.Must(client[*timestreamwrite.Client](ctx, c, names.TimestreamWrite, 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) TranscribeClient(ctx context.Context) *transcribe.Client { + return errs.Must(client[*transcribe.Client](ctx, c, names.Transcribe, 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) TransferClient(ctx context.Context) *transfer.Client { + return errs.Must(client[*transfer.Client](ctx, c, names.Transfer, 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) VPCLatticeClient(ctx context.Context) *vpclattice.Client { + return errs.Must(client[*vpclattice.Client](ctx, c, names.VPCLattice, 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) VerifiedPermissionsClient(ctx context.Context) *verifiedpermissions.Client { + return errs.Must(client[*verifiedpermissions.Client](ctx, c, names.VerifiedPermissions, 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) WAFClient(ctx context.Context) *waf.Client { + return errs.Must(client[*waf.Client](ctx, c, names.WAF, 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) WAFRegionalClient(ctx context.Context) *wafregional.Client { + return errs.Must(client[*wafregional.Client](ctx, c, names.WAFRegional, 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) WAFV2Client(ctx context.Context) *wafv2.Client { + return errs.Must(client[*wafv2.Client](ctx, c, names.WAFV2, 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) WellArchitectedClient(ctx context.Context) *wellarchitected.Client { + return errs.Must(client[*wellarchitected.Client](ctx, c, names.WellArchitected, 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) WorkLinkClient(ctx context.Context) *worklink.Client { + return errs.Must(client[*worklink.Client](ctx, c, names.WorkLink, 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) WorkSpacesClient(ctx context.Context) *workspaces.Client { + return errs.Must(client[*workspaces.Client](ctx, c, names.WorkSpaces, 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) WorkSpacesWebClient(ctx context.Context) *workspacesweb.Client { + return errs.Must(client[*workspacesweb.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/generate/awsclient/file.gtpl b/internal/generate/awsclient/file.gtpl index 00ae28a2ca7..d85cf2ec5a8 100644 --- a/internal/generate/awsclient/file.gtpl +++ b/internal/generate/awsclient/file.gtpl @@ -5,14 +5,14 @@ import ( "context" {{ range .Services }} - {{ .GoPackage }}_sdkv2 "github.com/aws/aws-sdk-go-v2/service/{{ .GoPackage }}" + "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 }} -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))) +func (c *AWSClient) {{ .ProviderNameUpper }}Client(ctx context.Context) *{{ .GoPackage }}.Client { + return errs.Must(client[*{{ .GoPackage }}.Client](ctx, c, names.{{ .ProviderNameUpper }}, make(map[string]any))) } {{ end }} From f08aa9d054b156e13fce040b875b0f52d46e1e8a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 15:18:20 -0400 Subject: [PATCH 022/981] No need for import aliases. --- internal/conns/config.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 From 35b637d3b628e8c536e40d7aea8e8d8efb5d5a43 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 16:45:38 -0400 Subject: [PATCH 023/981] internal/generate/servicepackage: No need to generate import aliases. --- internal/generate/servicepackage/file.gtpl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/generate/servicepackage/file.gtpl b/internal/generate/servicepackage/file.gtpl index 0d000efc8d1..4ceef5bacf4 100644 --- a/internal/generate/servicepackage/file.gtpl +++ b/internal/generate/servicepackage/file.gtpl @@ -6,8 +6,8 @@ import ( "context" {{ if .GenerateClient }} - 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 }}" {{- end }} "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/types" @@ -122,11 +122,11 @@ func (p *servicePackage) ServicePackageName() string { {{- if .GenerateClient }} // 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 40687d1d0a2abe1116d3f0f952c48c85a479e772 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:07 -0400 Subject: [PATCH 024/981] No need for import aliases - accessanalyzer. --- .../service/accessanalyzer/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/accessanalyzer/service_package_gen.go b/internal/service/accessanalyzer/service_package_gen.go index 15dbaba5022..88ec16d3666 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 596203e54239b4f21b2677d346d4df3e57dc5373 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:08 -0400 Subject: [PATCH 025/981] No need for import aliases - account. --- internal/service/account/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/account/service_package_gen.go b/internal/service/account/service_package_gen.go index 56a0e7b1589..989446bf6a2 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From fecb059dd11ee4d0cae3567412d913bcab0b2e3e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:08 -0400 Subject: [PATCH 026/981] No need for import aliases - acm. --- internal/service/acm/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/acm/service_package_gen.go b/internal/service/acm/service_package_gen.go index d76d5533294..4e7c6f6509b 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 3d2ec9a25a0409e55ff51116f6b1dd1ed0cdee63 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:08 -0400 Subject: [PATCH 027/981] No need for import aliases - acmpca. --- internal/service/acmpca/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/acmpca/service_package_gen.go b/internal/service/acmpca/service_package_gen.go index 0673ef94f28..b5c886c9a27 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 688da45ed5d5c70555136c05f2b96c2d670472ee Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:08 -0400 Subject: [PATCH 028/981] No need for import aliases - amp. --- internal/service/amp/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/amp/service_package_gen.go b/internal/service/amp/service_package_gen.go index 8c8000a7063..cbff1e940a9 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From b70a8dcbb2cdc96bdee523dc1b4f3da865ba92c3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:08 -0400 Subject: [PATCH 029/981] No need for import aliases - amplify. --- internal/service/amplify/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/amplify/service_package_gen.go b/internal/service/amplify/service_package_gen.go index 8031aa179ce..7a2147a61eb 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 6572e738f81bee06fd016b00e235a65558524905 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:08 -0400 Subject: [PATCH 030/981] No need for import aliases - appautoscaling. --- .../service/appautoscaling/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/appautoscaling/service_package_gen.go b/internal/service/appautoscaling/service_package_gen.go index ff76ed4fb5c..a9a289cb37f 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From e82372f80fe721dc66da113fa9342118489dad6c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:08 -0400 Subject: [PATCH 031/981] No need for import aliases - appconfig. --- internal/service/appconfig/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/appconfig/service_package_gen.go b/internal/service/appconfig/service_package_gen.go index eb833c78857..44df11e5bc8 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From c002d0562c9da9c3023553ce7c34f611f504a0c7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:08 -0400 Subject: [PATCH 032/981] No need for import aliases - appfabric. --- internal/service/appfabric/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/appfabric/service_package_gen.go b/internal/service/appfabric/service_package_gen.go index 991cf4f9a11..77bc23b3ded 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From b99f9546a82035a2d5d0560689a8767592bd8240 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:08 -0400 Subject: [PATCH 033/981] No need for import aliases - appflow. --- internal/service/appflow/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/appflow/service_package_gen.go b/internal/service/appflow/service_package_gen.go index d14b92a0eae..4b3750992b1 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From c6b462975adc5bd751905e408a98c469d2b4d607 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:08 -0400 Subject: [PATCH 034/981] No need for import aliases - appintegrations. --- .../service/appintegrations/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/appintegrations/service_package_gen.go b/internal/service/appintegrations/service_package_gen.go index 471282a19b1..7d6d4cb5a62 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From bf187ee202032ae7d2ceb0b4a1fc7da742d60ae2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:09 -0400 Subject: [PATCH 035/981] No need for import aliases - applicationinsights. --- .../applicationinsights/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/applicationinsights/service_package_gen.go b/internal/service/applicationinsights/service_package_gen.go index e6692a10ee4..41b6fed4b80 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 9fc85fdfcb136e505a631d566181d3ac9294b22e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:09 -0400 Subject: [PATCH 036/981] No need for import aliases - applicationsignals. --- .../applicationsignals/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/applicationsignals/service_package_gen.go b/internal/service/applicationsignals/service_package_gen.go index de55458f7c8..46d78b1399e 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 32df0728b0409d13499f24168b8d506559025333 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:09 -0400 Subject: [PATCH 037/981] No need for import aliases - appmesh. --- internal/service/appmesh/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/appmesh/service_package_gen.go b/internal/service/appmesh/service_package_gen.go index f50857157a1..fe44bef921a 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From fc0964d27fc455a5b199b9b0e9e0bf17f2ddd773 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:09 -0400 Subject: [PATCH 038/981] No need for import aliases - apprunner. --- internal/service/apprunner/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/apprunner/service_package_gen.go b/internal/service/apprunner/service_package_gen.go index f4476eece9b..9fa99227a14 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From e2aa6f43b67dd2f6deac453cb3fb2b1d4e5b55df Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:09 -0400 Subject: [PATCH 039/981] No need for import aliases - appstream. --- internal/service/appstream/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/appstream/service_package_gen.go b/internal/service/appstream/service_package_gen.go index 8e004b4841a..981f1734c90 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 0dad1e82c642381fe0aade05e462ca717fc0d344 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:09 -0400 Subject: [PATCH 040/981] No need for import aliases - athena. --- internal/service/athena/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/athena/service_package_gen.go b/internal/service/athena/service_package_gen.go index c35211a04fa..50a13157c83 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From abecb78adc5d375569a59051639e0c26e87ee26f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:09 -0400 Subject: [PATCH 041/981] No need for import aliases - auditmanager. --- internal/service/auditmanager/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/auditmanager/service_package_gen.go b/internal/service/auditmanager/service_package_gen.go index 99ead68abd5..efdae722607 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 96b4d71554463ad4342a9db066a5ca1cf7810802 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:09 -0400 Subject: [PATCH 042/981] No need for import aliases - autoscaling. --- internal/service/autoscaling/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/autoscaling/service_package_gen.go b/internal/service/autoscaling/service_package_gen.go index 3eca5059adb..6f5e11aefe5 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 7de9e6211d34473469a695c9076d09923ee1b0e3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:09 -0400 Subject: [PATCH 043/981] No need for import aliases - autoscalingplans. --- .../service/autoscalingplans/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/autoscalingplans/service_package_gen.go b/internal/service/autoscalingplans/service_package_gen.go index f7153419f7c..a61c868c50d 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 9c4389dc89c2f4bda1386aad7a2edcd29a5fc9db Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:09 -0400 Subject: [PATCH 044/981] No need for import aliases - backup. --- internal/service/backup/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/backup/service_package_gen.go b/internal/service/backup/service_package_gen.go index 1423904c269..5039267dbf6 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 10c011a1534752850a2e4807f3987fbd153106c6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:09 -0400 Subject: [PATCH 045/981] No need for import aliases - batch. --- internal/service/batch/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/batch/service_package_gen.go b/internal/service/batch/service_package_gen.go index e94aa165d8e..fac160c33ad 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 795c097902803c0eb8fccb5f971acec262eeabb1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:10 -0400 Subject: [PATCH 046/981] No need for import aliases - bcmdataexports. --- .../service/bcmdataexports/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/bcmdataexports/service_package_gen.go b/internal/service/bcmdataexports/service_package_gen.go index 8d4ce2ea1e1..eebc3a3e71e 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From e45d9a815ee6e996b45949d0e59d92633a73f6cf Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:10 -0400 Subject: [PATCH 047/981] No need for import aliases - bedrock. --- internal/service/bedrock/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/bedrock/service_package_gen.go b/internal/service/bedrock/service_package_gen.go index a1edc6ece06..bd4ab015f18 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 7b3753496082a33ebf7a189db7cc34b6ff75f03b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:10 -0400 Subject: [PATCH 048/981] No need for import aliases - bedrockagent. --- internal/service/bedrockagent/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/bedrockagent/service_package_gen.go b/internal/service/bedrockagent/service_package_gen.go index eb90a11d2cf..a67782e020d 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From a1fea1022fdbd3e8b45d1ec859f764069f05be2d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:10 -0400 Subject: [PATCH 049/981] No need for import aliases - budgets. --- internal/service/budgets/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/budgets/service_package_gen.go b/internal/service/budgets/service_package_gen.go index aeb0e93b1d1..77d93d23df0 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 28ccc0ff3b07a9dc09ae4849a700bee727cf719b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:10 -0400 Subject: [PATCH 050/981] No need for import aliases - ce. --- internal/service/ce/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/ce/service_package_gen.go b/internal/service/ce/service_package_gen.go index 482009bfad6..792fe594504 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 5bd394d37b542fc5355743c8a645df378c291bcc Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:10 -0400 Subject: [PATCH 051/981] No need for import aliases - chime. --- internal/service/chime/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/chime/service_package_gen.go b/internal/service/chime/service_package_gen.go index e4c7d19dbf8..f3ce577fe30 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From ea613a50bd7a3abfa29f366a15016c603a4df72d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:10 -0400 Subject: [PATCH 052/981] No need for import aliases - chimesdkmediapipelines. --- .../chimesdkmediapipelines/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/chimesdkmediapipelines/service_package_gen.go b/internal/service/chimesdkmediapipelines/service_package_gen.go index 9ce8ac0b2d5..d70f8de8426 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 12c8da364c87ddf2bc1d83c699467094b3bb7ad8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:10 -0400 Subject: [PATCH 053/981] No need for import aliases - chimesdkvoice. --- .../service/chimesdkvoice/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/chimesdkvoice/service_package_gen.go b/internal/service/chimesdkvoice/service_package_gen.go index 40ba76b8aae..c4dc3464a8f 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From c671c1c23fe86836d83a75b43d9af0808d5d2845 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:10 -0400 Subject: [PATCH 054/981] No need for import aliases - cleanrooms. --- internal/service/cleanrooms/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/cleanrooms/service_package_gen.go b/internal/service/cleanrooms/service_package_gen.go index 2e32cee494b..6b7a32dab39 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 84374b98e88fdc08bac2d1a7a1d574292d741ada Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:10 -0400 Subject: [PATCH 055/981] No need for import aliases - cloud9. --- internal/service/cloud9/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/cloud9/service_package_gen.go b/internal/service/cloud9/service_package_gen.go index a0f0c583f6f..88b300eedbb 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 965c6723937c1c50b2b0894c81aa534a1e240014 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:10 -0400 Subject: [PATCH 056/981] No need for import aliases - cloudcontrol. --- internal/service/cloudcontrol/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/cloudcontrol/service_package_gen.go b/internal/service/cloudcontrol/service_package_gen.go index f6ec831ebf0..cf8d3f3caaa 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 5f5be332774478c24ad039585b91704c1890fdf1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:11 -0400 Subject: [PATCH 057/981] No need for import aliases - cloudfront. --- internal/service/cloudfront/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/cloudfront/service_package_gen.go b/internal/service/cloudfront/service_package_gen.go index 3f8995858ab..5e66e7a3ca9 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From b2e22ef1aec798449f8e00430d3ef36eddca76ee Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:11 -0400 Subject: [PATCH 058/981] No need for import aliases - cloudfrontkeyvaluestore. --- .../cloudfrontkeyvaluestore/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/cloudfrontkeyvaluestore/service_package_gen.go b/internal/service/cloudfrontkeyvaluestore/service_package_gen.go index 3411f7c1329..53261c0ab3d 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 037130ccce10d5b0d6e1c461438c838689fbea48 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:11 -0400 Subject: [PATCH 059/981] No need for import aliases - cloudsearch. --- internal/service/cloudsearch/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/cloudsearch/service_package_gen.go b/internal/service/cloudsearch/service_package_gen.go index 4a2aba2be6e..842edc1ddd4 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 977b05bf98c88b36dc642dc26d86854087bd7a53 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:11 -0400 Subject: [PATCH 060/981] No need for import aliases - cloudtrail. --- internal/service/cloudtrail/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/cloudtrail/service_package_gen.go b/internal/service/cloudtrail/service_package_gen.go index cf15b49f77a..3bd72c4566c 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From f5eba67f7b60c723bcb469fb0b572583e0823228 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:11 -0400 Subject: [PATCH 061/981] No need for import aliases - cloudwatch. --- internal/service/cloudwatch/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/cloudwatch/service_package_gen.go b/internal/service/cloudwatch/service_package_gen.go index 9a13c354e3d..288df904667 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From c80d3331bb33c7e35f3291352d6112e0f3e9fd0e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:11 -0400 Subject: [PATCH 062/981] No need for import aliases - codeartifact. --- internal/service/codeartifact/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/codeartifact/service_package_gen.go b/internal/service/codeartifact/service_package_gen.go index 168cacaca52..69bde6c84ae 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 803de1b557508846546212d579c978c215556eb6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:11 -0400 Subject: [PATCH 063/981] No need for import aliases - codebuild. --- internal/service/codebuild/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/codebuild/service_package_gen.go b/internal/service/codebuild/service_package_gen.go index ee483570cdb..e3bc77c8c63 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From f8547293e46c8975066c9e067b3166a6b8a66546 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:11 -0400 Subject: [PATCH 064/981] No need for import aliases - codecatalyst. --- internal/service/codecatalyst/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/codecatalyst/service_package_gen.go b/internal/service/codecatalyst/service_package_gen.go index 255fb7a8bc2..dff591d56e8 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 5fdfe14eb1a1d18ab93abe5c82679b0e0e23d7d5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:11 -0400 Subject: [PATCH 065/981] No need for import aliases - codecommit. --- internal/service/codecommit/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/codecommit/service_package_gen.go b/internal/service/codecommit/service_package_gen.go index 9a6c2d5f8de..200ed4ce1dc 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 33c7c5b00bb99328e171f988fb997969150c7519 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:11 -0400 Subject: [PATCH 066/981] No need for import aliases - codeconnections. --- .../service/codeconnections/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/codeconnections/service_package_gen.go b/internal/service/codeconnections/service_package_gen.go index 611dbef1be6..9e87d2469e6 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 23a56f63ec5277ac04e7ff8f0765948b7740c8a7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:11 -0400 Subject: [PATCH 067/981] No need for import aliases - codeguruprofiler. --- .../service/codeguruprofiler/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/codeguruprofiler/service_package_gen.go b/internal/service/codeguruprofiler/service_package_gen.go index 636daad2c35..ea31a362312 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From a4955d50748743e4a7dc6269fa9f7626fb24fcfd Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:12 -0400 Subject: [PATCH 068/981] No need for import aliases - codegurureviewer. --- .../service/codegurureviewer/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/codegurureviewer/service_package_gen.go b/internal/service/codegurureviewer/service_package_gen.go index 711ad2f4cfc..696fc33c08f 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 89089fff6e0a9ad476884b3f28459a0bd71259ae Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:12 -0400 Subject: [PATCH 069/981] No need for import aliases - codepipeline. --- internal/service/codepipeline/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/codepipeline/service_package_gen.go b/internal/service/codepipeline/service_package_gen.go index 6689d01acf1..df27edaec5e 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 84ec2731df73e68c0eb0c5c9718cad3075674bae Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:12 -0400 Subject: [PATCH 070/981] No need for import aliases - codestarconnections. --- .../codestarconnections/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/codestarconnections/service_package_gen.go b/internal/service/codestarconnections/service_package_gen.go index d61c0f7a43a..81331d83f7a 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From f85f7072848267a8be6aac68e1a4775f9c353b94 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:12 -0400 Subject: [PATCH 071/981] No need for import aliases - codestarnotifications. --- .../codestarnotifications/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/codestarnotifications/service_package_gen.go b/internal/service/codestarnotifications/service_package_gen.go index a63e77cce9a..02460a6a085 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 2ef6b847a7d9ca4e9ff1cee6d7cc3b07ff431a8a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:12 -0400 Subject: [PATCH 072/981] No need for import aliases - cognitoidentity. --- .../service/cognitoidentity/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/cognitoidentity/service_package_gen.go b/internal/service/cognitoidentity/service_package_gen.go index 75fe8908a20..7a2602b8e6b 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 8b80339eb37876632ea0b7696d4d386a5e0f2e44 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:12 -0400 Subject: [PATCH 073/981] No need for import aliases - cognitoidp. --- internal/service/cognitoidp/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/cognitoidp/service_package_gen.go b/internal/service/cognitoidp/service_package_gen.go index 7eee60355d9..49958975ce6 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From e71bcc40a9f72aeff96ac64cdf54463a2e56f049 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:12 -0400 Subject: [PATCH 074/981] No need for import aliases - comprehend. --- internal/service/comprehend/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/comprehend/service_package_gen.go b/internal/service/comprehend/service_package_gen.go index d2d1a692b49..a37cd837a05 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From e4a2b6fbb3e3b41cf4dab4f7a5475a3f2d1bdb1a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:12 -0400 Subject: [PATCH 075/981] No need for import aliases - computeoptimizer. --- .../service/computeoptimizer/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/computeoptimizer/service_package_gen.go b/internal/service/computeoptimizer/service_package_gen.go index 3f7ba40be62..e855d508ea5 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From b55cf6f2351c5d2eaab43ce1f835031d67dd6ae4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:12 -0400 Subject: [PATCH 076/981] No need for import aliases - configservice. --- .../service/configservice/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/configservice/service_package_gen.go b/internal/service/configservice/service_package_gen.go index fab6d043788..fd3647756bb 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 1b37c27081aa4b8e210c292db56733fb59d7a408 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:12 -0400 Subject: [PATCH 077/981] No need for import aliases - connect. --- internal/service/connect/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/connect/service_package_gen.go b/internal/service/connect/service_package_gen.go index 78b67079c91..13da0c16e13 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 9e63cbd996fcbfa79ea2e2fd340823400ad4a868 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:12 -0400 Subject: [PATCH 078/981] No need for import aliases - connectcases. --- internal/service/connectcases/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/connectcases/service_package_gen.go b/internal/service/connectcases/service_package_gen.go index 71e95edfac4..85feaec5ad5 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From c0cb0e33e05b47fab2fd91fd15e8f867de63e349 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:12 -0400 Subject: [PATCH 079/981] No need for import aliases - controltower. --- internal/service/controltower/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/controltower/service_package_gen.go b/internal/service/controltower/service_package_gen.go index f28e6f5de8c..b6d88d0a1d0 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 0394a11448d5d1f9fbb67ee477f3b28139715472 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:13 -0400 Subject: [PATCH 080/981] No need for import aliases - customerprofiles. --- .../service/customerprofiles/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/customerprofiles/service_package_gen.go b/internal/service/customerprofiles/service_package_gen.go index 13a4c11bdac..50638c071ca 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From e463bb259b3fab5534118257fa8cc898d8e0910d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:13 -0400 Subject: [PATCH 081/981] No need for import aliases - databrew. --- internal/service/databrew/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/databrew/service_package_gen.go b/internal/service/databrew/service_package_gen.go index 84f14e2ae69..aa44573cd24 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 22537b69c72125609aaf03cb29378d78f97a65be Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:13 -0400 Subject: [PATCH 082/981] No need for import aliases - dataexchange. --- internal/service/dataexchange/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/dataexchange/service_package_gen.go b/internal/service/dataexchange/service_package_gen.go index 08f1aa858f2..61cd2f3c6e8 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 01f9c5923592b5b0b626c53498990ef88e0b0c1b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:13 -0400 Subject: [PATCH 083/981] No need for import aliases - datapipeline. --- internal/service/datapipeline/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/datapipeline/service_package_gen.go b/internal/service/datapipeline/service_package_gen.go index 1740c3f0aa0..f776771b0ce 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From fade9acee7c00726dcc6fb1cff98821f36e66c76 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:13 -0400 Subject: [PATCH 084/981] No need for import aliases - datasync. --- internal/service/datasync/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/datasync/service_package_gen.go b/internal/service/datasync/service_package_gen.go index 52a0f8e077f..20a1b96c713 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 9888c50b886c139dd4141430347a2396e82f9d3a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:13 -0400 Subject: [PATCH 085/981] No need for import aliases - datazone. --- internal/service/datazone/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/datazone/service_package_gen.go b/internal/service/datazone/service_package_gen.go index e0c9a319898..502a28374f1 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From f70691a39a14c58b97723c08ffd1789258cc9174 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:13 -0400 Subject: [PATCH 086/981] No need for import aliases - dax. --- internal/service/dax/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/dax/service_package_gen.go b/internal/service/dax/service_package_gen.go index e944d854b4a..a7e15897b2f 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From d344add96ba98c5e8c527b893cf9b0edf1959f70 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:13 -0400 Subject: [PATCH 087/981] No need for import aliases - deploy. --- internal/service/deploy/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/deploy/service_package_gen.go b/internal/service/deploy/service_package_gen.go index bee170a538f..e45deadb4f5 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 8879760043ff92fd336359b4175d7fc9b18e1e64 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:13 -0400 Subject: [PATCH 088/981] No need for import aliases - detective. --- internal/service/detective/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/detective/service_package_gen.go b/internal/service/detective/service_package_gen.go index 62982d92d4f..72af4eae10d 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 7f4fd2454660b215e411baab359f7438fb446b02 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:13 -0400 Subject: [PATCH 089/981] No need for import aliases - devicefarm. --- internal/service/devicefarm/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/devicefarm/service_package_gen.go b/internal/service/devicefarm/service_package_gen.go index c0aacd111c4..5b3aec3daf5 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From ea9bfbd72f3472e8ec8a8a150c358a415eeb72b1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:13 -0400 Subject: [PATCH 090/981] No need for import aliases - devopsguru. --- internal/service/devopsguru/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/devopsguru/service_package_gen.go b/internal/service/devopsguru/service_package_gen.go index 013da856af1..524455f9217 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 071a65e288a179ec318dfb1da5341bdaa3c9887c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:14 -0400 Subject: [PATCH 091/981] No need for import aliases - directconnect. --- .../service/directconnect/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/directconnect/service_package_gen.go b/internal/service/directconnect/service_package_gen.go index c8565890e3f..b2019aad4a0 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 6af7faa723fa6ed208d84066c6a8c1edf768fbeb Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:14 -0400 Subject: [PATCH 092/981] No need for import aliases - dlm. --- internal/service/dlm/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/dlm/service_package_gen.go b/internal/service/dlm/service_package_gen.go index 6552b7c43d1..42373c6fded 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 54770c91e602eed3ddfcfa71ad3cf95da9613726 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:14 -0400 Subject: [PATCH 093/981] No need for import aliases - dms. --- internal/service/dms/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/dms/service_package_gen.go b/internal/service/dms/service_package_gen.go index 8f31124dad9..160dcf081be 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 81b46379572166ad65812db908fabf2bc1119656 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:14 -0400 Subject: [PATCH 094/981] No need for import aliases - docdb. --- internal/service/docdb/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/docdb/service_package_gen.go b/internal/service/docdb/service_package_gen.go index a6154e666ba..98300a14913 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 061c25401ebe70aa7e65934c3421e1eda497350a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:14 -0400 Subject: [PATCH 095/981] No need for import aliases - docdbelastic. --- internal/service/docdbelastic/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/docdbelastic/service_package_gen.go b/internal/service/docdbelastic/service_package_gen.go index 4a9d0907313..c31fd559d15 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 5ed81e196a566dac986a85b32dfd51a23172073f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:14 -0400 Subject: [PATCH 096/981] No need for import aliases - drs. --- internal/service/drs/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/drs/service_package_gen.go b/internal/service/drs/service_package_gen.go index bef76c21f67..09e3d69cf93 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 065b82193862a35f6565615fc5dc7e0c7fc6494a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:14 -0400 Subject: [PATCH 097/981] No need for import aliases - ds. --- internal/service/ds/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/ds/service_package_gen.go b/internal/service/ds/service_package_gen.go index 22687b4f095..76efb6bd815 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From a4b600143539c1bdca323bc0e389ff4a6428b561 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:14 -0400 Subject: [PATCH 098/981] No need for import aliases - ecr. --- internal/service/ecr/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/ecr/service_package_gen.go b/internal/service/ecr/service_package_gen.go index 9a1f8e3ee2f..86eec692023 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 614a1d5361a2d574b0a0a1166b313e0cc266ccb3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:14 -0400 Subject: [PATCH 099/981] No need for import aliases - ecrpublic. --- internal/service/ecrpublic/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/ecrpublic/service_package_gen.go b/internal/service/ecrpublic/service_package_gen.go index 6f3b96d38ff..c24cf3b14c7 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From cc895084e42e099e87539d0e6044b8adf21031cb Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:14 -0400 Subject: [PATCH 100/981] No need for import aliases - ecs. --- internal/service/ecs/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/ecs/service_package_gen.go b/internal/service/ecs/service_package_gen.go index 40b04aa3e44..c7a68efe27c 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 84417735ff34b97cf09c6c944b47042b942f257d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:15 -0400 Subject: [PATCH 101/981] No need for import aliases - efs. --- internal/service/efs/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/efs/service_package_gen.go b/internal/service/efs/service_package_gen.go index 944de84393e..0d410144f43 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From eb654389657a3a7d379a70c61027730a1c62be3d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:15 -0400 Subject: [PATCH 102/981] No need for import aliases - eks. --- internal/service/eks/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/eks/service_package_gen.go b/internal/service/eks/service_package_gen.go index bfb87d2f2bf..a010ffe1fa2 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From a3ff6b2ed6edc6c6c92cf483ea4cf55e3d3e0dec Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:15 -0400 Subject: [PATCH 103/981] No need for import aliases - elasticache. --- internal/service/elasticache/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/elasticache/service_package_gen.go b/internal/service/elasticache/service_package_gen.go index 2ea57007af2..a3e919b5c6c 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 7487f4caddbeded91f93c14e414cba9502b7cc46 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:15 -0400 Subject: [PATCH 104/981] No need for import aliases - elasticbeanstalk. --- .../service/elasticbeanstalk/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/elasticbeanstalk/service_package_gen.go b/internal/service/elasticbeanstalk/service_package_gen.go index c431ec6a190..bf342358d4a 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 832bf4539d229be642e37e7c4dc8f1be7bd16d21 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:15 -0400 Subject: [PATCH 105/981] No need for import aliases - elasticsearch. --- .../service/elasticsearch/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/elasticsearch/service_package_gen.go b/internal/service/elasticsearch/service_package_gen.go index b10afe5c8ba..17a9b53828d 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From db9e8a638d49ec4622ed55752ea7cc3a078b97ea Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:15 -0400 Subject: [PATCH 106/981] No need for import aliases - elastictranscoder. --- .../service/elastictranscoder/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/elastictranscoder/service_package_gen.go b/internal/service/elastictranscoder/service_package_gen.go index 44fafe2fcfe..ade705e728f 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 6b4f8d13ec86f13fb4f94b29d041cfc09dfd803e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:15 -0400 Subject: [PATCH 107/981] No need for import aliases - elb. --- internal/service/elb/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/elb/service_package_gen.go b/internal/service/elb/service_package_gen.go index b4a6313e238..1fdb043b5a1 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 95d34cd64f349abcd4154a5dfde2ceb63df77284 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:15 -0400 Subject: [PATCH 108/981] No need for import aliases - elbv2. --- internal/service/elbv2/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/elbv2/service_package_gen.go b/internal/service/elbv2/service_package_gen.go index d292fbcf200..07e8b0becaf 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From e5211ae047be066b1ba21c0db536ecd7e2c6d35b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:15 -0400 Subject: [PATCH 109/981] No need for import aliases - emr. --- internal/service/emr/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/emr/service_package_gen.go b/internal/service/emr/service_package_gen.go index 51119aaee74..816eb07a694 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From e4e8da69a14bef0d150c4b4e06fd896d40730392 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:15 -0400 Subject: [PATCH 110/981] No need for import aliases - emrcontainers. --- .../service/emrcontainers/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/emrcontainers/service_package_gen.go b/internal/service/emrcontainers/service_package_gen.go index 87ce0530473..4350afdcfc9 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 337384efc487b5423fe81e10d59d825348f34a74 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:15 -0400 Subject: [PATCH 111/981] No need for import aliases - emrserverless. --- .../service/emrserverless/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/emrserverless/service_package_gen.go b/internal/service/emrserverless/service_package_gen.go index 92fdfd78ebd..439fc935dfa 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 4da7400eed3886fc13cd349d1444117fbb8b8440 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:15 -0400 Subject: [PATCH 112/981] No need for import aliases - events. --- internal/service/events/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/events/service_package_gen.go b/internal/service/events/service_package_gen.go index e0cca987a99..b1d0e80f010 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From c3bf9eab9341aa2865caec5216087a1e2d0829b6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:16 -0400 Subject: [PATCH 113/981] No need for import aliases - evidently. --- internal/service/evidently/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/evidently/service_package_gen.go b/internal/service/evidently/service_package_gen.go index df2ecbd1b68..6f45cb0cd12 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 6db7f5095fe77e8ce0da68a24ae35743337dbce4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:16 -0400 Subject: [PATCH 114/981] No need for import aliases - finspace. --- internal/service/finspace/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/finspace/service_package_gen.go b/internal/service/finspace/service_package_gen.go index a08f0926312..8e24f071fb7 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 477e90fd89fa9b9ca7910a6bf288e1be77bcb1b3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:16 -0400 Subject: [PATCH 115/981] No need for import aliases - firehose. --- internal/service/firehose/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/firehose/service_package_gen.go b/internal/service/firehose/service_package_gen.go index b1de02419a0..b72a78a8ba7 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From dc8d7d447b5be2a5cbaccfa25bbf164a818f8d3c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:16 -0400 Subject: [PATCH 116/981] No need for import aliases - fis. --- internal/service/fis/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/fis/service_package_gen.go b/internal/service/fis/service_package_gen.go index b8305e06a87..5efa42dd657 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From cb628d4b47fa66a7ceb5e15d1b99d58ad17fdcf9 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:16 -0400 Subject: [PATCH 117/981] No need for import aliases - fsx. --- internal/service/fsx/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/fsx/service_package_gen.go b/internal/service/fsx/service_package_gen.go index ddd11413804..a758a674bc4 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 88e0b7b25da8cf2c12afaa0fd0b565df9242fbdc Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:16 -0400 Subject: [PATCH 118/981] No need for import aliases - gamelift. --- internal/service/gamelift/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/gamelift/service_package_gen.go b/internal/service/gamelift/service_package_gen.go index 18c50330d49..e77c5d8751c 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From d41bb8570ed6d0476200ef7fc529b46018fd2ecd Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:16 -0400 Subject: [PATCH 119/981] No need for import aliases - glacier. --- internal/service/glacier/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/glacier/service_package_gen.go b/internal/service/glacier/service_package_gen.go index a9c4186d699..40b29332311 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 9eaa4aa3ef0f8a0c8444e171428ee2fe76888863 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:16 -0400 Subject: [PATCH 120/981] No need for import aliases - glue. --- internal/service/glue/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/glue/service_package_gen.go b/internal/service/glue/service_package_gen.go index e47e9407323..82588a730c4 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 00ee22024b1bf6e63ae557318475cb7d24d635f4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:16 -0400 Subject: [PATCH 121/981] No need for import aliases - grafana. --- internal/service/grafana/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/grafana/service_package_gen.go b/internal/service/grafana/service_package_gen.go index 4bd1a7d34b9..abf765acfa0 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 271d65835b0ad7849f1596545e447d1d491bd62f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:16 -0400 Subject: [PATCH 122/981] No need for import aliases - greengrass. --- internal/service/greengrass/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/greengrass/service_package_gen.go b/internal/service/greengrass/service_package_gen.go index 171fd82de01..67e0e4335a0 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 74a4b0da4f1a038105a97e2e4f37afea12288546 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:17 -0400 Subject: [PATCH 123/981] No need for import aliases - groundstation. --- .../service/groundstation/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/groundstation/service_package_gen.go b/internal/service/groundstation/service_package_gen.go index 8f6b5a5ea31..5ffb7db0904 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 0eb65ef4cc71790997a47c44ba932fd5f2c0c0e5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:17 -0400 Subject: [PATCH 124/981] No need for import aliases - guardduty. --- internal/service/guardduty/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/guardduty/service_package_gen.go b/internal/service/guardduty/service_package_gen.go index 2f1991e4409..d6d7345c62b 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 397a1904174cf5afaf17a5b79d8f1a75432cad83 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:17 -0400 Subject: [PATCH 125/981] No need for import aliases - healthlake. --- internal/service/healthlake/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/healthlake/service_package_gen.go b/internal/service/healthlake/service_package_gen.go index 46da7a8c1a7..e3369bc12d8 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 50dd00e2ed9db3693f9be3f1155d7b0a25611450 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:17 -0400 Subject: [PATCH 126/981] No need for import aliases - iam. --- internal/service/iam/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/iam/service_package_gen.go b/internal/service/iam/service_package_gen.go index db778ae28c6..775947898cc 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 46a7963593a3a5791144a5685a6046910a5481a8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:17 -0400 Subject: [PATCH 127/981] No need for import aliases - identitystore. --- .../service/identitystore/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/identitystore/service_package_gen.go b/internal/service/identitystore/service_package_gen.go index 7ece94d0294..e70f27f555e 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 21c002ebc844bc0b64861bfaa39c7658eab7adec Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:17 -0400 Subject: [PATCH 128/981] No need for import aliases - imagebuilder. --- internal/service/imagebuilder/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/imagebuilder/service_package_gen.go b/internal/service/imagebuilder/service_package_gen.go index 769cc57c474..97a36f7148e 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 363731fb1ec0da37b48b3fe7d814c8ef38b654ac Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:17 -0400 Subject: [PATCH 129/981] No need for import aliases - inspector. --- internal/service/inspector/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/inspector/service_package_gen.go b/internal/service/inspector/service_package_gen.go index 99aa0f1fac4..1a4046281a1 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 043d3743a329f6e665bc11964e3f9a028643dddd Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:17 -0400 Subject: [PATCH 130/981] No need for import aliases - inspector2. --- internal/service/inspector2/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/inspector2/service_package_gen.go b/internal/service/inspector2/service_package_gen.go index 14f29b966f9..ceccaa07bc2 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From be1095b6b2c63a047384f991cd588923696a9587 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:17 -0400 Subject: [PATCH 131/981] No need for import aliases - internetmonitor. --- .../service/internetmonitor/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/internetmonitor/service_package_gen.go b/internal/service/internetmonitor/service_package_gen.go index 28fe340ad32..0f8e4e01a04 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 72416d49017c107c5a820b69a3f010bf97b8214e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:17 -0400 Subject: [PATCH 132/981] No need for import aliases - iot. --- internal/service/iot/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/iot/service_package_gen.go b/internal/service/iot/service_package_gen.go index 478ff6c408d..e6a229f2bfb 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 55630c20a13f4d2ae75f064d4e1656017f939653 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:17 -0400 Subject: [PATCH 133/981] No need for import aliases - iotanalytics. --- internal/service/iotanalytics/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/iotanalytics/service_package_gen.go b/internal/service/iotanalytics/service_package_gen.go index 32fcb9814eb..d5313c2478f 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From ca7d486c52a3a3c1782c71921f91ddad7e2c10ac Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:17 -0400 Subject: [PATCH 134/981] No need for import aliases - iotevents. --- internal/service/iotevents/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/iotevents/service_package_gen.go b/internal/service/iotevents/service_package_gen.go index c664bdbabc5..9a35dd13a3d 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From c4d4413a38325bd2c85b019d8f8d3b872216bb31 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:17 -0400 Subject: [PATCH 135/981] No need for import aliases - ivs. --- internal/service/ivs/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/ivs/service_package_gen.go b/internal/service/ivs/service_package_gen.go index 9af4b3e36fe..c40896a63b0 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From c423464342564f212a23584bccc7e6e4f4b2d8d7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:18 -0400 Subject: [PATCH 136/981] No need for import aliases - ivschat. --- internal/service/ivschat/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/ivschat/service_package_gen.go b/internal/service/ivschat/service_package_gen.go index e5309be335e..12f55a67baf 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 9cfe8dc145719e71f15ac7a704d4a36d1eaecb2c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:18 -0400 Subject: [PATCH 137/981] No need for import aliases - kafkaconnect. --- internal/service/kafkaconnect/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/kafkaconnect/service_package_gen.go b/internal/service/kafkaconnect/service_package_gen.go index 5a4f586bc5b..a6ac2ab5c2a 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 1f1d0d17aac849de8a1bde414983aad1067172c2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:18 -0400 Subject: [PATCH 138/981] No need for import aliases - kendra. --- internal/service/kendra/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/kendra/service_package_gen.go b/internal/service/kendra/service_package_gen.go index 9020eca3fb0..a2f33803bd9 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 87b801b678afb654d98e83403773c3e9a2c138a5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:18 -0400 Subject: [PATCH 139/981] No need for import aliases - keyspaces. --- internal/service/keyspaces/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/keyspaces/service_package_gen.go b/internal/service/keyspaces/service_package_gen.go index 552afe84e43..5a6517c14b0 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 4a28484eeb4ebc72746a4928c853532f7084f9ee Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:18 -0400 Subject: [PATCH 140/981] No need for import aliases - kinesisanalytics. --- .../service/kinesisanalytics/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/kinesisanalytics/service_package_gen.go b/internal/service/kinesisanalytics/service_package_gen.go index 763bea8a399..6ccafa2ba37 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From f418cd970e292e425a57804dd172717b1de5e856 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:18 -0400 Subject: [PATCH 141/981] No need for import aliases - kinesisanalyticsv2. --- .../kinesisanalyticsv2/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/kinesisanalyticsv2/service_package_gen.go b/internal/service/kinesisanalyticsv2/service_package_gen.go index a65b00b51e9..95246f06133 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 12da6a279cae6fdeb20303b0c7b85ef944c343e4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:18 -0400 Subject: [PATCH 142/981] No need for import aliases - kinesisvideo. --- internal/service/kinesisvideo/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/kinesisvideo/service_package_gen.go b/internal/service/kinesisvideo/service_package_gen.go index 2baf14337e3..efd5e4d6af4 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From d9a07bf2ca1bbc9556fa408d1488b724c27bf90a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:18 -0400 Subject: [PATCH 143/981] No need for import aliases - kms. --- internal/service/kms/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/kms/service_package_gen.go b/internal/service/kms/service_package_gen.go index 012e16b31ba..ed12f1af980 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From a063abb4085ef6208febe656aea0552e5cf33c14 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:18 -0400 Subject: [PATCH 144/981] No need for import aliases - lakeformation. --- .../service/lakeformation/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/lakeformation/service_package_gen.go b/internal/service/lakeformation/service_package_gen.go index b979bbfdeff..f8ee87026a1 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 1b544a133edd73aa5ad2575b739e79d6e2cbf368 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:19 -0400 Subject: [PATCH 145/981] No need for import aliases - lambda. --- internal/service/lambda/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/lambda/service_package_gen.go b/internal/service/lambda/service_package_gen.go index c70ed5f1f4c..da1af7c36b7 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From e14b43bb4383ccf72c03980baff3026c47304f46 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:19 -0400 Subject: [PATCH 146/981] No need for import aliases - launchwizard. --- internal/service/launchwizard/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/launchwizard/service_package_gen.go b/internal/service/launchwizard/service_package_gen.go index 7686a7cb4f2..5b1c48b5b66 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 617dad26da3211b914269e7ca7385b81759755f6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:19 -0400 Subject: [PATCH 147/981] No need for import aliases - lexmodels. --- internal/service/lexmodels/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/lexmodels/service_package_gen.go b/internal/service/lexmodels/service_package_gen.go index 81a7630030d..3cf737c304b 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 174ec0c0c33e233232d569e55672e1abadc88e52 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:19 -0400 Subject: [PATCH 148/981] No need for import aliases - lexv2models. --- internal/service/lexv2models/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/lexv2models/service_package_gen.go b/internal/service/lexv2models/service_package_gen.go index 5e59cad211b..edb203712c9 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 3f74b4d1a2f54813642e4a9a8e77e632344546cd Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:19 -0400 Subject: [PATCH 149/981] No need for import aliases - licensemanager. --- .../service/licensemanager/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/licensemanager/service_package_gen.go b/internal/service/licensemanager/service_package_gen.go index 69ae65d41a6..d94e45fe847 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From a629012b162846956193d276ca43f75d97209f81 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:19 -0400 Subject: [PATCH 150/981] No need for import aliases - location. --- internal/service/location/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/location/service_package_gen.go b/internal/service/location/service_package_gen.go index 2811fe6f50e..2fd553a4eb6 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 3697d35fa2a314e27026ebfae5b8e5b2124c0ecb Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:19 -0400 Subject: [PATCH 151/981] No need for import aliases - logs. --- internal/service/logs/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/logs/service_package_gen.go b/internal/service/logs/service_package_gen.go index 283f7fc720d..7622f5ead23 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 322b5c3991716a12c412ee61b446e05e609b5cd3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:19 -0400 Subject: [PATCH 152/981] No need for import aliases - lookoutmetrics. --- .../service/lookoutmetrics/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/lookoutmetrics/service_package_gen.go b/internal/service/lookoutmetrics/service_package_gen.go index 589afbfc397..78af29f9e81 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 2f4ad5f22db1d3bfd16c1443d10515721533aee9 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:19 -0400 Subject: [PATCH 153/981] No need for import aliases - m2. --- internal/service/m2/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/m2/service_package_gen.go b/internal/service/m2/service_package_gen.go index 5d730add214..d0706978247 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 0402717eaec3134b8cb0d18423e274ff636b8fb6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:19 -0400 Subject: [PATCH 154/981] No need for import aliases - macie2. --- internal/service/macie2/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/macie2/service_package_gen.go b/internal/service/macie2/service_package_gen.go index af4d920323d..a6b63452091 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From d540164e083122db8c791c42b8ee5ad52b72e8d8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:19 -0400 Subject: [PATCH 155/981] No need for import aliases - mediaconnect. --- internal/service/mediaconnect/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/mediaconnect/service_package_gen.go b/internal/service/mediaconnect/service_package_gen.go index 20f3febc209..21fc7c015c6 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From e9439c78a48bde767551c4e69150835f29ae8cde Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:19 -0400 Subject: [PATCH 156/981] No need for import aliases - mediaconvert. --- internal/service/mediaconvert/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/mediaconvert/service_package_gen.go b/internal/service/mediaconvert/service_package_gen.go index dbd9672aef7..b39ee266146 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 4ea5b5e1dc435c5c78d1cfc56f6fea2612c40a90 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:20 -0400 Subject: [PATCH 157/981] No need for import aliases - medialive. --- internal/service/medialive/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/medialive/service_package_gen.go b/internal/service/medialive/service_package_gen.go index 5fdc269e9a5..b0ce50bd5a3 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From a37abea0cfad31cdc207b91c649261adf90bfd43 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:20 -0400 Subject: [PATCH 158/981] No need for import aliases - mediapackage. --- internal/service/mediapackage/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/mediapackage/service_package_gen.go b/internal/service/mediapackage/service_package_gen.go index 2ad78fcf337..f57fada917a 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From a776d572352ab6e3bf3180abb776fd8f8742f507 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:20 -0400 Subject: [PATCH 159/981] No need for import aliases - mediapackagev2. --- .../service/mediapackagev2/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/mediapackagev2/service_package_gen.go b/internal/service/mediapackagev2/service_package_gen.go index 1a5bf9e1f7a..e5c603e3c1d 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From eb47846d4c5dc4cffd5d6f66a51eb7ab874ae681 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:20 -0400 Subject: [PATCH 160/981] No need for import aliases - mediastore. --- internal/service/mediastore/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/mediastore/service_package_gen.go b/internal/service/mediastore/service_package_gen.go index 8b0c82c7788..ab6d6c1cb82 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From acea5aa172266fa5bf14d8a411214d1470b6e6cb Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:20 -0400 Subject: [PATCH 161/981] No need for import aliases - memorydb. --- internal/service/memorydb/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/memorydb/service_package_gen.go b/internal/service/memorydb/service_package_gen.go index 4a6516b561f..e11cf5a5e9c 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 5444873078cd7c5d610712311570761912eea186 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:20 -0400 Subject: [PATCH 162/981] No need for import aliases - mq. --- internal/service/mq/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/mq/service_package_gen.go b/internal/service/mq/service_package_gen.go index e2f4dafde65..5b927816273 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 37da31570ae2d81448bba35036bab7ae1c60d2ce Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:20 -0400 Subject: [PATCH 163/981] No need for import aliases - mwaa. --- internal/service/mwaa/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/mwaa/service_package_gen.go b/internal/service/mwaa/service_package_gen.go index 9aad805d5fe..4a069fbec9c 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 84b5bc182d37fc036822837cf2b14fd8aa61092f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:20 -0400 Subject: [PATCH 164/981] No need for import aliases - neptune. --- internal/service/neptune/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/neptune/service_package_gen.go b/internal/service/neptune/service_package_gen.go index 96875522c82..9b59b53c1f0 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From d2546401951f6877e31b2d29f681638e2b277e7e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:20 -0400 Subject: [PATCH 165/981] No need for import aliases - neptunegraph. --- internal/service/neptunegraph/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/neptunegraph/service_package_gen.go b/internal/service/neptunegraph/service_package_gen.go index 699cca71095..09d80bb6728 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 5d5039c242adc180c96d58383c5aeb074ac72f24 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:20 -0400 Subject: [PATCH 166/981] No need for import aliases - networkfirewall. --- .../service/networkfirewall/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/networkfirewall/service_package_gen.go b/internal/service/networkfirewall/service_package_gen.go index 267439726ec..31ae17d3744 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 402b49e7713a4c28a9c34c9e80ac93b1e27d9b8a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:20 -0400 Subject: [PATCH 167/981] No need for import aliases - networkmanager. --- .../service/networkmanager/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/networkmanager/service_package_gen.go b/internal/service/networkmanager/service_package_gen.go index 5998f6472f5..8e41b3c6c4a 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 750bc2ade6d2ba3b98d5deaed3fd3df04c2ddf87 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:21 -0400 Subject: [PATCH 168/981] No need for import aliases - networkmonitor. --- .../service/networkmonitor/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/networkmonitor/service_package_gen.go b/internal/service/networkmonitor/service_package_gen.go index de51b85ce97..f650d8f34a6 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 1b228d91cffe855454c64d6145a0f51277c6b6de Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:21 -0400 Subject: [PATCH 169/981] No need for import aliases - oam. --- internal/service/oam/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/oam/service_package_gen.go b/internal/service/oam/service_package_gen.go index 2778bea7d35..1f5d8e28909 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 72c7fd7c8edeb00c85aaf7ade70785c5d34cd377 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:21 -0400 Subject: [PATCH 170/981] No need for import aliases - opensearch. --- internal/service/opensearch/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/opensearch/service_package_gen.go b/internal/service/opensearch/service_package_gen.go index 5397c228da6..df57003e269 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 21ca64fe1d0433f1a0179060f635379541d8f236 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:21 -0400 Subject: [PATCH 171/981] No need for import aliases - opensearchserverless. --- .../opensearchserverless/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/opensearchserverless/service_package_gen.go b/internal/service/opensearchserverless/service_package_gen.go index 2c16ac2432a..fd30f861298 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 6a21e13d4cfb9f6c123ed63c1c79a86356607716 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:21 -0400 Subject: [PATCH 172/981] No need for import aliases - opsworks. --- internal/service/opsworks/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/opsworks/service_package_gen.go b/internal/service/opsworks/service_package_gen.go index f9e32a543f1..502bd0de6c7 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 35e38b027136064e673cb776b03945cb8b0ddb4c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:21 -0400 Subject: [PATCH 173/981] No need for import aliases - osis. --- internal/service/osis/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/osis/service_package_gen.go b/internal/service/osis/service_package_gen.go index c290f3ba01a..8fdaa11b33c 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 3d8d02583301cc9b9bc8c4443c221d4c61282588 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:21 -0400 Subject: [PATCH 174/981] No need for import aliases - outposts. --- internal/service/outposts/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/outposts/service_package_gen.go b/internal/service/outposts/service_package_gen.go index 0513e933c62..2af4a304a6b 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 52eb82c18c38eff1968960148bedbd708d0afe7c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:21 -0400 Subject: [PATCH 175/981] No need for import aliases - paymentcryptography. --- .../paymentcryptography/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/paymentcryptography/service_package_gen.go b/internal/service/paymentcryptography/service_package_gen.go index ef747eda518..dd7c150630b 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 6bb8f524b0d1e91b7550bc3d3c61bdccaf30ef0c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:21 -0400 Subject: [PATCH 176/981] No need for import aliases - pcaconnectorad. --- .../service/pcaconnectorad/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/pcaconnectorad/service_package_gen.go b/internal/service/pcaconnectorad/service_package_gen.go index 2723b987d99..26f4de54df1 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 6c902ee3ef0610d16084e96385df2434dbb07f47 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:21 -0400 Subject: [PATCH 177/981] No need for import aliases - pcs. --- internal/service/pcs/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/pcs/service_package_gen.go b/internal/service/pcs/service_package_gen.go index eb06ab5580c..6f216126c65 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 1facc28bd3e1581cb2db909f2ccb7c8cd60c96c3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:21 -0400 Subject: [PATCH 178/981] No need for import aliases - pinpoint. --- internal/service/pinpoint/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/pinpoint/service_package_gen.go b/internal/service/pinpoint/service_package_gen.go index e52bd4d26da..b20cf9a1336 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 4ec8d22d6e38d13d984e9132981cae230054bb4b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:22 -0400 Subject: [PATCH 179/981] No need for import aliases - pinpointsmsvoicev2. --- .../pinpointsmsvoicev2/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/pinpointsmsvoicev2/service_package_gen.go b/internal/service/pinpointsmsvoicev2/service_package_gen.go index 8a7120482e0..fb8885cbb49 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From b760d78d1f312e9ec98868608555196e7e9578b7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:22 -0400 Subject: [PATCH 180/981] No need for import aliases - pipes. --- internal/service/pipes/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/pipes/service_package_gen.go b/internal/service/pipes/service_package_gen.go index c268b1f80d5..fbabd490f27 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From b6a235c4ef82280684fcbec7ea14d9a3394182cc Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:22 -0400 Subject: [PATCH 181/981] No need for import aliases - polly. --- internal/service/polly/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/polly/service_package_gen.go b/internal/service/polly/service_package_gen.go index e3fa6f7dd0c..2d5948cce86 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 9c862c614ea8e9f49b4f15539496b589f260bcc0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:22 -0400 Subject: [PATCH 182/981] No need for import aliases - pricing. --- internal/service/pricing/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/pricing/service_package_gen.go b/internal/service/pricing/service_package_gen.go index 2fed2364644..13d4c319155 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 3bcac675465925bfec5805588b9e0709360cb864 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:22 -0400 Subject: [PATCH 183/981] No need for import aliases - qbusiness. --- internal/service/qbusiness/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/qbusiness/service_package_gen.go b/internal/service/qbusiness/service_package_gen.go index b02a4b2b74e..627335d22e5 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 33a74f98931d01a689a1026490aeb46982701189 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:22 -0400 Subject: [PATCH 184/981] No need for import aliases - qldb. --- internal/service/qldb/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/qldb/service_package_gen.go b/internal/service/qldb/service_package_gen.go index 2af8b39f05e..2dc93132433 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 9594fd7324e0987617955284a2484330156ba950 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:22 -0400 Subject: [PATCH 185/981] No need for import aliases - quicksight. --- internal/service/quicksight/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/quicksight/service_package_gen.go b/internal/service/quicksight/service_package_gen.go index f37f2a40f6a..3b5e7f70234 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From b1dd984b8c0d6f8aad4f949fc64707243d5487fe Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:22 -0400 Subject: [PATCH 186/981] No need for import aliases - ram. --- internal/service/ram/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/ram/service_package_gen.go b/internal/service/ram/service_package_gen.go index dc830590c4c..ec62acc499f 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 9673860dc9c4d40948f8349a541ed5157f1ed1f9 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:22 -0400 Subject: [PATCH 187/981] No need for import aliases - rbin. --- internal/service/rbin/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/rbin/service_package_gen.go b/internal/service/rbin/service_package_gen.go index 063072945e6..c11fa2bc839 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From e63364c138709d2dd32a68c886b5b14b3feee4e7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:22 -0400 Subject: [PATCH 188/981] No need for import aliases - rds. --- internal/service/rds/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/rds/service_package_gen.go b/internal/service/rds/service_package_gen.go index d03891944e1..afd713313ec 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 26089c2ccb5671ab2410781370fe8d358f9591df Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:22 -0400 Subject: [PATCH 189/981] No need for import aliases - redshift. --- internal/service/redshift/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/redshift/service_package_gen.go b/internal/service/redshift/service_package_gen.go index 1ac7d0b92f3..ceffb88492e 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 75b4616589100c27a6f8a05892954e8b866409ad Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:22 -0400 Subject: [PATCH 190/981] No need for import aliases - redshiftdata. --- internal/service/redshiftdata/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/redshiftdata/service_package_gen.go b/internal/service/redshiftdata/service_package_gen.go index 21d6ae2a271..60594f99d32 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 21f4b9c5f8302da69b28d3d1d811d95d2621c497 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:22 -0400 Subject: [PATCH 191/981] No need for import aliases - redshiftserverless. --- .../redshiftserverless/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/redshiftserverless/service_package_gen.go b/internal/service/redshiftserverless/service_package_gen.go index 0ef2fd6e08b..e8c2b4a7daa 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 166e05a394721a132341d990b468d6a560952439 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:23 -0400 Subject: [PATCH 192/981] No need for import aliases - rekognition. --- internal/service/rekognition/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/rekognition/service_package_gen.go b/internal/service/rekognition/service_package_gen.go index 1ca8339efdd..3debda79066 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 853ee455a7325fc03424c11308e6683d36a0b8b9 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:23 -0400 Subject: [PATCH 193/981] No need for import aliases - resiliencehub. --- .../service/resiliencehub/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/resiliencehub/service_package_gen.go b/internal/service/resiliencehub/service_package_gen.go index 6cb1f1d7d1c..0cb6cafa723 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 119057ae9580e759196c2060b8a7a3dc0ed523bf Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:23 -0400 Subject: [PATCH 194/981] No need for import aliases - resourceexplorer2. --- .../service/resourceexplorer2/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/resourceexplorer2/service_package_gen.go b/internal/service/resourceexplorer2/service_package_gen.go index fcaf6bdd81e..6b0554b18bd 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 1378c18c50fbd995229ff696a58bfc63fd9487db Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:23 -0400 Subject: [PATCH 195/981] No need for import aliases - resourcegroups. --- .../service/resourcegroups/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/resourcegroups/service_package_gen.go b/internal/service/resourcegroups/service_package_gen.go index e678b38a0ff..01199bbdb35 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From a08ef5c641532f2d536f144012f807d76e660678 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:23 -0400 Subject: [PATCH 196/981] No need for import aliases - resourcegroupstaggingapi. --- .../resourcegroupstaggingapi/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/resourcegroupstaggingapi/service_package_gen.go b/internal/service/resourcegroupstaggingapi/service_package_gen.go index 32348897fe6..162e7fdab5b 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 7aca6c4a91793613737e4e599b2a240fb0c1326c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:23 -0400 Subject: [PATCH 197/981] No need for import aliases - rolesanywhere. --- .../service/rolesanywhere/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/rolesanywhere/service_package_gen.go b/internal/service/rolesanywhere/service_package_gen.go index 05183b5675c..6f8e53ba59f 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 9dcfb62319358ed78d8a3758e97387462cabedb0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:23 -0400 Subject: [PATCH 198/981] No need for import aliases - route53profiles. --- .../service/route53profiles/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/route53profiles/service_package_gen.go b/internal/service/route53profiles/service_package_gen.go index 6ed7e3c8580..9ca261cde2c 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From bd54a0a37a49f09f7a0d82203538ba8bcc2f043d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:24 -0400 Subject: [PATCH 199/981] No need for import aliases - route53resolver. --- .../service/route53resolver/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/route53resolver/service_package_gen.go b/internal/service/route53resolver/service_package_gen.go index 9faa421f7d2..b9e94bacfd6 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From e0c81c1a768edb52526b26c6eefc043aeb03cec0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:24 -0400 Subject: [PATCH 200/981] No need for import aliases - rum. --- internal/service/rum/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/rum/service_package_gen.go b/internal/service/rum/service_package_gen.go index 45c6405a230..eb01d6a7bbe 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 47187bc4363295885ace91d0c63d9e6c7ea75c3e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:24 -0400 Subject: [PATCH 201/981] No need for import aliases - s3control. --- internal/service/s3control/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/s3control/service_package_gen.go b/internal/service/s3control/service_package_gen.go index f0eb92a7942..4e63e8b317a 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 3ff3fc7170960099338a821ec224041449e138a7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:24 -0400 Subject: [PATCH 202/981] No need for import aliases - s3outposts. --- internal/service/s3outposts/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/s3outposts/service_package_gen.go b/internal/service/s3outposts/service_package_gen.go index 02b8d4c104a..a11d86579d0 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 31e838f32508b7c6da38f1ba129cd9226fa13252 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:24 -0400 Subject: [PATCH 203/981] No need for import aliases - sagemaker. --- internal/service/sagemaker/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/sagemaker/service_package_gen.go b/internal/service/sagemaker/service_package_gen.go index 6c32572278d..69ac59a0efb 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" @@ -256,11 +256,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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 1ff74c204c6c4a1e27bc04eab32ff23f07d67a2b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:24 -0400 Subject: [PATCH 204/981] No need for import aliases - scheduler. --- internal/service/scheduler/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/scheduler/service_package_gen.go b/internal/service/scheduler/service_package_gen.go index ec194e82f3d..7fcbbca2608 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 2a95d2ce05d008bc31040b6514086923a81a3d74 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:24 -0400 Subject: [PATCH 205/981] No need for import aliases - secretsmanager. --- .../service/secretsmanager/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/secretsmanager/service_package_gen.go b/internal/service/secretsmanager/service_package_gen.go index 0521d637f8c..12b370bdc9e 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From c98da9e1c6246612de2377679f7ba8517049636c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:24 -0400 Subject: [PATCH 206/981] No need for import aliases - securityhub. --- internal/service/securityhub/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/securityhub/service_package_gen.go b/internal/service/securityhub/service_package_gen.go index acd4673ff47..7b4c7cea9c0 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 4e11f010f40da2023ee2c44df1a103af837cc1be Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:24 -0400 Subject: [PATCH 207/981] No need for import aliases - securitylake. --- internal/service/securitylake/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/securitylake/service_package_gen.go b/internal/service/securitylake/service_package_gen.go index 1e3b5cb5d1f..8fc031b54b7 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From c0fdb9b54c25f3ef537a8f8187c1c2f45e96b9aa Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:25 -0400 Subject: [PATCH 208/981] No need for import aliases - serverlessrepo. --- .../service/serverlessrepo/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/serverlessrepo/service_package_gen.go b/internal/service/serverlessrepo/service_package_gen.go index 9745aa007e1..46b3e577484 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 101c02a5bb356cdfaeb7d908ea819ac067ac3956 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:25 -0400 Subject: [PATCH 209/981] No need for import aliases - servicecatalog. --- .../service/servicecatalog/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/servicecatalog/service_package_gen.go b/internal/service/servicecatalog/service_package_gen.go index 6eb2fe3f0cf..b361f826bb4 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From ba33a0cebb2ae3bb37aa727cdf9d9d9964b7f584 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:25 -0400 Subject: [PATCH 210/981] No need for import aliases - servicecatalogappregistry. --- .../servicecatalogappregistry/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/servicecatalogappregistry/service_package_gen.go b/internal/service/servicecatalogappregistry/service_package_gen.go index affcfd818e4..cc1ff3baf38 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 18645ad4f3e852b5cde99118e34a3d8bee65c3f5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:25 -0400 Subject: [PATCH 211/981] No need for import aliases - servicediscovery. --- .../service/servicediscovery/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/servicediscovery/service_package_gen.go b/internal/service/servicediscovery/service_package_gen.go index a6a8c608190..b893323514b 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 1d595b3daf8100eeb0d4360d22cd32f0e125f883 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:25 -0400 Subject: [PATCH 212/981] No need for import aliases - servicequotas. --- .../service/servicequotas/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/servicequotas/service_package_gen.go b/internal/service/servicequotas/service_package_gen.go index 7f1ccd410fb..3dd5393215c 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 260f6965d2bffd80790e6b022761fd2dc7082074 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:25 -0400 Subject: [PATCH 213/981] No need for import aliases - ses. --- internal/service/ses/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/ses/service_package_gen.go b/internal/service/ses/service_package_gen.go index 7f08851ebaf..3db70418bb8 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 4e5f896cb3bb8eaf82b11b6bb63f751a663b3bd3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:25 -0400 Subject: [PATCH 214/981] No need for import aliases - sesv2. --- internal/service/sesv2/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/sesv2/service_package_gen.go b/internal/service/sesv2/service_package_gen.go index 00afc4bbc2b..dea3f0951df 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From d684e435903494ad57426f3eeca77fb5777ae921 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:25 -0400 Subject: [PATCH 215/981] No need for import aliases - sfn. --- internal/service/sfn/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/sfn/service_package_gen.go b/internal/service/sfn/service_package_gen.go index 1234eb55fc1..ba30e06c857 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 7a0d38e78b5ef1c15b6c7ba8d88192e76232d0a4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:25 -0400 Subject: [PATCH 216/981] No need for import aliases - signer. --- internal/service/signer/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/signer/service_package_gen.go b/internal/service/signer/service_package_gen.go index b5629cb5327..724011bafb8 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From d7ec5ecba6d6ce03a772fca6c137eb6ab197e4f0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:25 -0400 Subject: [PATCH 217/981] No need for import aliases - sns. --- internal/service/sns/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/sns/service_package_gen.go b/internal/service/sns/service_package_gen.go index db6e88b545f..5bf81b366f8 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 5946dd0d3b637fef0d39140953fda98eeda36710 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:26 -0400 Subject: [PATCH 218/981] No need for import aliases - sqs. --- internal/service/sqs/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/sqs/service_package_gen.go b/internal/service/sqs/service_package_gen.go index 66485af9376..2f2f444ba51 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 55322b324800d3be5b0ea40c5e4afb97180e754f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:26 -0400 Subject: [PATCH 219/981] No need for import aliases - ssm. --- internal/service/ssm/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/ssm/service_package_gen.go b/internal/service/ssm/service_package_gen.go index cc7f9049f31..96fdf2bf4c3 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From e796e6239bc1d5f6b1a349047311ec0fe44eece3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:26 -0400 Subject: [PATCH 220/981] No need for import aliases - ssmcontacts. --- internal/service/ssmcontacts/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/ssmcontacts/service_package_gen.go b/internal/service/ssmcontacts/service_package_gen.go index 9211147a0f4..aceb69d6bcb 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 837c36799a96025f4e66d899f760f25a9db0eca6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:26 -0400 Subject: [PATCH 221/981] No need for import aliases - ssmincidents. --- internal/service/ssmincidents/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/ssmincidents/service_package_gen.go b/internal/service/ssmincidents/service_package_gen.go index af1214566f8..e492f704517 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From e8282a02c3ca4bd6d8a7c91914bcc4cad6a7c7fe Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:26 -0400 Subject: [PATCH 222/981] No need for import aliases - ssmquicksetup. --- .../service/ssmquicksetup/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/ssmquicksetup/service_package_gen.go b/internal/service/ssmquicksetup/service_package_gen.go index 0096da90fac..eeb9b55cb1a 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 3db054946733ccd65291dd7ad3d188f72aa8a40e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:26 -0400 Subject: [PATCH 223/981] No need for import aliases - ssmsap. --- internal/service/ssmsap/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/ssmsap/service_package_gen.go b/internal/service/ssmsap/service_package_gen.go index 113b09ac754..d14b2b714ab 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 2f4d884c1ebcbf48e98a50153dcb098824c2e3b3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:26 -0400 Subject: [PATCH 224/981] No need for import aliases - sso. --- internal/service/sso/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/sso/service_package_gen.go b/internal/service/sso/service_package_gen.go index 5ca1868e97b..b61aa8ebcdc 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 4461e09f2cc1fd6d9e530c89396187081d6af518 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:26 -0400 Subject: [PATCH 225/981] No need for import aliases - storagegateway. --- .../service/storagegateway/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/storagegateway/service_package_gen.go b/internal/service/storagegateway/service_package_gen.go index 7fda39d7bc2..d6a321112f0 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 430d3ccd1645ff1d1fc1b2c42e233ac8dc490bf5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:26 -0400 Subject: [PATCH 226/981] No need for import aliases - swf. --- internal/service/swf/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/swf/service_package_gen.go b/internal/service/swf/service_package_gen.go index 86cefe5d9b0..b9074973fde 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 12884814be30fac4e6f4480603908757fc328ec9 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:27 -0400 Subject: [PATCH 227/981] No need for import aliases - synthetics. --- internal/service/synthetics/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/synthetics/service_package_gen.go b/internal/service/synthetics/service_package_gen.go index 7dfe81a556c..0bef3fda811 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 1e41fdaa0401a508650c3a0e3d2ddcca8ea36f32 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:27 -0400 Subject: [PATCH 228/981] No need for import aliases - timestreaminfluxdb. --- .../timestreaminfluxdb/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/timestreaminfluxdb/service_package_gen.go b/internal/service/timestreaminfluxdb/service_package_gen.go index b0e4d990ed2..876713bd5ed 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 991565bbe9cef5950cc42bef7eef5f5345d56540 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:27 -0400 Subject: [PATCH 229/981] No need for import aliases - timestreamwrite. --- .../service/timestreamwrite/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/timestreamwrite/service_package_gen.go b/internal/service/timestreamwrite/service_package_gen.go index 24d7b689b5d..4c4b7ebf21a 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From e9bd154684a61d04c642c00f4932320d6f7c800a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:27 -0400 Subject: [PATCH 230/981] No need for import aliases - transcribe. --- internal/service/transcribe/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/transcribe/service_package_gen.go b/internal/service/transcribe/service_package_gen.go index 375ceab73d9..d76b6bc3e7d 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 8747e9ac1b1482f2c4029621915777a4dd44a69f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:27 -0400 Subject: [PATCH 231/981] No need for import aliases - transfer. --- internal/service/transfer/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/transfer/service_package_gen.go b/internal/service/transfer/service_package_gen.go index 5add8876aa8..78f01a01439 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 4d27fe2a8542e3970b0dddd13e4e8cbff0cc8851 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:27 -0400 Subject: [PATCH 232/981] No need for import aliases - verifiedpermissions. --- .../verifiedpermissions/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/verifiedpermissions/service_package_gen.go b/internal/service/verifiedpermissions/service_package_gen.go index 59d4d2bfe9e..8d27a6ecd4d 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From f25a1eab6d24e91c94f71bd7d4130c8155a2cd84 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:27 -0400 Subject: [PATCH 233/981] No need for import aliases - vpclattice. --- internal/service/vpclattice/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/vpclattice/service_package_gen.go b/internal/service/vpclattice/service_package_gen.go index 1d57c12e072..beb976f18fe 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 2ec2801551a526eb8d7b3eac745983e672f82c55 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:27 -0400 Subject: [PATCH 234/981] No need for import aliases - waf. --- internal/service/waf/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/waf/service_package_gen.go b/internal/service/waf/service_package_gen.go index 65f1b78d43a..0621c391f99 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 48fe520e8b8ed29a697f67009ab957aec024bf28 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:27 -0400 Subject: [PATCH 235/981] No need for import aliases - wafregional. --- internal/service/wafregional/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/wafregional/service_package_gen.go b/internal/service/wafregional/service_package_gen.go index 73dd82adade..0263a91e794 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From cc3f33156ad86d7c430faaea701d9b297bd74b90 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:27 -0400 Subject: [PATCH 236/981] No need for import aliases - wafv2. --- internal/service/wafv2/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/wafv2/service_package_gen.go b/internal/service/wafv2/service_package_gen.go index cdf93312ee1..0d31e636c35 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 76e93c04f0247c468391fc7113824d6f3bf72992 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:27 -0400 Subject: [PATCH 237/981] No need for import aliases - wellarchitected. --- .../service/wellarchitected/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/wellarchitected/service_package_gen.go b/internal/service/wellarchitected/service_package_gen.go index 5161d0e1870..caf4ca06972 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 4f9d748549a726c15810487bae66701c3382416e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:27 -0400 Subject: [PATCH 238/981] No need for import aliases - worklink. --- internal/service/worklink/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/worklink/service_package_gen.go b/internal/service/worklink/service_package_gen.go index 9c2bb19e09d..a8464c40e4f 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 9b270366a69f0c8bc581fdf787625afba051899c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:28 -0400 Subject: [PATCH 239/981] No need for import aliases - workspaces. --- internal/service/workspaces/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/workspaces/service_package_gen.go b/internal/service/workspaces/service_package_gen.go index 701e6fd2eac..247694d5d9a 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From d7e3f4cc3984b19b5d761028d51f2782406d33d5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:28 -0400 Subject: [PATCH 240/981] No need for import aliases - workspacesweb. --- .../service/workspacesweb/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/workspacesweb/service_package_gen.go b/internal/service/workspacesweb/service_package_gen.go index 7fb1a4e3d37..e0d60d38376 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 915cb52575a9083283984c6fd45ec91a644cbc64 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 21 Oct 2024 18:03:28 -0400 Subject: [PATCH 241/981] No need for import aliases - xray. --- internal/service/xray/service_package_gen.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/xray/service_package_gen.go b/internal/service/xray/service_package_gen.go index 71fd0136436..380a168ddbb 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(newEndpointResolverSDKv2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 5453e46dc2cf2fbd9df2d2e1f934c1cb50acbff4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:36:41 -0400 Subject: [PATCH 242/981] internal/generate/serviceendpointtests: Remove AWS SDK for Go v1 support. --- .../generate/serviceendpointtests/file.gtpl | 97 +++---------------- .../generate/serviceendpointtests/main.go | 14 +-- 2 files changed, 14 insertions(+), 97 deletions(-) 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 8a56146d69f..7b941ebd382 100644 --- a/internal/generate/serviceendpointtests/main.go +++ b/internal/generate/serviceendpointtests/main.go @@ -60,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", @@ -73,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" { @@ -121,7 +112,6 @@ func main() { type TemplateData struct { HumanFriendly string PackageName string - SDKVersion int GoPackage string ProviderNameUpper string Region string From 8ca87e0830ead3f08651f297f2f4a0532279c67e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:19 -0400 Subject: [PATCH 243/981] No need for import aliases - accessanalyzer. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 6514aaba229cd61e1beb2091ca703b154d87710f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:19 -0400 Subject: [PATCH 244/981] No need for import aliases - account. --- .../account/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 5b3961d7494faa144bfd5d52818b75bf11de130c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:19 -0400 Subject: [PATCH 245/981] No need for import aliases - acm. --- .../service/acm/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From c9a728b9b1fde82b64e70248f22ba5efcea28d6a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:19 -0400 Subject: [PATCH 246/981] No need for import aliases - acmpca. --- .../acmpca/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From be5311a118a16403f1076913d69b9ba8a20892cd Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:19 -0400 Subject: [PATCH 247/981] No need for import aliases - amp. --- .../service/amp/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From bcd155c720b03c9bf2107f6c96576466473b49eb Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:19 -0400 Subject: [PATCH 248/981] No need for import aliases - amplify. --- .../amplify/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 49c9995fc2a16f8de456f46972179176bc8456e1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:19 -0400 Subject: [PATCH 249/981] No need for import aliases - apigateway. --- .../apigateway/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From d76067aedb570d9a8aaea9f98d933b6053cd3ed1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:19 -0400 Subject: [PATCH 250/981] No need for import aliases - apigatewayv2. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From ec16e61d080614ffcf0a57f0d8d1c066902fd6fa Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:19 -0400 Subject: [PATCH 251/981] No need for import aliases - appautoscaling. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 7413dc9c726d7e019f4dc1d4e2387c72ed44f57e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:19 -0400 Subject: [PATCH 252/981] No need for import aliases - appconfig. --- .../appconfig/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 99297a6acc7312d98d084a4747dad94f735fa080 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:19 -0400 Subject: [PATCH 253/981] No need for import aliases - appfabric. --- .../appfabric/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 2ad75fd7711c7ca32d91955a034f9d82bbf66752 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:19 -0400 Subject: [PATCH 254/981] No need for import aliases - appflow. --- .../appflow/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From e7514b761b8213a41533d69b44610865b90df8f8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:20 -0400 Subject: [PATCH 255/981] No need for import aliases - appintegrations. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 1e936ecbdf2533bac4d001b576ec03aa1c9de82c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:20 -0400 Subject: [PATCH 256/981] No need for import aliases - applicationinsights. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From a3f72c34b0ba3696d436c46e422bc20943d5fa1b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:20 -0400 Subject: [PATCH 257/981] No need for import aliases - applicationsignals. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From f8390fc86b9cee801867f8e879b70efd7d511244 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:20 -0400 Subject: [PATCH 258/981] No need for import aliases - appmesh. --- .../appmesh/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 3aa6b2be73c8577fea3914463e1b09dcc31d2a95 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:20 -0400 Subject: [PATCH 259/981] No need for import aliases - apprunner. --- .../apprunner/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From d1454123b62251cd099fab41393b2b602fb6f83f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:20 -0400 Subject: [PATCH 260/981] No need for import aliases - appstream. --- .../appstream/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/internal/service/appstream/service_endpoints_gen_test.go b/internal/service/appstream/service_endpoints_gen_test.go index fb1ffc89e95..4fdb62c2562 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{ + _, err := client.ListAssociatedFleets(ctx, &appstream.ListAssociatedFleetsInput{ StackName: aws_sdkv2.String("test"), }, - func(opts *appstream_sdkv2.Options) { + func(opts *appstream.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), From 6a37d9a185d92973c262c890790b5bab67a7442b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:20 -0400 Subject: [PATCH 261/981] No need for import aliases - appsync. --- .../appsync/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 7b756bca1c4da3cfc2db6120f37caaf89da4a25d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:20 -0400 Subject: [PATCH 262/981] No need for import aliases - athena. --- .../athena/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 13e88e537d878114818f36f856f51b8eebb46216 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:20 -0400 Subject: [PATCH 263/981] No need for import aliases - auditmanager. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 818ab22aedce978925056e626c84c1d047373cce Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:20 -0400 Subject: [PATCH 264/981] No need for import aliases - autoscaling. --- .../autoscaling/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 3fdbddb7d410130b0d413f323b27a17d83614acf Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:20 -0400 Subject: [PATCH 265/981] No need for import aliases - autoscalingplans. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 2415d2a06a45491df050c587dbf9fad37cbf7554 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:20 -0400 Subject: [PATCH 266/981] No need for import aliases - backup. --- .../backup/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From c9cc603b569d5e64c4696edbbe035771519176c2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:20 -0400 Subject: [PATCH 267/981] No need for import aliases - batch. --- .../batch/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 2d2e2551658e32f2a41d789bd0e11705ac935715 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:21 -0400 Subject: [PATCH 268/981] No need for import aliases - bcmdataexports. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 5242e63effba529e910e52ae4e722225fb27ed7d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:21 -0400 Subject: [PATCH 269/981] No need for import aliases - bedrock. --- .../bedrock/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 89e1de897726118b04298dfa32b456791e53b8f3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:21 -0400 Subject: [PATCH 270/981] No need for import aliases - bedrockagent. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 68ec9c0179b0d590e6b71ad5db819239e1bd4a92 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:21 -0400 Subject: [PATCH 271/981] No need for import aliases - budgets. --- .../budgets/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/internal/service/budgets/service_endpoints_gen_test.go b/internal/service/budgets/service_endpoints_gen_test.go index 77c2ed2bd31..9e2fe316f15 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{ + _, err := client.DescribeBudgets(ctx, &budgets.DescribeBudgetsInput{ AccountId: aws_sdkv2.String("012345678901"), }, - func(opts *budgets_sdkv2.Options) { + func(opts *budgets.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), From e241fb2b8fb8d25a3f0752b9e427905b7771a3f7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:21 -0400 Subject: [PATCH 272/981] No need for import aliases - ce. --- .../service/ce/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 0496a4f6d6d48b973a5cba66ee07c2ca6347a0ef Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:21 -0400 Subject: [PATCH 273/981] No need for import aliases - chatbot. --- .../chatbot/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From a8c9b78cfc6a24c17f4623bd723b7cf508f79fac Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:21 -0400 Subject: [PATCH 274/981] No need for import aliases - chime. --- .../chime/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From a0a55be2e260fe64a823ad65b0ea28dd0f66528a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:21 -0400 Subject: [PATCH 275/981] No need for import aliases - chimesdkmediapipelines. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 433606b8e145befcc6c729e2e3206f0f011bb526 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:21 -0400 Subject: [PATCH 276/981] No need for import aliases - chimesdkvoice. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 46bd82d142222a6aa6de0e7f7032fe66adfa22a8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:21 -0400 Subject: [PATCH 277/981] No need for import aliases - cleanrooms. --- .../cleanrooms/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From c0b1b2fdd0348ba6b548bee6f8816efa320efc79 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:21 -0400 Subject: [PATCH 278/981] No need for import aliases - cloud9. --- .../cloud9/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 084ba5084b9ae41b039b122d4a3df4b23c0503d1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:21 -0400 Subject: [PATCH 279/981] No need for import aliases - cloudcontrol. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 50913be3aae220c2c7e624a835a07f674be41291 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:22 -0400 Subject: [PATCH 280/981] No need for import aliases - cloudformation. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/internal/service/cloudformation/service_endpoints_gen_test.go b/internal/service/cloudformation/service_endpoints_gen_test.go index 62b2e30a098..6978ffcf171 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{ + _, err := client.ListStackInstances(ctx, &cloudformation.ListStackInstancesInput{ StackSetName: aws_sdkv2.String("test"), }, - func(opts *cloudformation_sdkv2.Options) { + func(opts *cloudformation.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), From 3844d48041fdeea5d6206ee8dcf666b098c4cd53 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:22 -0400 Subject: [PATCH 281/981] No need for import aliases - cloudfront. --- .../cloudfront/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From ce0777ad0a16584ff31cf04c2dc14fdc66824b49 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:22 -0400 Subject: [PATCH 282/981] No need for import aliases - cloudhsmv2. --- .../cloudhsmv2/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From f478fe5fbc25ffbcf1ac83afc50abf880e1a5808 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:22 -0400 Subject: [PATCH 283/981] No need for import aliases - cloudsearch. --- .../cloudsearch/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From eb02da0dd1282f69e25a7fbaca00d8c85bee3b08 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:22 -0400 Subject: [PATCH 284/981] No need for import aliases - cloudtrail. --- .../cloudtrail/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From ad2cb5d187fefd24c14bcc1732f7695032bbbc65 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:22 -0400 Subject: [PATCH 285/981] No need for import aliases - cloudwatch. --- .../cloudwatch/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From c9d31451170f63343f95afea43d1978e0c6c4264 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:22 -0400 Subject: [PATCH 286/981] No need for import aliases - codeartifact. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From c84406803374960d016ed389478e0009b2355355 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:22 -0400 Subject: [PATCH 287/981] No need for import aliases - codebuild. --- .../codebuild/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 2df7975ec196bc12964c023bb8b794a6142db14e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:22 -0400 Subject: [PATCH 288/981] No need for import aliases - codecommit. --- .../codecommit/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 10e6414cbdb4553bff141a380e75b58a33fa0c5c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:23 -0400 Subject: [PATCH 289/981] No need for import aliases - codeconnections. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From b57cc67bc45a9d33835c12e77f8f7658b9c45898 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:23 -0400 Subject: [PATCH 290/981] No need for import aliases - codeguruprofiler. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 7d91149cb4b0ceae4d4dbda67a47b556adaccdfd Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:23 -0400 Subject: [PATCH 291/981] No need for import aliases - codegurureviewer. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 3240a9697244284f7c4e3db1b1c12d99deaf1485 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:23 -0400 Subject: [PATCH 292/981] No need for import aliases - codepipeline. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 123dfe46e0c4ba2ced484ac8ba20a8ef9585adca Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:23 -0400 Subject: [PATCH 293/981] No need for import aliases - codestarconnections. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 844b05a8f5af6e9c325492c79a2bfa9f421d7e45 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:23 -0400 Subject: [PATCH 294/981] No need for import aliases - codestarnotifications. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From be68b491a5dc88142625f202465e5c7d4eb5a83f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:23 -0400 Subject: [PATCH 295/981] No need for import aliases - cognitoidentity. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/internal/service/cognitoidentity/service_endpoints_gen_test.go b/internal/service/cognitoidentity/service_endpoints_gen_test.go index d591f7f93c4..4fe644bcc11 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{ + _, err := client.ListIdentityPools(ctx, &cognitoidentity.ListIdentityPoolsInput{ MaxResults: aws_sdkv2.Int32(1), }, - func(opts *cognitoidentity_sdkv2.Options) { + func(opts *cognitoidentity.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), From d3d6af11dd586a58046e9361c7d401bec24749b0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:23 -0400 Subject: [PATCH 296/981] No need for import aliases - cognitoidp. --- .../cognitoidp/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/internal/service/cognitoidp/service_endpoints_gen_test.go b/internal/service/cognitoidp/service_endpoints_gen_test.go index ececd9786a9..1e2512b4a4d 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{ + _, err := client.ListUserPools(ctx, &cognitoidentityprovider.ListUserPoolsInput{ MaxResults: aws_sdkv2.Int32(1), }, - func(opts *cognitoidentityprovider_sdkv2.Options) { + func(opts *cognitoidentityprovider.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), From 2849e80154a573a70d22f96ef306caf781c87ad9 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:23 -0400 Subject: [PATCH 297/981] No need for import aliases - comprehend. --- .../comprehend/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 9b9ffc396cd36a8a7190eb3e007b5070c3fdaa70 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:23 -0400 Subject: [PATCH 298/981] No need for import aliases - computeoptimizer. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From f0702b794fa38d2f365179721e96f48e3f3606e2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:23 -0400 Subject: [PATCH 299/981] No need for import aliases - configservice. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From a3b5481f37277b31ea27e0919acc0a4672a47875 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:23 -0400 Subject: [PATCH 300/981] No need for import aliases - connect. --- .../connect/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 6165570042b9648400a09df372744d7b93cc1191 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:23 -0400 Subject: [PATCH 301/981] No need for import aliases - connectcases. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From f0bbef07c1dfec58c240ce84229df74184bfb0a9 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:24 -0400 Subject: [PATCH 302/981] No need for import aliases - controltower. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 807c82c80e62fcf02cf1a040ac659dcf4ed766f0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:24 -0400 Subject: [PATCH 303/981] No need for import aliases - costoptimizationhub. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 403b16f346314806ab168283ea74f20e39c4408a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:24 -0400 Subject: [PATCH 304/981] No need for import aliases - cur. --- .../service/cur/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From f3a89f28147ec0599a976c3fe13f7872a7771bb0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:24 -0400 Subject: [PATCH 305/981] No need for import aliases - customerprofiles. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From b996d39eced27438b3dcab3a576afc8fab8b1f73 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:24 -0400 Subject: [PATCH 306/981] No need for import aliases - databrew. --- .../databrew/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From e1db3e0face2129057535d22b6423b974664feb6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:24 -0400 Subject: [PATCH 307/981] No need for import aliases - dataexchange. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 089e139a75c3195ea35a37068284370e70e9d589 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:24 -0400 Subject: [PATCH 308/981] No need for import aliases - datapipeline. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From ea14df542edb03045f9dc61eea32d33ba81ed792 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:24 -0400 Subject: [PATCH 309/981] No need for import aliases - datasync. --- .../datasync/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From ac9c821093c967592363e246a6ab93345b7f09ce Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:24 -0400 Subject: [PATCH 310/981] No need for import aliases - datazone. --- .../datazone/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 31f86e97caf7c2bbf921a1e20c298de7b10fca1d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:24 -0400 Subject: [PATCH 311/981] No need for import aliases - dax. --- .../service/dax/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From a00a2101b486575d6f7154583059b698914e56ac Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:24 -0400 Subject: [PATCH 312/981] No need for import aliases - deploy. --- .../deploy/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 513285628aeaab79e0d4ab653756fe7daff6f0f4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:24 -0400 Subject: [PATCH 313/981] No need for import aliases - detective. --- .../detective/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 220541a9cae8189770dd94d2102fec8f44b99c5f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:24 -0400 Subject: [PATCH 314/981] No need for import aliases - devicefarm. --- .../devicefarm/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 97efc165f09c491d09c08c306d41cae1dff3e480 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:25 -0400 Subject: [PATCH 315/981] No need for import aliases - devopsguru. --- .../devopsguru/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From e4847cf009bfcaf579cc67e7f6a65765e40cf770 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:25 -0400 Subject: [PATCH 316/981] No need for import aliases - directconnect. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 8e91fd3ef3be7ad4fcd979bc9644e42275bdefb9 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:25 -0400 Subject: [PATCH 317/981] No need for import aliases - dlm. --- .../service/dlm/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From ca832012cafa1ee1d2250021f6562c7975352366 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:25 -0400 Subject: [PATCH 318/981] No need for import aliases - dms. --- .../service/dms/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 18b243684676037fdd4671ae067fd020916dd417 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:25 -0400 Subject: [PATCH 319/981] No need for import aliases - docdb. --- .../docdb/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 54144b8e814a665bfe7ab5d1faaf81bc46aad18b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:25 -0400 Subject: [PATCH 320/981] No need for import aliases - docdbelastic. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From e3717f11c66056a0b01db6ac26bd544fe671d5e5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:25 -0400 Subject: [PATCH 321/981] No need for import aliases - drs. --- .../service/drs/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From bca84f790b76d70578f55c2371ac352c31654021 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:25 -0400 Subject: [PATCH 322/981] No need for import aliases - ds. --- .../service/ds/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From afde8edfcd3ce2720f699f8006d45d7997912311 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:25 -0400 Subject: [PATCH 323/981] No need for import aliases - dynamodb. --- .../dynamodb/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 912a88a2dead4b4c5177db16c6b35a7c0be62ce6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:25 -0400 Subject: [PATCH 324/981] No need for import aliases - ec2. --- .../service/ec2/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 5ac4077dd741470184a2955eb64450625db1cb05 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:25 -0400 Subject: [PATCH 325/981] No need for import aliases - ecr. --- .../service/ecr/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 3ee93ec953769bc9fbaa4b7c2b0845be8dd0e4bd Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:25 -0400 Subject: [PATCH 326/981] No need for import aliases - ecrpublic. --- .../ecrpublic/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From bb3211a2e0bef7232fde06ecdbf70f1a5b9d479f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:27 -0400 Subject: [PATCH 327/981] No need for import aliases - ecs. --- .../service/ecs/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 0a73b487b6d0b1610204850186020750344cbddd Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:27 -0400 Subject: [PATCH 328/981] No need for import aliases - efs. --- .../service/efs/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 79d1927693f288ad12c173f309b44f2fb9018e40 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:27 -0400 Subject: [PATCH 329/981] No need for import aliases - eks. --- .../service/eks/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 0be0951053b2f82b08d3870942ce201a5a83d0c0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:27 -0400 Subject: [PATCH 330/981] No need for import aliases - elasticache. --- .../elasticache/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 0d7506fd6587d60d1ec65065176efeebf9791e6e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:27 -0400 Subject: [PATCH 331/981] No need for import aliases - elasticbeanstalk. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From d605909158e07f3ed81dd91941b9ca8a151bb304 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:27 -0400 Subject: [PATCH 332/981] No need for import aliases - elasticsearch. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From a182b6503ff808d587de9f62e142f834fbfea869 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:27 -0400 Subject: [PATCH 333/981] No need for import aliases - elastictranscoder. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From d0148a582bfb0d04d70a586dd0c060897f8335ab Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:27 -0400 Subject: [PATCH 334/981] No need for import aliases - elb. --- .../service/elb/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From b6738360df2d788f904607510e2d4f1854f622cd Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:27 -0400 Subject: [PATCH 335/981] No need for import aliases - elbv2. --- .../elbv2/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 14e501d9e968dba4e388fbb098b7982a4e49a577 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:27 -0400 Subject: [PATCH 336/981] No need for import aliases - emr. --- .../service/emr/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 8274ee188fcd735b539b3b1e76b092e46c712c90 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:27 -0400 Subject: [PATCH 337/981] No need for import aliases - emrcontainers. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From f6405729f43943caeea8ab44eb186cfb7311473a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:28 -0400 Subject: [PATCH 338/981] No need for import aliases - emrserverless. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From bde2322825c1439bbbf3da3b77f4c50cf8dd2351 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:28 -0400 Subject: [PATCH 339/981] No need for import aliases - events. --- .../events/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 2e522ce44f1c23b40ef8b069412d66bc57fcf05a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:28 -0400 Subject: [PATCH 340/981] No need for import aliases - evidently. --- .../evidently/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 00facaed011fb6be84f6f96bcba64bbf64a21b5b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:28 -0400 Subject: [PATCH 341/981] No need for import aliases - finspace. --- .../finspace/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 6e87ff541541f68c7a4ab792dc5740b2f753f8de Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:28 -0400 Subject: [PATCH 342/981] No need for import aliases - firehose. --- .../firehose/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 42025bd4d5105f9729c0ca006baec6f96e2e3d31 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:28 -0400 Subject: [PATCH 343/981] No need for import aliases - fis. --- .../service/fis/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 6f451032088cdc487fb8b03e03f219f09ba7a02e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:28 -0400 Subject: [PATCH 344/981] No need for import aliases - fms. --- .../service/fms/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/internal/service/fms/service_endpoints_gen_test.go b/internal/service/fms/service_endpoints_gen_test.go index 3d77de12ff7..4f96fa68042 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{ + _, err := client.ListAppsLists(ctx, &fms.ListAppsListsInput{ MaxResults: aws_sdkv2.Int32(1), }, - func(opts *fms_sdkv2.Options) { + func(opts *fms.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), From d8cb5fd92d3fbcab210a714cbc63bde56d6d2232 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:28 -0400 Subject: [PATCH 345/981] No need for import aliases - fsx. --- .../service/fsx/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 51776f9fa332297981c802c423ff71a34d2a394a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:28 -0400 Subject: [PATCH 346/981] No need for import aliases - gamelift. --- .../gamelift/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From fb9655bb090621a7633ee3d6254893b51faa445c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:28 -0400 Subject: [PATCH 347/981] No need for import aliases - glacier. --- .../glacier/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From ca0047c968e4c066f89797c909223ca966ed4d46 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:28 -0400 Subject: [PATCH 348/981] No need for import aliases - globalaccelerator. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From e38abdd672e6388ea76090f060205e400b9a8ab4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:30 -0400 Subject: [PATCH 349/981] No need for import aliases - glue. --- .../glue/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From ba08d8732c0332b15fb233666ad01cd7c659911f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:30 -0400 Subject: [PATCH 350/981] No need for import aliases - grafana. --- .../grafana/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 40176fc6d124c0a42183a608b64d46a445ada7c8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:30 -0400 Subject: [PATCH 351/981] No need for import aliases - greengrass. --- .../greengrass/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 6cfd861d095e371b0ae22eacd731d24c5d175df1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:30 -0400 Subject: [PATCH 352/981] No need for import aliases - groundstation. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 43c3fa9da0ebd768bda6b6f4417e20bcc8a83e76 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:30 -0400 Subject: [PATCH 353/981] No need for import aliases - guardduty. --- .../guardduty/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 6d6abe5a3905f8d7849843644192dc630b6f806e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:30 -0400 Subject: [PATCH 354/981] No need for import aliases - healthlake. --- .../healthlake/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From bd0cc7b9d748f58c5da6d35f7ec7a44bf8d65ed1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:31 -0400 Subject: [PATCH 355/981] No need for import aliases - iam. --- .../service/iam/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From e59e0a75b085ce0e874d8fc284b2aea5fd52770b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:31 -0400 Subject: [PATCH 356/981] No need for import aliases - identitystore. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/internal/service/identitystore/service_endpoints_gen_test.go b/internal/service/identitystore/service_endpoints_gen_test.go index 5bd48890719..1fbddc99c45 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{ + _, err := client.ListUsers(ctx, &identitystore.ListUsersInput{ IdentityStoreId: aws_sdkv2.String("d-1234567890"), }, - func(opts *identitystore_sdkv2.Options) { + func(opts *identitystore.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), From da9b1161db11f1f03bcf9a2a58a1d767fe4e2fe0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:31 -0400 Subject: [PATCH 357/981] No need for import aliases - imagebuilder. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 3638d9aa7bcea2763ae6492175ab5c6d879e59e8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:31 -0400 Subject: [PATCH 358/981] No need for import aliases - inspector. --- .../inspector/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 095919baf2eb30c3ecb36a879f0946a3a5f963e5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:31 -0400 Subject: [PATCH 359/981] No need for import aliases - inspector2. --- .../inspector2/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From c733600bbba03cd0ffde0a5765fb51d001f99788 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:31 -0400 Subject: [PATCH 360/981] No need for import aliases - internetmonitor. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 2dd610b44f5151b0980ab155cf001e26b71b2429 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:31 -0400 Subject: [PATCH 361/981] No need for import aliases - iot. --- .../service/iot/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From e014d17b1ac109cbc337eb711c6051b9db4966e8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:32 -0400 Subject: [PATCH 362/981] No need for import aliases - iotanalytics. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 2cb16b0b74400e2506d5010f9f05c9958aff9a45 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:32 -0400 Subject: [PATCH 363/981] No need for import aliases - iotevents. --- .../iotevents/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 4629468aaf54a14bde5da5004f98488ddeafe85c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:32 -0400 Subject: [PATCH 364/981] No need for import aliases - ivs. --- .../service/ivs/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 4879227164b499e6bd248ad5a5c2cfde86e79f69 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:32 -0400 Subject: [PATCH 365/981] No need for import aliases - ivschat. --- .../ivschat/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From bf6a0c635bcecd77acaa527ba76ffffa2aa9e15f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:32 -0400 Subject: [PATCH 366/981] No need for import aliases - kafka. --- .../kafka/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 0015d3d22860c71f2adfdd299acbe2622861f893 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:32 -0400 Subject: [PATCH 367/981] No need for import aliases - kafkaconnect. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 8c8ea81bbe2a2392d3e73b4acb756de8b8c9825b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:32 -0400 Subject: [PATCH 368/981] No need for import aliases - kendra. --- .../kendra/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 48fcfe15de91c1bf3521ad6668d5e0f4eebf6ac3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:32 -0400 Subject: [PATCH 369/981] No need for import aliases - keyspaces. --- .../keyspaces/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From c218afbb60f61a6dfa0a0a501c872c983cbdb65f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:33 -0400 Subject: [PATCH 370/981] No need for import aliases - kinesis. --- .../kinesis/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From acf3053972caf654bb1ab0262b5882c6f514b3ab Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:33 -0400 Subject: [PATCH 371/981] No need for import aliases - kinesisanalytics. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From b174d51b45ca2c9cec9c0ea704aa66de692cc0ea Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:33 -0400 Subject: [PATCH 372/981] No need for import aliases - kinesisanalyticsv2. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 1be90ef9d607266ed0bff352b7d7868252d755ad Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:33 -0400 Subject: [PATCH 373/981] No need for import aliases - kinesisvideo. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 20ec6248e1c8ab27869acac89472489abca6b805 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:33 -0400 Subject: [PATCH 374/981] No need for import aliases - kms. --- .../service/kms/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 600cbb7b6298ff0598fc2d0e8ce6a7fc8389bd1b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:33 -0400 Subject: [PATCH 375/981] No need for import aliases - lakeformation. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 7373a07bd1f03c45c73a28aa476c236f023f79a6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:33 -0400 Subject: [PATCH 376/981] No need for import aliases - lambda. --- .../lambda/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From dc6f7058c1d8be899c8f25fd82f81f6a664ec965 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:34 -0400 Subject: [PATCH 377/981] No need for import aliases - launchwizard. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 993cf4c65d07c3ebfe9c956e832ecbd2772f8c11 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:34 -0400 Subject: [PATCH 378/981] No need for import aliases - lexmodels. --- .../lexmodels/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From d6cd502ed0133bf886ea455b057590b97a77c120 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:34 -0400 Subject: [PATCH 379/981] No need for import aliases - lexv2models. --- .../lexv2models/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 05b8624f8821f6ff5ff7718d3d3502429a92ddd8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:34 -0400 Subject: [PATCH 380/981] No need for import aliases - licensemanager. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 31e9e8389b1810e8cedc0614f7352a2b17a7f6dd Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:34 -0400 Subject: [PATCH 381/981] No need for import aliases - lightsail. --- .../lightsail/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From b88f4ee40113867b5a25b0afb65b50469be948a8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:34 -0400 Subject: [PATCH 382/981] No need for import aliases - logs. --- .../logs/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 2f2e17e8a43ddb378066a638d618af5e6d5baebf Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:34 -0400 Subject: [PATCH 383/981] No need for import aliases - lookoutmetrics. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 3c91175da88f6796f83250301c879add3a485a5f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:34 -0400 Subject: [PATCH 384/981] No need for import aliases - m2. --- .../service/m2/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 1e70f385cabf5e79de9ea139a507f712ee74b7c3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:34 -0400 Subject: [PATCH 385/981] No need for import aliases - macie2. --- .../macie2/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 021446dc45988d26238ad5c9b08b32421389614a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:35 -0400 Subject: [PATCH 386/981] No need for import aliases - mediaconnect. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 51a86e1148786ddf453277577a2ff1eb98bfc8a4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:35 -0400 Subject: [PATCH 387/981] No need for import aliases - mediaconvert. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From a10163f02a4f38d1deed9d6a7c4fbbffb0b82c04 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:35 -0400 Subject: [PATCH 388/981] No need for import aliases - medialive. --- .../medialive/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 20322e0eab52aa318b47d459caa26b1ae42f263e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:35 -0400 Subject: [PATCH 389/981] No need for import aliases - mediapackage. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 0a933430939fa001962dd2c27040dc71bcd52117 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:35 -0400 Subject: [PATCH 390/981] No need for import aliases - mediapackagev2. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From b5b5c0bdcad64e9fc90cceed3081ec682c3fa437 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:35 -0400 Subject: [PATCH 391/981] No need for import aliases - mediastore. --- .../mediastore/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 2b9442fdd8bce013650a925e5362cfb8e49deafd Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:35 -0400 Subject: [PATCH 392/981] No need for import aliases - memorydb. --- .../memorydb/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 20e01bce3bd5dec99cc0f604c1ea65f89165343e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:35 -0400 Subject: [PATCH 393/981] No need for import aliases - mq. --- .../service/mq/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 6f1306c1fdc63377e68befa377cf5bef896934b4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:35 -0400 Subject: [PATCH 394/981] No need for import aliases - neptune. --- .../neptune/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From c36ee3153d371b931046e8c4425ca10bf74ac9b0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:36 -0400 Subject: [PATCH 395/981] No need for import aliases - networkfirewall. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 0d764268f70c098235367440eea40f3cf6e72a31 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:36 -0400 Subject: [PATCH 396/981] No need for import aliases - networkmanager. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From fd18a14c17b1a4ed1332b08b9fa96069d80b01b0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:36 -0400 Subject: [PATCH 397/981] No need for import aliases - networkmonitor. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 5383759d22ca62fdcc0c9100a1b455eaee4da67c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:36 -0400 Subject: [PATCH 398/981] No need for import aliases - oam. --- .../service/oam/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From f1b777c9e4f96bd493e765d7a0ab09c428e7003a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:36 -0400 Subject: [PATCH 399/981] No need for import aliases - opensearch. --- .../opensearch/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 4516a832c9b3925a7e8a529d2d3c9e35e61beb24 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:36 -0400 Subject: [PATCH 400/981] No need for import aliases - opensearchserverless. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From db768886343f7c8b564c20baead6c817d08136a0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:36 -0400 Subject: [PATCH 401/981] No need for import aliases - opsworks. --- .../opsworks/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 20790224013195c7ce2921f87040981f97be9fa3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:36 -0400 Subject: [PATCH 402/981] No need for import aliases - organizations. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 6a9b465bbae47a75e5ca18c7d03e5137f3589905 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:36 -0400 Subject: [PATCH 403/981] No need for import aliases - osis. --- .../osis/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 58b821f07446e1499e1973fdc6f980466a09bf0c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:36 -0400 Subject: [PATCH 404/981] No need for import aliases - outposts. --- .../outposts/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 94909168b698131447079cd6b5394290339dda9a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:36 -0400 Subject: [PATCH 405/981] No need for import aliases - pcaconnectorad. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 3b75d2d6fec913dbbbaaa17872fc715b8d81631d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:36 -0400 Subject: [PATCH 406/981] No need for import aliases - pcs. --- .../service/pcs/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From dc87a9f6bb4e42c070445cf9e66252f65af61ff2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:37 -0400 Subject: [PATCH 407/981] No need for import aliases - pinpoint. --- .../pinpoint/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From cb73a823233bd506164956ab7d0149954a634886 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:37 -0400 Subject: [PATCH 408/981] No need for import aliases - pinpointsmsvoicev2. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 31dd841f582ed0c871d3787843cf4f2dd635f591 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:37 -0400 Subject: [PATCH 409/981] No need for import aliases - pipes. --- .../pipes/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 4e16be1b548515c653b7ee081e1a67661920b7a4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:37 -0400 Subject: [PATCH 410/981] No need for import aliases - polly. --- .../polly/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 2e8caa113141359e9ccd130927ea7461faa1bb9d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:37 -0400 Subject: [PATCH 411/981] No need for import aliases - pricing. --- .../pricing/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 7aeb90caa5467625974ebe4f9acd27eae4792c31 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:37 -0400 Subject: [PATCH 412/981] No need for import aliases - qbusiness. --- .../qbusiness/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From c0c2a0f8b5ad2a419c9ed5119991699830cff022 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:37 -0400 Subject: [PATCH 413/981] No need for import aliases - qldb. --- .../qldb/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 8ac07725f242dec29bd186c3fefe6e4236be6337 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:37 -0400 Subject: [PATCH 414/981] No need for import aliases - quicksight. --- .../quicksight/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/internal/service/quicksight/service_endpoints_gen_test.go b/internal/service/quicksight/service_endpoints_gen_test.go index 5cb72c4ce81..90cb640c9dc 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{ + _, err := client.ListDashboards(ctx, &quicksight.ListDashboardsInput{ AwsAccountId: aws_sdkv2.String("123456789012"), }, - func(opts *quicksight_sdkv2.Options) { + func(opts *quicksight.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), From ccb1b610ef8eef282ecdd6cb5b0fefc728d7deaa Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:37 -0400 Subject: [PATCH 415/981] No need for import aliases - ram. --- .../service/ram/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 90f7a3d782187283e61ebdbd3dce7a1bce586088 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:37 -0400 Subject: [PATCH 416/981] No need for import aliases - rbin. --- .../rbin/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 981cef685cfb691497e572b546574ebe03202343 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:37 -0400 Subject: [PATCH 417/981] No need for import aliases - rds. --- .../service/rds/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From b22b8c3b49e6f14bd5baf28e200c255eeaa8dd89 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:37 -0400 Subject: [PATCH 418/981] No need for import aliases - redshift. --- .../redshift/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 68480b77e36354d2f3a25e6b84259c6707bd91b4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:37 -0400 Subject: [PATCH 419/981] No need for import aliases - redshiftdata. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/internal/service/redshiftdata/service_endpoints_gen_test.go b/internal/service/redshiftdata/service_endpoints_gen_test.go index abff32bcec6..5bb6aa12707 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{ + _, err := client.ListDatabases(ctx, &redshiftdata.ListDatabasesInput{ Database: aws_sdkv2.String("test"), }, - func(opts *redshiftdata_sdkv2.Options) { + func(opts *redshiftdata.Options) { opts.APIOptions = append(opts.APIOptions, addRetrieveEndpointURLMiddleware(t, &result.endpoint), addRetrieveRegionMiddleware(&result.region), From 7fcfc692368204251e40f7476eb0c3d6e12893ef Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:38 -0400 Subject: [PATCH 420/981] No need for import aliases - redshiftserverless. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From d4a4f7352dbb6751c08b9af9139e01ee335aa0e5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:38 -0400 Subject: [PATCH 421/981] No need for import aliases - rekognition. --- .../rekognition/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 1e498a38379330428a597715aa99651220ba8934 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:38 -0400 Subject: [PATCH 422/981] No need for import aliases - resiliencehub. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 1e57da591dda2dbb0e53504e6bd9a717cbee8033 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:38 -0400 Subject: [PATCH 423/981] No need for import aliases - resourceexplorer2. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 791c28983fbf2d91c33a6f5f89d324469f5a5cc3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:38 -0400 Subject: [PATCH 424/981] No need for import aliases - resourcegroups. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 79147342d6fe8ddcd801b8dceea71a972e6a3bfe Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:38 -0400 Subject: [PATCH 425/981] No need for import aliases - resourcegroupstaggingapi. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From cdb3d4b26bb708bb79d1897a6aed09676b56cc00 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:38 -0400 Subject: [PATCH 426/981] No need for import aliases - rolesanywhere. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From d2a09e521a2d86562c3e7135b63c024b086bbdff Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:38 -0400 Subject: [PATCH 427/981] No need for import aliases - route53. --- .../route53/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 509cf4bdd3397ef1cee79ddfc65a106048276726 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:38 -0400 Subject: [PATCH 428/981] No need for import aliases - route53domains. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 3ebfae8db1ab307e0e7e6c376b95ebfbccf24d00 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:38 -0400 Subject: [PATCH 429/981] No need for import aliases - route53recoverycontrolconfig. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 4a42e5ec594c3a1f0183f284b3b5afc4e3b9da7c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:38 -0400 Subject: [PATCH 430/981] No need for import aliases - route53recoveryreadiness. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From b2fc8db0e3a5863f8226446e1fa4e9fdebd6fd36 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:39 -0400 Subject: [PATCH 431/981] No need for import aliases - route53resolver. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 0b6133cf995ed87f5de90f291c8066e7e0ee82fa Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:39 -0400 Subject: [PATCH 432/981] No need for import aliases - rum. --- .../service/rum/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From bdf7e7543f64fabe49f2f0d8f5cb89554b50b4e2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:39 -0400 Subject: [PATCH 433/981] No need for import aliases - s3. --- .../service/s3/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 373b05a06f9af44c79c79c27028ad1d96d0209b0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:39 -0400 Subject: [PATCH 434/981] No need for import aliases - s3outposts. --- .../s3outposts/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From a5161311a60af5838eda35aba057d93e358bd29e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:39 -0400 Subject: [PATCH 435/981] No need for import aliases - sagemaker. --- .../sagemaker/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 167d8cdd1f0a50cee9611b0845eed0510ce7caab Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:39 -0400 Subject: [PATCH 436/981] No need for import aliases - scheduler. --- .../scheduler/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 632d56a7e14b33654847330a5e9222c289763bb4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:39 -0400 Subject: [PATCH 437/981] No need for import aliases - schemas. --- .../schemas/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From a68ddda4ae1f70786aa8ab16900a4b89608589e1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:39 -0400 Subject: [PATCH 438/981] No need for import aliases - secretsmanager. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 13dbbe8e4f93291cc7eb73b8ff427705c6259ac6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:39 -0400 Subject: [PATCH 439/981] No need for import aliases - securityhub. --- .../securityhub/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 6d5525b76d4adc61c80402aa2904d4b6baffc172 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:39 -0400 Subject: [PATCH 440/981] No need for import aliases - securitylake. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 84f32fd4af79bfa8c07f5babcb8d2293849f463f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:39 -0400 Subject: [PATCH 441/981] No need for import aliases - serverlessrepo. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 0d7791fac9a58bd03f9b994c04ec9d3e36b69a55 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:40 -0400 Subject: [PATCH 442/981] No need for import aliases - servicecatalog. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From c5573994d24a330c7c69e3783914a875b5aa6caa Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:40 -0400 Subject: [PATCH 443/981] No need for import aliases - servicecatalogappregistry. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 79dd748dca84f95d37e022149078c88ef0e97f6e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:40 -0400 Subject: [PATCH 444/981] No need for import aliases - servicediscovery. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From fda44cc89f98c096fbc4e2103e19b0e03e73f0d8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:40 -0400 Subject: [PATCH 445/981] No need for import aliases - servicequotas. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 4faa30d49d3b9480538e77e9ede09dc025eedd1f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:40 -0400 Subject: [PATCH 446/981] No need for import aliases - ses. --- .../service/ses/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From cd34b6fd8b4a22363d10bd55052cd0a0e820b1a0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:40 -0400 Subject: [PATCH 447/981] No need for import aliases - sesv2. --- .../sesv2/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 3217add2c92fd7cfb79a5cf76b2c036191eafad0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:40 -0400 Subject: [PATCH 448/981] No need for import aliases - sfn. --- .../service/sfn/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From e5e69697a1c9d36d65cfcd577d282c96675a44f3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:40 -0400 Subject: [PATCH 449/981] No need for import aliases - shield. --- .../shield/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From e667053cd87e32b9871ac8d65d7be6c620bbc2fa Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:40 -0400 Subject: [PATCH 450/981] No need for import aliases - signer. --- .../signer/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 6d49ace8cf30e9f1c8f1ac1a40591a046e189420 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:40 -0400 Subject: [PATCH 451/981] No need for import aliases - sns. --- .../service/sns/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From eb550ab084bcef1b56f79591d051aa7771b1d4c3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:40 -0400 Subject: [PATCH 452/981] No need for import aliases - sqs. --- .../service/sqs/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 2387bbf3e625a2540ebff98c91c9dec9616864c8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:41 -0400 Subject: [PATCH 453/981] No need for import aliases - ssm. --- .../service/ssm/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From ef8e43232f840e1a175b73233c58c9b1cfca89f3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:41 -0400 Subject: [PATCH 454/981] No need for import aliases - ssmcontacts. --- .../ssmcontacts/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From fa396c8ba1ab1cbf169a053fa15469c993dae79b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:41 -0400 Subject: [PATCH 455/981] No need for import aliases - ssmincidents. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 00754f1372fa9d4987efecc979c5eecf2e914fa1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:41 -0400 Subject: [PATCH 456/981] No need for import aliases - ssmquicksetup. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 7ef46e440c486b814835a114acc563d9feb982f5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:41 -0400 Subject: [PATCH 457/981] No need for import aliases - ssmsap. --- .../ssmsap/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From e69124b2ab00aa6ed1dbbdd4267ed5d4250cb5b8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:41 -0400 Subject: [PATCH 458/981] No need for import aliases - sso. --- .../service/sso/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/internal/service/sso/service_endpoints_gen_test.go b/internal/service/sso/service_endpoints_gen_test.go index db952c1bc0b..90ee2af09a0 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{ + _, err := client.ListAccounts(ctx, &sso.ListAccountsInput{ AccessToken: aws_sdkv2.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), From 842ca36c71f3cfc8c9ba09df0ca3172ee8bf13f2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:41 -0400 Subject: [PATCH 459/981] No need for import aliases - ssoadmin. --- .../ssoadmin/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 76902e163055f36b9d0328419dc165a91ff15189 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:41 -0400 Subject: [PATCH 460/981] No need for import aliases - storagegateway. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 348d9e5175258045ef024f2efca72187567c7281 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:41 -0400 Subject: [PATCH 461/981] No need for import aliases - sts. --- .../service/sts/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From aba00c4165491986ae0ca5146a6a90597bda0f95 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:41 -0400 Subject: [PATCH 462/981] No need for import aliases - swf. --- .../service/swf/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 3a52744e2ba8d47007bd521caad605319730bdcd Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:41 -0400 Subject: [PATCH 463/981] No need for import aliases - synthetics. --- .../synthetics/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From ce4fbd66e6ee8a44462815ea19401adeeb9fc2db Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:41 -0400 Subject: [PATCH 464/981] No need for import aliases - timestreaminfluxdb. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 7d34ea4576755c1e49a7a82f99ecd2656a7c2877 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:42 -0400 Subject: [PATCH 465/981] No need for import aliases - transcribe. --- .../transcribe/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 7b083c30bce7a29425bd01bd832f1fe1ccf16d1d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:42 -0400 Subject: [PATCH 466/981] No need for import aliases - transfer. --- .../transfer/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From e30be885a982dfe2258bd4f7332b2b8ddc72461b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:42 -0400 Subject: [PATCH 467/981] No need for import aliases - verifiedpermissions. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 400ae28bfa9bb8ea986fe7403d150e229a19b3d8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:42 -0400 Subject: [PATCH 468/981] No need for import aliases - vpclattice. --- .../vpclattice/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 2393e68d5cba1cdbb7b41cee40dead4a552d5184 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:42 -0400 Subject: [PATCH 469/981] No need for import aliases - waf. --- .../service/waf/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 9b23f3be61ba024272c28213ab8d7c33bd14e970 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:42 -0400 Subject: [PATCH 470/981] No need for import aliases - wafregional. --- .../wafregional/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From a18f5aa30a1144b162fa09321bfdde459429ba12 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:42 -0400 Subject: [PATCH 471/981] No need for import aliases - wafv2. --- .../wafv2/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 653fb75698bb09e16beaa95d47a345aa04e8f9c6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:42 -0400 Subject: [PATCH 472/981] No need for import aliases - wellarchitected. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 3b134634dabbbec0d6272d96339167d37f64c2c5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:42 -0400 Subject: [PATCH 473/981] No need for import aliases - worklink. --- .../worklink/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From a5ef74ac32c08d9cb24b5aa4db8dbe1faa9558ae Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:42 -0400 Subject: [PATCH 474/981] No need for import aliases - workspaces. --- .../workspaces/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 1d5cfb50c26fbe23aaefd0febfd9e4a5dc0201ce Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:42 -0400 Subject: [PATCH 475/981] No need for import aliases - workspacesweb. --- .../service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 05a6f350c638346d6d94f27c5ab4a4da96721929 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:40:42 -0400 Subject: [PATCH 476/981] No need for import aliases - xray. --- .../xray/service_endpoints_gen_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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), From 33ac65384afc9fbf3912203c5d34135027b1b229 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:46:46 -0400 Subject: [PATCH 477/981] internal/generate/servicepackage: Don't generate import aliases for endpoint resolver. --- .../servicepackage/endpoint_resolver.go.gtpl | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/generate/servicepackage/endpoint_resolver.go.gtpl b/internal/generate/servicepackage/endpoint_resolver.go.gtpl index 3e21637f700..5a2153f01ee 100644 --- a/internal/generate/servicepackage/endpoint_resolver.go.gtpl +++ b/internal/generate/servicepackage/endpoint_resolver.go.gtpl @@ -7,37 +7,37 @@ import ( "fmt" "net" - 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" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ {{ .GoV2Package }}_sdkv2.EndpointResolverV2 = resolverSDKv2{} +var _ {{ .GoV2Package }}.EndpointResolverV2 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver {{ .GoV2Package }}_sdkv2.EndpointResolverV2 + defaultResolver {{ .GoV2Package }}.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: {{ .GoV2Package }}_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: {{ .GoV2Package }}.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params {{ .GoV2Package }}_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) @@ -60,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 @@ -73,10 +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) } } } From 0cf708899fa55ae260cd4a834670d16ee009a4ec Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:50:44 -0400 Subject: [PATCH 478/981] Remove import alias for endpoint API params. --- names/data/names_data.hcl | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/names/data/names_data.hcl b/names/data/names_data.hcl index d43091c6e14..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 { @@ -8370,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 } @@ -8428,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 { @@ -8908,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 { From df5b6a427a1cecb1b1c49babcc55cf466bc27053 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 08:52:50 -0400 Subject: [PATCH 479/981] Run 'go generate ./internal/generate/serviceendpointtests'. --- internal/service/appstream/service_endpoints_gen_test.go | 2 +- internal/service/budgets/service_endpoints_gen_test.go | 2 +- internal/service/cloudformation/service_endpoints_gen_test.go | 2 +- internal/service/cognitoidentity/service_endpoints_gen_test.go | 2 +- internal/service/cognitoidp/service_endpoints_gen_test.go | 2 +- internal/service/fms/service_endpoints_gen_test.go | 2 +- internal/service/identitystore/service_endpoints_gen_test.go | 2 +- internal/service/quicksight/service_endpoints_gen_test.go | 2 +- internal/service/redshiftdata/service_endpoints_gen_test.go | 2 +- internal/service/sso/service_endpoints_gen_test.go | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/internal/service/appstream/service_endpoints_gen_test.go b/internal/service/appstream/service_endpoints_gen_test.go index 4fdb62c2562..a4daf567c52 100644 --- a/internal/service/appstream/service_endpoints_gen_test.go +++ b/internal/service/appstream/service_endpoints_gen_test.go @@ -284,7 +284,7 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams _, err := client.ListAssociatedFleets(ctx, &appstream.ListAssociatedFleetsInput{ - StackName: aws_sdkv2.String("test"), + StackName: aws.String("test"), }, func(opts *appstream.Options) { opts.APIOptions = append(opts.APIOptions, diff --git a/internal/service/budgets/service_endpoints_gen_test.go b/internal/service/budgets/service_endpoints_gen_test.go index 9e2fe316f15..13d1f0527bf 100644 --- a/internal/service/budgets/service_endpoints_gen_test.go +++ b/internal/service/budgets/service_endpoints_gen_test.go @@ -284,7 +284,7 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams _, err := client.DescribeBudgets(ctx, &budgets.DescribeBudgetsInput{ - AccountId: aws_sdkv2.String("012345678901"), + AccountId: aws.String("012345678901"), }, func(opts *budgets.Options) { opts.APIOptions = append(opts.APIOptions, diff --git a/internal/service/cloudformation/service_endpoints_gen_test.go b/internal/service/cloudformation/service_endpoints_gen_test.go index 6978ffcf171..f35a0e39a32 100644 --- a/internal/service/cloudformation/service_endpoints_gen_test.go +++ b/internal/service/cloudformation/service_endpoints_gen_test.go @@ -284,7 +284,7 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams _, err := client.ListStackInstances(ctx, &cloudformation.ListStackInstancesInput{ - StackSetName: aws_sdkv2.String("test"), + StackSetName: aws.String("test"), }, func(opts *cloudformation.Options) { opts.APIOptions = append(opts.APIOptions, diff --git a/internal/service/cognitoidentity/service_endpoints_gen_test.go b/internal/service/cognitoidentity/service_endpoints_gen_test.go index 4fe644bcc11..c19bb621a26 100644 --- a/internal/service/cognitoidentity/service_endpoints_gen_test.go +++ b/internal/service/cognitoidentity/service_endpoints_gen_test.go @@ -284,7 +284,7 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams _, err := client.ListIdentityPools(ctx, &cognitoidentity.ListIdentityPoolsInput{ - MaxResults: aws_sdkv2.Int32(1), + MaxResults: aws.Int32(1), }, func(opts *cognitoidentity.Options) { opts.APIOptions = append(opts.APIOptions, diff --git a/internal/service/cognitoidp/service_endpoints_gen_test.go b/internal/service/cognitoidp/service_endpoints_gen_test.go index 1e2512b4a4d..389dbed44f0 100644 --- a/internal/service/cognitoidp/service_endpoints_gen_test.go +++ b/internal/service/cognitoidp/service_endpoints_gen_test.go @@ -338,7 +338,7 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams _, err := client.ListUserPools(ctx, &cognitoidentityprovider.ListUserPoolsInput{ - MaxResults: aws_sdkv2.Int32(1), + MaxResults: aws.Int32(1), }, func(opts *cognitoidentityprovider.Options) { opts.APIOptions = append(opts.APIOptions, diff --git a/internal/service/fms/service_endpoints_gen_test.go b/internal/service/fms/service_endpoints_gen_test.go index 4f96fa68042..4518e79c8ef 100644 --- a/internal/service/fms/service_endpoints_gen_test.go +++ b/internal/service/fms/service_endpoints_gen_test.go @@ -284,7 +284,7 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams _, err := client.ListAppsLists(ctx, &fms.ListAppsListsInput{ - MaxResults: aws_sdkv2.Int32(1), + MaxResults: aws.Int32(1), }, func(opts *fms.Options) { opts.APIOptions = append(opts.APIOptions, diff --git a/internal/service/identitystore/service_endpoints_gen_test.go b/internal/service/identitystore/service_endpoints_gen_test.go index 1fbddc99c45..f80aed4ade0 100644 --- a/internal/service/identitystore/service_endpoints_gen_test.go +++ b/internal/service/identitystore/service_endpoints_gen_test.go @@ -284,7 +284,7 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams _, err := client.ListUsers(ctx, &identitystore.ListUsersInput{ - IdentityStoreId: aws_sdkv2.String("d-1234567890"), + IdentityStoreId: aws.String("d-1234567890"), }, func(opts *identitystore.Options) { opts.APIOptions = append(opts.APIOptions, diff --git a/internal/service/quicksight/service_endpoints_gen_test.go b/internal/service/quicksight/service_endpoints_gen_test.go index 90cb640c9dc..f8a59bc5b9d 100644 --- a/internal/service/quicksight/service_endpoints_gen_test.go +++ b/internal/service/quicksight/service_endpoints_gen_test.go @@ -284,7 +284,7 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams _, err := client.ListDashboards(ctx, &quicksight.ListDashboardsInput{ - AwsAccountId: aws_sdkv2.String("123456789012"), + AwsAccountId: aws.String("123456789012"), }, func(opts *quicksight.Options) { opts.APIOptions = append(opts.APIOptions, diff --git a/internal/service/redshiftdata/service_endpoints_gen_test.go b/internal/service/redshiftdata/service_endpoints_gen_test.go index 5bb6aa12707..b367764e86e 100644 --- a/internal/service/redshiftdata/service_endpoints_gen_test.go +++ b/internal/service/redshiftdata/service_endpoints_gen_test.go @@ -338,7 +338,7 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams _, err := client.ListDatabases(ctx, &redshiftdata.ListDatabasesInput{ - Database: aws_sdkv2.String("test"), + Database: aws.String("test"), }, func(opts *redshiftdata.Options) { opts.APIOptions = append(opts.APIOptions, diff --git a/internal/service/sso/service_endpoints_gen_test.go b/internal/service/sso/service_endpoints_gen_test.go index 90ee2af09a0..d5d40e5c62d 100644 --- a/internal/service/sso/service_endpoints_gen_test.go +++ b/internal/service/sso/service_endpoints_gen_test.go @@ -284,7 +284,7 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams _, err := client.ListAccounts(ctx, &sso.ListAccountsInput{ - AccessToken: aws_sdkv2.String("mock-access-token"), + AccessToken: aws.String("mock-access-token"), }, func(opts *sso.Options) { opts.APIOptions = append(opts.APIOptions, From 4a04aebb5099d51c9f402c6e94fcb8aa1e9758e4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:01:58 -0400 Subject: [PATCH 480/981] No need for import aliases - accessanalyzer. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/accessanalyzer/service_endpoint_resolver_gen.go b/internal/service/accessanalyzer/service_endpoint_resolver_gen.go index e79f9750e15..439e3c9a664 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver accessanalyzer_sdkv2.EndpointResolverV2 + defaultResolver accessanalyzer.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: accessanalyzer_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: accessanalyzer.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params accessanalyzer_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 4a528c7ac503018a6e9c56bdb67e3d1503ad9d46 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:01:58 -0400 Subject: [PATCH 481/981] No need for import aliases - account. --- .../account/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/account/service_endpoint_resolver_gen.go b/internal/service/account/service_endpoint_resolver_gen.go index 72cf9078368..3adffb2dbd3 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver account_sdkv2.EndpointResolverV2 + defaultResolver account.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: account_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: account.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params account_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 1068aad4798e9c63b007d2db67067bc540a7ad99 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:01:58 -0400 Subject: [PATCH 482/981] No need for import aliases - acm. --- .../acm/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/acm/service_endpoint_resolver_gen.go b/internal/service/acm/service_endpoint_resolver_gen.go index 7480d799fe9..f9b84c54756 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver acm_sdkv2.EndpointResolverV2 + defaultResolver acm.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: acm_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: acm.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params acm_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From ec22f4f16b91fffbd4f582ac239e45766a61ffa2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:01:58 -0400 Subject: [PATCH 483/981] No need for import aliases - acmpca. --- .../acmpca/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/acmpca/service_endpoint_resolver_gen.go b/internal/service/acmpca/service_endpoint_resolver_gen.go index 4b66c791a76..1330a0b201b 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver acmpca_sdkv2.EndpointResolverV2 + defaultResolver acmpca.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: acmpca_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: acmpca.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params acmpca_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From e66923de76c83911c544b0305ee2934ec10a14c8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:01:59 -0400 Subject: [PATCH 484/981] No need for import aliases - amp. --- .../amp/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/amp/service_endpoint_resolver_gen.go b/internal/service/amp/service_endpoint_resolver_gen.go index 6f695368d70..e2d6cdefb08 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver amp_sdkv2.EndpointResolverV2 + defaultResolver amp.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: amp_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: amp.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params amp_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From acb899ab50ea36d5a43b8d2b5f48866fb45df512 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:01:59 -0400 Subject: [PATCH 485/981] No need for import aliases - amplify. --- .../amplify/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/amplify/service_endpoint_resolver_gen.go b/internal/service/amplify/service_endpoint_resolver_gen.go index e9240af9bec..7c8d3fa0bd4 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver amplify_sdkv2.EndpointResolverV2 + defaultResolver amplify.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: amplify_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: amplify.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params amplify_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 000806cfc2844b99841d3146ebc62ba740d86c39 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:01:59 -0400 Subject: [PATCH 486/981] No need for import aliases - apigateway. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/apigateway/service_endpoint_resolver_gen.go b/internal/service/apigateway/service_endpoint_resolver_gen.go index ef2fdd642c0..5df720bdf1b 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver apigateway_sdkv2.EndpointResolverV2 + defaultResolver apigateway.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: apigateway_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: apigateway.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params apigateway_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From ca9de5be818b4e2431212368b5c00f7bc1208fb6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:01:59 -0400 Subject: [PATCH 487/981] No need for import aliases - apigatewayv2. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/apigatewayv2/service_endpoint_resolver_gen.go b/internal/service/apigatewayv2/service_endpoint_resolver_gen.go index 17adefe840e..7376c04594e 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver apigatewayv2_sdkv2.EndpointResolverV2 + defaultResolver apigatewayv2.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: apigatewayv2_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: apigatewayv2.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params apigatewayv2_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 010adf1ca4fd7ddc2e0a5c4b995177121bfb0b17 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:01:59 -0400 Subject: [PATCH 488/981] No need for import aliases - appautoscaling. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/appautoscaling/service_endpoint_resolver_gen.go b/internal/service/appautoscaling/service_endpoint_resolver_gen.go index 2cf14a255e7..b913bf6acc5 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver applicationautoscaling_sdkv2.EndpointResolverV2 + defaultResolver applicationautoscaling.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: applicationautoscaling_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: applicationautoscaling.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params applicationautoscaling_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 02a565ced23d812904bbb182f46577cf963fb618 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:01:59 -0400 Subject: [PATCH 489/981] No need for import aliases - appconfig. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/appconfig/service_endpoint_resolver_gen.go b/internal/service/appconfig/service_endpoint_resolver_gen.go index b4d977b4c89..1e7c5643688 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver appconfig_sdkv2.EndpointResolverV2 + defaultResolver appconfig.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: appconfig_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: appconfig.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params appconfig_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 03966a581b2690c52bf3107056ca501fe882f7f9 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:01:59 -0400 Subject: [PATCH 490/981] No need for import aliases - appfabric. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/appfabric/service_endpoint_resolver_gen.go b/internal/service/appfabric/service_endpoint_resolver_gen.go index 9fd29f6066c..662739c4585 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver appfabric_sdkv2.EndpointResolverV2 + defaultResolver appfabric.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: appfabric_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: appfabric.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params appfabric_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From f71f27f97b1d156eb095acd85d705fc5f7e9a43d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:01:59 -0400 Subject: [PATCH 491/981] No need for import aliases - appflow. --- .../appflow/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/appflow/service_endpoint_resolver_gen.go b/internal/service/appflow/service_endpoint_resolver_gen.go index ba1bddce5c4..a6720a139e3 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver appflow_sdkv2.EndpointResolverV2 + defaultResolver appflow.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: appflow_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: appflow.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params appflow_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 756c0b6a1b76222322a6b6bffb530ab4065df25b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:01:59 -0400 Subject: [PATCH 492/981] No need for import aliases - appintegrations. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/appintegrations/service_endpoint_resolver_gen.go b/internal/service/appintegrations/service_endpoint_resolver_gen.go index a0418374c30..0e49563eabf 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver appintegrations_sdkv2.EndpointResolverV2 + defaultResolver appintegrations.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: appintegrations_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: appintegrations.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params appintegrations_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From f4270805f8cf42eae77b08f3fa7bab75d6a7c31b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:01:59 -0400 Subject: [PATCH 493/981] No need for import aliases - applicationinsights. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/applicationinsights/service_endpoint_resolver_gen.go b/internal/service/applicationinsights/service_endpoint_resolver_gen.go index 9d2d60447ae..1359581fb7a 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver applicationinsights_sdkv2.EndpointResolverV2 + defaultResolver applicationinsights.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: applicationinsights_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: applicationinsights.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params applicationinsights_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 78e5390b42ba404e911db3efab2d0523fa91a7b9 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:01:59 -0400 Subject: [PATCH 494/981] No need for import aliases - applicationsignals. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/applicationsignals/service_endpoint_resolver_gen.go b/internal/service/applicationsignals/service_endpoint_resolver_gen.go index 1cce75da679..e7b2f300b1c 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver applicationsignals_sdkv2.EndpointResolverV2 + defaultResolver applicationsignals.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: applicationsignals_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: applicationsignals.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params applicationsignals_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 21d5c510fe2e64beb446a439d88944b0b943b698 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:01:59 -0400 Subject: [PATCH 495/981] No need for import aliases - appmesh. --- .../appmesh/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/appmesh/service_endpoint_resolver_gen.go b/internal/service/appmesh/service_endpoint_resolver_gen.go index a11a9b231c3..fcee08a602c 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver appmesh_sdkv2.EndpointResolverV2 + defaultResolver appmesh.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: appmesh_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: appmesh.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params appmesh_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 25fe44f1ae9d70dd44568ca52b15215884216c00 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:01:59 -0400 Subject: [PATCH 496/981] No need for import aliases - apprunner. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/apprunner/service_endpoint_resolver_gen.go b/internal/service/apprunner/service_endpoint_resolver_gen.go index af87f59ac6a..1c154aae64b 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver apprunner_sdkv2.EndpointResolverV2 + defaultResolver apprunner.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: apprunner_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: apprunner.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params apprunner_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 3af4ddf81243c09bde8fba0af1d7496c6e0bddfd Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:00 -0400 Subject: [PATCH 497/981] No need for import aliases - appstream. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/appstream/service_endpoint_resolver_gen.go b/internal/service/appstream/service_endpoint_resolver_gen.go index 3514cc65271..ec7c0ef1517 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver appstream_sdkv2.EndpointResolverV2 + defaultResolver appstream.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: appstream_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: appstream.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params appstream_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 4be32b15aa36e92c979d3fdb14d256d6cf6a3580 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:00 -0400 Subject: [PATCH 498/981] No need for import aliases - appsync. --- .../appsync/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/appsync/service_endpoint_resolver_gen.go b/internal/service/appsync/service_endpoint_resolver_gen.go index b05d35ea7d2..b8a76b77b00 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver appsync_sdkv2.EndpointResolverV2 + defaultResolver appsync.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: appsync_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: appsync.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params appsync_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From e0100fc7f6a896169922cbf52ed0af570d6750e6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:00 -0400 Subject: [PATCH 499/981] No need for import aliases - athena. --- .../athena/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/athena/service_endpoint_resolver_gen.go b/internal/service/athena/service_endpoint_resolver_gen.go index 6bb495fdaae..e691f76fe4b 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver athena_sdkv2.EndpointResolverV2 + defaultResolver athena.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: athena_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: athena.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params athena_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 69e28761933c71cf03f0e431cd9c91112ff8589f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:00 -0400 Subject: [PATCH 500/981] No need for import aliases - auditmanager. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/auditmanager/service_endpoint_resolver_gen.go b/internal/service/auditmanager/service_endpoint_resolver_gen.go index 5694d8436b9..33246bf69f6 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver auditmanager_sdkv2.EndpointResolverV2 + defaultResolver auditmanager.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: auditmanager_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: auditmanager.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params auditmanager_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From d7b9a27ce525457606e51ca8a76d6d3150cb2f7c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:00 -0400 Subject: [PATCH 501/981] No need for import aliases - autoscaling. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/autoscaling/service_endpoint_resolver_gen.go b/internal/service/autoscaling/service_endpoint_resolver_gen.go index 7957c8ce8dd..2c142a3648a 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver autoscaling_sdkv2.EndpointResolverV2 + defaultResolver autoscaling.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: autoscaling_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: autoscaling.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params autoscaling_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From ef29082da1879bf04501925596f7f9860dbff19a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:00 -0400 Subject: [PATCH 502/981] No need for import aliases - autoscalingplans. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/autoscalingplans/service_endpoint_resolver_gen.go b/internal/service/autoscalingplans/service_endpoint_resolver_gen.go index 8c35b996615..3ab42a7e423 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver autoscalingplans_sdkv2.EndpointResolverV2 + defaultResolver autoscalingplans.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: autoscalingplans_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: autoscalingplans.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params autoscalingplans_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From b8f98865f71eff9575d3a3145a2995ac54d32345 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:00 -0400 Subject: [PATCH 503/981] No need for import aliases - backup. --- .../backup/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/backup/service_endpoint_resolver_gen.go b/internal/service/backup/service_endpoint_resolver_gen.go index f858b73d3da..ed821c0bef4 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver backup_sdkv2.EndpointResolverV2 + defaultResolver backup.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: backup_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: backup.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params backup_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 8f2cd31ecd3d9e07a5ee31e2804cec719d2ab80c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:00 -0400 Subject: [PATCH 504/981] No need for import aliases - batch. --- .../batch/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/batch/service_endpoint_resolver_gen.go b/internal/service/batch/service_endpoint_resolver_gen.go index 19487e33495..8833c959df1 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver batch_sdkv2.EndpointResolverV2 + defaultResolver batch.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: batch_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: batch.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params batch_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From e5c567a80f5156cc62a48e773ed175ee27cbc7bf Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:00 -0400 Subject: [PATCH 505/981] No need for import aliases - bcmdataexports. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/bcmdataexports/service_endpoint_resolver_gen.go b/internal/service/bcmdataexports/service_endpoint_resolver_gen.go index f50188abbe5..67aa7f41d9b 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver bcmdataexports_sdkv2.EndpointResolverV2 + defaultResolver bcmdataexports.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: bcmdataexports_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: bcmdataexports.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params bcmdataexports_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 7b1f3ca81100a83ee6b91f07580e969b24406ebf Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:00 -0400 Subject: [PATCH 506/981] No need for import aliases - bedrock. --- .../bedrock/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/bedrock/service_endpoint_resolver_gen.go b/internal/service/bedrock/service_endpoint_resolver_gen.go index d6fea1353f1..d050ca66224 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver bedrock_sdkv2.EndpointResolverV2 + defaultResolver bedrock.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: bedrock_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: bedrock.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params bedrock_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 399da5f93602e1f3c2df6989024a96e7357247b9 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:00 -0400 Subject: [PATCH 507/981] No need for import aliases - bedrockagent. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/bedrockagent/service_endpoint_resolver_gen.go b/internal/service/bedrockagent/service_endpoint_resolver_gen.go index 60e5a6f7fc2..356fc622567 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver bedrockagent_sdkv2.EndpointResolverV2 + defaultResolver bedrockagent.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: bedrockagent_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: bedrockagent.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params bedrockagent_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 29473c18ab811ad941b4496efebb2a26c65d62cd Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:00 -0400 Subject: [PATCH 508/981] No need for import aliases - budgets. --- .../budgets/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/budgets/service_endpoint_resolver_gen.go b/internal/service/budgets/service_endpoint_resolver_gen.go index 57ad8f67282..0f48155c259 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver budgets_sdkv2.EndpointResolverV2 + defaultResolver budgets.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: budgets_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: budgets.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params budgets_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 98e35e22be6d8cf5182dfd6d60627ca29ac7e011 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:01 -0400 Subject: [PATCH 509/981] No need for import aliases - ce. --- .../ce/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/ce/service_endpoint_resolver_gen.go b/internal/service/ce/service_endpoint_resolver_gen.go index ec2655a1f54..6ac5a37b7f3 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver costexplorer_sdkv2.EndpointResolverV2 + defaultResolver costexplorer.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: costexplorer_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: costexplorer.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params costexplorer_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 4b0c7493a4edcac4801f6fed22322166771564a2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:01 -0400 Subject: [PATCH 510/981] No need for import aliases - chatbot. --- .../chatbot/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/chatbot/service_endpoint_resolver_gen.go b/internal/service/chatbot/service_endpoint_resolver_gen.go index 97545a9c42f..2efffeb8d1d 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver chatbot_sdkv2.EndpointResolverV2 + defaultResolver chatbot.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: chatbot_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: chatbot.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params chatbot_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From b7a65adbff9119842618e132545ea11a172eb3fd Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:01 -0400 Subject: [PATCH 511/981] No need for import aliases - chime. --- .../chime/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/chime/service_endpoint_resolver_gen.go b/internal/service/chime/service_endpoint_resolver_gen.go index 91792ee1acd..4c95775b8df 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver chime_sdkv2.EndpointResolverV2 + defaultResolver chime.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: chime_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: chime.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params chime_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 4d874b39dfb19d2d8629058aa07ce07345ac98e4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:01 -0400 Subject: [PATCH 512/981] No need for import aliases - chimesdkmediapipelines. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/chimesdkmediapipelines/service_endpoint_resolver_gen.go b/internal/service/chimesdkmediapipelines/service_endpoint_resolver_gen.go index f41b43341cc..49c1d745d3b 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver chimesdkmediapipelines_sdkv2.EndpointResolverV2 + defaultResolver chimesdkmediapipelines.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: chimesdkmediapipelines_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: chimesdkmediapipelines.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params chimesdkmediapipelines_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From a35855a7e491ef14471cbfa27f21e8f17e4077aa Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:01 -0400 Subject: [PATCH 513/981] No need for import aliases - chimesdkvoice. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/chimesdkvoice/service_endpoint_resolver_gen.go b/internal/service/chimesdkvoice/service_endpoint_resolver_gen.go index f05b10fd2bb..d5397bf5497 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver chimesdkvoice_sdkv2.EndpointResolverV2 + defaultResolver chimesdkvoice.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: chimesdkvoice_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: chimesdkvoice.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params chimesdkvoice_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From d4f08ebde90cf9d1658fd7e9eb183667be045590 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:01 -0400 Subject: [PATCH 514/981] No need for import aliases - cleanrooms. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/cleanrooms/service_endpoint_resolver_gen.go b/internal/service/cleanrooms/service_endpoint_resolver_gen.go index 85d8ecfde4b..4d4c7f495b1 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver cleanrooms_sdkv2.EndpointResolverV2 + defaultResolver cleanrooms.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: cleanrooms_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: cleanrooms.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params cleanrooms_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From deaa0a0ce3e5315b0be5ec1e50e76379fb4c03c8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:01 -0400 Subject: [PATCH 515/981] No need for import aliases - cloud9. --- .../cloud9/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/cloud9/service_endpoint_resolver_gen.go b/internal/service/cloud9/service_endpoint_resolver_gen.go index c84a54f62bf..5f7a81abd26 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver cloud9_sdkv2.EndpointResolverV2 + defaultResolver cloud9.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: cloud9_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: cloud9.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params cloud9_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From dd7eb374a2419f664773dac02497126d84475c22 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:01 -0400 Subject: [PATCH 516/981] No need for import aliases - cloudcontrol. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/cloudcontrol/service_endpoint_resolver_gen.go b/internal/service/cloudcontrol/service_endpoint_resolver_gen.go index 320a69e3193..5d6d7b147b3 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver cloudcontrol_sdkv2.EndpointResolverV2 + defaultResolver cloudcontrol.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: cloudcontrol_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: cloudcontrol.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params cloudcontrol_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 0a6c930804b1f230f08e6ae913c508edcb84f3fa Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:01 -0400 Subject: [PATCH 517/981] No need for import aliases - cloudformation. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/cloudformation/service_endpoint_resolver_gen.go b/internal/service/cloudformation/service_endpoint_resolver_gen.go index 441c8f8b889..fcd7f338274 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver cloudformation_sdkv2.EndpointResolverV2 + defaultResolver cloudformation.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: cloudformation_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: cloudformation.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params cloudformation_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 9bb32ca67fe126c4ef7f2cab8002d3c5cb544b05 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:01 -0400 Subject: [PATCH 518/981] No need for import aliases - cloudfront. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/cloudfront/service_endpoint_resolver_gen.go b/internal/service/cloudfront/service_endpoint_resolver_gen.go index ecb4e95c031..56e3b0f0fcf 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver cloudfront_sdkv2.EndpointResolverV2 + defaultResolver cloudfront.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: cloudfront_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: cloudfront.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params cloudfront_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From d96705dbb6155d704309279152f6c9714e8cfe3d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:01 -0400 Subject: [PATCH 519/981] No need for import aliases - cloudfrontkeyvaluestore. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/cloudfrontkeyvaluestore/service_endpoint_resolver_gen.go b/internal/service/cloudfrontkeyvaluestore/service_endpoint_resolver_gen.go index 620ffba3694..d49241b4fae 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver cloudfrontkeyvaluestore_sdkv2.EndpointResolverV2 + defaultResolver cloudfrontkeyvaluestore.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: cloudfrontkeyvaluestore_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: cloudfrontkeyvaluestore.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params cloudfrontkeyvaluestore_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 02147c814d7c7218b0d117ff68e8a1d227da0fc9 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:01 -0400 Subject: [PATCH 520/981] No need for import aliases - cloudhsmv2. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/cloudhsmv2/service_endpoint_resolver_gen.go b/internal/service/cloudhsmv2/service_endpoint_resolver_gen.go index da2305dd18d..bea2902ee82 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver cloudhsmv2_sdkv2.EndpointResolverV2 + defaultResolver cloudhsmv2.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: cloudhsmv2_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: cloudhsmv2.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params cloudhsmv2_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From d149c76ab52d0d25704330fcc57a34a7648df141 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:01 -0400 Subject: [PATCH 521/981] No need for import aliases - cloudsearch. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/cloudsearch/service_endpoint_resolver_gen.go b/internal/service/cloudsearch/service_endpoint_resolver_gen.go index 8231ab82f37..0846290d77c 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver cloudsearch_sdkv2.EndpointResolverV2 + defaultResolver cloudsearch.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: cloudsearch_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: cloudsearch.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params cloudsearch_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From c320ecdbfb856f211ecbc8132b5c7b7694863171 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:01 -0400 Subject: [PATCH 522/981] No need for import aliases - cloudtrail. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/cloudtrail/service_endpoint_resolver_gen.go b/internal/service/cloudtrail/service_endpoint_resolver_gen.go index 4def6ac6f8d..3d4b4b2cc13 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver cloudtrail_sdkv2.EndpointResolverV2 + defaultResolver cloudtrail.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: cloudtrail_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: cloudtrail.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params cloudtrail_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From b26d5f7bfd0f13fbab08ebdc4af8f3c35a5bbce9 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:02 -0400 Subject: [PATCH 523/981] No need for import aliases - cloudwatch. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/cloudwatch/service_endpoint_resolver_gen.go b/internal/service/cloudwatch/service_endpoint_resolver_gen.go index ef81ebe7107..931dedd77fe 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver cloudwatch_sdkv2.EndpointResolverV2 + defaultResolver cloudwatch.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: cloudwatch_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: cloudwatch.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params cloudwatch_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 28b7e891d9426ed772929cead5140aa3c9092f24 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:02 -0400 Subject: [PATCH 524/981] No need for import aliases - codeartifact. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/codeartifact/service_endpoint_resolver_gen.go b/internal/service/codeartifact/service_endpoint_resolver_gen.go index f6d18561c7e..feebff5637d 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver codeartifact_sdkv2.EndpointResolverV2 + defaultResolver codeartifact.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: codeartifact_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: codeartifact.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params codeartifact_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 79b7c26de4f3f8b71038ec7f8610891657f0eed0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:02 -0400 Subject: [PATCH 525/981] No need for import aliases - codebuild. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/codebuild/service_endpoint_resolver_gen.go b/internal/service/codebuild/service_endpoint_resolver_gen.go index 3e7182c0523..85ad2110635 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver codebuild_sdkv2.EndpointResolverV2 + defaultResolver codebuild.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: codebuild_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: codebuild.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params codebuild_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 04c4dadf39b4bf053d5d44bf0c9caf259134f5c7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:02 -0400 Subject: [PATCH 526/981] No need for import aliases - codecatalyst. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/codecatalyst/service_endpoint_resolver_gen.go b/internal/service/codecatalyst/service_endpoint_resolver_gen.go index 43b6ef1eae4..d0937bb3e97 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver codecatalyst_sdkv2.EndpointResolverV2 + defaultResolver codecatalyst.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: codecatalyst_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: codecatalyst.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params codecatalyst_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 5bf734278ea4292409d3492fbe48fbc237cbc4d1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:02 -0400 Subject: [PATCH 527/981] No need for import aliases - codecommit. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/codecommit/service_endpoint_resolver_gen.go b/internal/service/codecommit/service_endpoint_resolver_gen.go index afb73a1e822..06e923d1106 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver codecommit_sdkv2.EndpointResolverV2 + defaultResolver codecommit.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: codecommit_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: codecommit.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params codecommit_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 3b89ee5a01e8e92204a90c75b8be1ffab59730af Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:02 -0400 Subject: [PATCH 528/981] No need for import aliases - codeconnections. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/codeconnections/service_endpoint_resolver_gen.go b/internal/service/codeconnections/service_endpoint_resolver_gen.go index 1ad355f1109..76bbb6a5360 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver codeconnections_sdkv2.EndpointResolverV2 + defaultResolver codeconnections.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: codeconnections_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: codeconnections.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params codeconnections_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 5e6ef6df064fa872b24df76d0fdf52128cb35642 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:02 -0400 Subject: [PATCH 529/981] No need for import aliases - codeguruprofiler. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/codeguruprofiler/service_endpoint_resolver_gen.go b/internal/service/codeguruprofiler/service_endpoint_resolver_gen.go index 5de7eba5e10..7b136c977f4 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver codeguruprofiler_sdkv2.EndpointResolverV2 + defaultResolver codeguruprofiler.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: codeguruprofiler_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: codeguruprofiler.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params codeguruprofiler_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 847473965c1ab056caac3cce64fb4a05f2224867 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:02 -0400 Subject: [PATCH 530/981] No need for import aliases - codegurureviewer. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/codegurureviewer/service_endpoint_resolver_gen.go b/internal/service/codegurureviewer/service_endpoint_resolver_gen.go index 6ca17a9a960..febf1299391 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver codegurureviewer_sdkv2.EndpointResolverV2 + defaultResolver codegurureviewer.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: codegurureviewer_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: codegurureviewer.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params codegurureviewer_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 1bda9fa15bf14b4658dbe11c04f94e32f0b52b13 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:02 -0400 Subject: [PATCH 531/981] No need for import aliases - codepipeline. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/codepipeline/service_endpoint_resolver_gen.go b/internal/service/codepipeline/service_endpoint_resolver_gen.go index b1ee40353db..58c404872f1 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver codepipeline_sdkv2.EndpointResolverV2 + defaultResolver codepipeline.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: codepipeline_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: codepipeline.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params codepipeline_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 950a823317b5619449d8e6a315bc38073d77fddf Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:02 -0400 Subject: [PATCH 532/981] No need for import aliases - codestarconnections. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/codestarconnections/service_endpoint_resolver_gen.go b/internal/service/codestarconnections/service_endpoint_resolver_gen.go index ca67d0e38c4..6d03c0510c1 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver codestarconnections_sdkv2.EndpointResolverV2 + defaultResolver codestarconnections.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: codestarconnections_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: codestarconnections.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params codestarconnections_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 29a1fa8f744b8257ec697061c61b0d9c90c92ec5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:02 -0400 Subject: [PATCH 533/981] No need for import aliases - codestarnotifications. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/codestarnotifications/service_endpoint_resolver_gen.go b/internal/service/codestarnotifications/service_endpoint_resolver_gen.go index c9c8379b45f..45b0d54f8ba 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver codestarnotifications_sdkv2.EndpointResolverV2 + defaultResolver codestarnotifications.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: codestarnotifications_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: codestarnotifications.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params codestarnotifications_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From f074da2660aff3fd51e0a4fca3775c121b9ab35b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:02 -0400 Subject: [PATCH 534/981] No need for import aliases - cognitoidentity. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/cognitoidentity/service_endpoint_resolver_gen.go b/internal/service/cognitoidentity/service_endpoint_resolver_gen.go index 6b24b637ac8..f2056304233 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver cognitoidentity_sdkv2.EndpointResolverV2 + defaultResolver cognitoidentity.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: cognitoidentity_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: cognitoidentity.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params cognitoidentity_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 3bed03c83e797a5c03c7abb2fc7ecdbff3ef981c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:03 -0400 Subject: [PATCH 535/981] No need for import aliases - cognitoidp. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/cognitoidp/service_endpoint_resolver_gen.go b/internal/service/cognitoidp/service_endpoint_resolver_gen.go index 647eeb7dad3..66e0b0d0070 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver cognitoidentityprovider_sdkv2.EndpointResolverV2 + defaultResolver cognitoidentityprovider.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: cognitoidentityprovider_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: cognitoidentityprovider.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params cognitoidentityprovider_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 367f21136435128db9a5ef7fa4581a4055448242 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:03 -0400 Subject: [PATCH 536/981] No need for import aliases - comprehend. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/comprehend/service_endpoint_resolver_gen.go b/internal/service/comprehend/service_endpoint_resolver_gen.go index 1d65e617e95..4909aba48f3 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver comprehend_sdkv2.EndpointResolverV2 + defaultResolver comprehend.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: comprehend_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: comprehend.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params comprehend_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 4e6841d54964d36375126cbedc26db1b2abf421c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:03 -0400 Subject: [PATCH 537/981] No need for import aliases - computeoptimizer. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/computeoptimizer/service_endpoint_resolver_gen.go b/internal/service/computeoptimizer/service_endpoint_resolver_gen.go index ae76d51e24d..afcd91ac443 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver computeoptimizer_sdkv2.EndpointResolverV2 + defaultResolver computeoptimizer.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: computeoptimizer_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: computeoptimizer.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params computeoptimizer_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 75fbfebbe4834bbdab59aad7d5f42f316d361c9b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:03 -0400 Subject: [PATCH 538/981] No need for import aliases - configservice. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/configservice/service_endpoint_resolver_gen.go b/internal/service/configservice/service_endpoint_resolver_gen.go index b4c40a3b13c..1e2cc229a5e 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver configservice_sdkv2.EndpointResolverV2 + defaultResolver configservice.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: configservice_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: configservice.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params configservice_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 2d597a6cd0079cfa2cf8f51c00acf764b8ab8587 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:03 -0400 Subject: [PATCH 539/981] No need for import aliases - connect. --- .../connect/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/connect/service_endpoint_resolver_gen.go b/internal/service/connect/service_endpoint_resolver_gen.go index 5da76c236b0..2b3b2d262e7 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver connect_sdkv2.EndpointResolverV2 + defaultResolver connect.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: connect_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: connect.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params connect_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From e33f70d7031f13681aeeb9dbf7406ebae5fd5667 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:03 -0400 Subject: [PATCH 540/981] No need for import aliases - connectcases. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/connectcases/service_endpoint_resolver_gen.go b/internal/service/connectcases/service_endpoint_resolver_gen.go index ecbe3728fc0..37edf60ad15 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver connectcases_sdkv2.EndpointResolverV2 + defaultResolver connectcases.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: connectcases_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: connectcases.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params connectcases_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 70e41f1eed5b05d57eaa32d18ea2b743e0787459 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:03 -0400 Subject: [PATCH 541/981] No need for import aliases - controltower. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/controltower/service_endpoint_resolver_gen.go b/internal/service/controltower/service_endpoint_resolver_gen.go index 845783a2ef3..be971871437 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver controltower_sdkv2.EndpointResolverV2 + defaultResolver controltower.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: controltower_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: controltower.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params controltower_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 1ac05f14c284bd2187cea998c725a39554b958e0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:03 -0400 Subject: [PATCH 542/981] No need for import aliases - costoptimizationhub. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/costoptimizationhub/service_endpoint_resolver_gen.go b/internal/service/costoptimizationhub/service_endpoint_resolver_gen.go index 4b9d334a683..84cfea9c01c 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver costoptimizationhub_sdkv2.EndpointResolverV2 + defaultResolver costoptimizationhub.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: costoptimizationhub_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: costoptimizationhub.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params costoptimizationhub_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From afa640bb812c189534e7d729da1b0a252a5a8c78 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:03 -0400 Subject: [PATCH 543/981] No need for import aliases - cur. --- .../cur/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/cur/service_endpoint_resolver_gen.go b/internal/service/cur/service_endpoint_resolver_gen.go index 25fbdce7659..33687f28859 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver costandusagereportservice_sdkv2.EndpointResolverV2 + defaultResolver costandusagereportservice.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: costandusagereportservice_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: costandusagereportservice.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params costandusagereportservice_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From d7b41af672a1aea6e1175e2c1c0248932256251b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:03 -0400 Subject: [PATCH 544/981] No need for import aliases - customerprofiles. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/customerprofiles/service_endpoint_resolver_gen.go b/internal/service/customerprofiles/service_endpoint_resolver_gen.go index fede695c66d..f379ad95f8d 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver customerprofiles_sdkv2.EndpointResolverV2 + defaultResolver customerprofiles.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: customerprofiles_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: customerprofiles.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params customerprofiles_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 79e47e8ddf1f65310bc0ab98a7a584c349fb4362 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:03 -0400 Subject: [PATCH 545/981] No need for import aliases - databrew. --- .../databrew/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/databrew/service_endpoint_resolver_gen.go b/internal/service/databrew/service_endpoint_resolver_gen.go index 04cdf699416..193b9889fd6 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver databrew_sdkv2.EndpointResolverV2 + defaultResolver databrew.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: databrew_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: databrew.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params databrew_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 8c194b8e5d0881a4cf388799438e5707dc03eee5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:03 -0400 Subject: [PATCH 546/981] No need for import aliases - dataexchange. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/dataexchange/service_endpoint_resolver_gen.go b/internal/service/dataexchange/service_endpoint_resolver_gen.go index 4f0136469fa..378c59eab07 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver dataexchange_sdkv2.EndpointResolverV2 + defaultResolver dataexchange.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: dataexchange_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: dataexchange.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params dataexchange_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From f0e1d49225f9156cb39474c232fdce89b123fd23 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:03 -0400 Subject: [PATCH 547/981] No need for import aliases - datapipeline. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/datapipeline/service_endpoint_resolver_gen.go b/internal/service/datapipeline/service_endpoint_resolver_gen.go index a5582b9422b..6def99ec3a6 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver datapipeline_sdkv2.EndpointResolverV2 + defaultResolver datapipeline.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: datapipeline_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: datapipeline.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params datapipeline_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From f52c0bc6c76d235c03f0a3f306a89077f4431d9e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:04 -0400 Subject: [PATCH 548/981] No need for import aliases - datasync. --- .../datasync/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/datasync/service_endpoint_resolver_gen.go b/internal/service/datasync/service_endpoint_resolver_gen.go index b2f112f16df..4638fae23e0 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver datasync_sdkv2.EndpointResolverV2 + defaultResolver datasync.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: datasync_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: datasync.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params datasync_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 4abce1fa756dd79dfc977844ef1efd63c157117c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:04 -0400 Subject: [PATCH 549/981] No need for import aliases - datazone. --- .../datazone/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/datazone/service_endpoint_resolver_gen.go b/internal/service/datazone/service_endpoint_resolver_gen.go index 189bcbd6331..4fda7d8e886 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver datazone_sdkv2.EndpointResolverV2 + defaultResolver datazone.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: datazone_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: datazone.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params datazone_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From eee73d337ba5f0831565001cc34951ae104b2460 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:04 -0400 Subject: [PATCH 550/981] No need for import aliases - dax. --- .../dax/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/dax/service_endpoint_resolver_gen.go b/internal/service/dax/service_endpoint_resolver_gen.go index 669b613d31d..de0bb5208cb 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver dax_sdkv2.EndpointResolverV2 + defaultResolver dax.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: dax_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: dax.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params dax_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 3e5046741839598ec6887305359373bce534791b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:04 -0400 Subject: [PATCH 551/981] No need for import aliases - deploy. --- .../deploy/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/deploy/service_endpoint_resolver_gen.go b/internal/service/deploy/service_endpoint_resolver_gen.go index adff12f265a..fbb9c0ba4ea 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver codedeploy_sdkv2.EndpointResolverV2 + defaultResolver codedeploy.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: codedeploy_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: codedeploy.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params codedeploy_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 4dc462e84c2d762e0f9e3c2a92bb163207e2c590 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:04 -0400 Subject: [PATCH 552/981] No need for import aliases - detective. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/detective/service_endpoint_resolver_gen.go b/internal/service/detective/service_endpoint_resolver_gen.go index 10e73e73b3f..9e509ba8347 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver detective_sdkv2.EndpointResolverV2 + defaultResolver detective.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: detective_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: detective.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params detective_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 7f53f3c8ec14d34181ef941dd4c5f451a68862af Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:04 -0400 Subject: [PATCH 553/981] No need for import aliases - devicefarm. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/devicefarm/service_endpoint_resolver_gen.go b/internal/service/devicefarm/service_endpoint_resolver_gen.go index 8407250ab33..2c11d1cf10e 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver devicefarm_sdkv2.EndpointResolverV2 + defaultResolver devicefarm.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: devicefarm_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: devicefarm.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params devicefarm_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From fee19072de2e462f98135a9df0bd41749cf51ec9 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:04 -0400 Subject: [PATCH 554/981] No need for import aliases - devopsguru. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/devopsguru/service_endpoint_resolver_gen.go b/internal/service/devopsguru/service_endpoint_resolver_gen.go index 7d75a9544c1..2b4adaadf58 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver devopsguru_sdkv2.EndpointResolverV2 + defaultResolver devopsguru.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: devopsguru_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: devopsguru.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params devopsguru_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 75ccbf0fe2c0f8bf5865b45387d937f9f6e48d50 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:04 -0400 Subject: [PATCH 555/981] No need for import aliases - directconnect. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/directconnect/service_endpoint_resolver_gen.go b/internal/service/directconnect/service_endpoint_resolver_gen.go index b7f99a26cf3..d79805cce88 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver directconnect_sdkv2.EndpointResolverV2 + defaultResolver directconnect.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: directconnect_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: directconnect.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params directconnect_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 9d01214b73c87c1b816598da75b971d964c20cf7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:04 -0400 Subject: [PATCH 556/981] No need for import aliases - dlm. --- .../dlm/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/dlm/service_endpoint_resolver_gen.go b/internal/service/dlm/service_endpoint_resolver_gen.go index d2ecec96a2c..3e9159420d9 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver dlm_sdkv2.EndpointResolverV2 + defaultResolver dlm.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: dlm_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: dlm.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params dlm_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 23dd3edb5f2a61e1bc6f5a48f381d054d4f0e2c2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:04 -0400 Subject: [PATCH 557/981] No need for import aliases - dms. --- .../dms/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/dms/service_endpoint_resolver_gen.go b/internal/service/dms/service_endpoint_resolver_gen.go index efa8af3ae75..a9219a717bf 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver databasemigrationservice_sdkv2.EndpointResolverV2 + defaultResolver databasemigrationservice.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: databasemigrationservice_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: databasemigrationservice.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params databasemigrationservice_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 718bc44764ef1f08048fefdf946e1b218bb1a55d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:04 -0400 Subject: [PATCH 558/981] No need for import aliases - docdb. --- .../docdb/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/docdb/service_endpoint_resolver_gen.go b/internal/service/docdb/service_endpoint_resolver_gen.go index 8d551cfd7b9..9f1b60ca13f 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver docdb_sdkv2.EndpointResolverV2 + defaultResolver docdb.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: docdb_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: docdb.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params docdb_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 5f4cd3f65fc9180235d159cb6631cf61bd69638c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:04 -0400 Subject: [PATCH 559/981] No need for import aliases - docdbelastic. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/docdbelastic/service_endpoint_resolver_gen.go b/internal/service/docdbelastic/service_endpoint_resolver_gen.go index 2f0ca4f25f2..614557442bc 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver docdbelastic_sdkv2.EndpointResolverV2 + defaultResolver docdbelastic.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: docdbelastic_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: docdbelastic.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params docdbelastic_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 732b21511b72225d4817dbab622a971b22f341d7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:04 -0400 Subject: [PATCH 560/981] No need for import aliases - drs. --- .../drs/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/drs/service_endpoint_resolver_gen.go b/internal/service/drs/service_endpoint_resolver_gen.go index 660ba2ba0d7..e2cabcd4ccd 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver drs_sdkv2.EndpointResolverV2 + defaultResolver drs.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: drs_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: drs.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params drs_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From c0166f652b389f6a7c87bdb17556de29ddcc2b99 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:05 -0400 Subject: [PATCH 561/981] No need for import aliases - ds. --- .../ds/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/ds/service_endpoint_resolver_gen.go b/internal/service/ds/service_endpoint_resolver_gen.go index 971a5cd3e23..1e05968df74 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver directoryservice_sdkv2.EndpointResolverV2 + defaultResolver directoryservice.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: directoryservice_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: directoryservice.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params directoryservice_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 9882e1445c4f0438695450fec69be3374383a4c0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:05 -0400 Subject: [PATCH 562/981] No need for import aliases - dynamodb. --- .../dynamodb/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/dynamodb/service_endpoint_resolver_gen.go b/internal/service/dynamodb/service_endpoint_resolver_gen.go index 49fe698597c..0ff204b8dfe 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver dynamodb_sdkv2.EndpointResolverV2 + defaultResolver dynamodb.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: dynamodb_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: dynamodb.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params dynamodb_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From e0c298e28e5dcf9d8b99824b11c74c163a6887fb Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:05 -0400 Subject: [PATCH 563/981] No need for import aliases - ec2. --- .../ec2/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/ec2/service_endpoint_resolver_gen.go b/internal/service/ec2/service_endpoint_resolver_gen.go index 05755fb2a09..a156dd1cb61 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver ec2_sdkv2.EndpointResolverV2 + defaultResolver ec2.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: ec2_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: ec2.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params ec2_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 8895fd7a969a6c5c4b2a472fcfe662c8219cd0ab Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:05 -0400 Subject: [PATCH 564/981] No need for import aliases - ecr. --- .../ecr/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/ecr/service_endpoint_resolver_gen.go b/internal/service/ecr/service_endpoint_resolver_gen.go index 550251f394c..721cc9d5ed6 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver ecr_sdkv2.EndpointResolverV2 + defaultResolver ecr.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: ecr_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: ecr.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params ecr_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From acab5280c086901f443e8d56bb038f125fa3657a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:05 -0400 Subject: [PATCH 565/981] No need for import aliases - ecrpublic. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/ecrpublic/service_endpoint_resolver_gen.go b/internal/service/ecrpublic/service_endpoint_resolver_gen.go index e87de1cf693..56af30ae549 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver ecrpublic_sdkv2.EndpointResolverV2 + defaultResolver ecrpublic.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: ecrpublic_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: ecrpublic.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params ecrpublic_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 098847a050f6c59478b2b173fb00a78ba1bfd8fc Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:05 -0400 Subject: [PATCH 566/981] No need for import aliases - ecs. --- .../ecs/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/ecs/service_endpoint_resolver_gen.go b/internal/service/ecs/service_endpoint_resolver_gen.go index ec77b1947f6..f95d5008f38 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver ecs_sdkv2.EndpointResolverV2 + defaultResolver ecs.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: ecs_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: ecs.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params ecs_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From ddd1790ec4e0d4d344a8f74d40f8dd25fa47b739 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:05 -0400 Subject: [PATCH 567/981] No need for import aliases - efs. --- .../efs/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/efs/service_endpoint_resolver_gen.go b/internal/service/efs/service_endpoint_resolver_gen.go index 266db9695a0..3411cdff25e 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver efs_sdkv2.EndpointResolverV2 + defaultResolver efs.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: efs_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: efs.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params efs_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 6d57696436b36514e680628a395b4bbce6160a04 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:05 -0400 Subject: [PATCH 568/981] No need for import aliases - eks. --- .../eks/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/eks/service_endpoint_resolver_gen.go b/internal/service/eks/service_endpoint_resolver_gen.go index ac68cc8cc13..1b9582996f1 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver eks_sdkv2.EndpointResolverV2 + defaultResolver eks.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: eks_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: eks.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params eks_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 04cd00ec0f10e630714bea0930170a6adfb0f606 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:05 -0400 Subject: [PATCH 569/981] No need for import aliases - elasticache. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/elasticache/service_endpoint_resolver_gen.go b/internal/service/elasticache/service_endpoint_resolver_gen.go index b29997cfee0..736d599d0af 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver elasticache_sdkv2.EndpointResolverV2 + defaultResolver elasticache.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: elasticache_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: elasticache.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params elasticache_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 87497b70c1937086921f842ea7a99d50081385c1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:05 -0400 Subject: [PATCH 570/981] No need for import aliases - elasticbeanstalk. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/elasticbeanstalk/service_endpoint_resolver_gen.go b/internal/service/elasticbeanstalk/service_endpoint_resolver_gen.go index c80d6aa11e4..84467819cda 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver elasticbeanstalk_sdkv2.EndpointResolverV2 + defaultResolver elasticbeanstalk.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: elasticbeanstalk_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: elasticbeanstalk.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params elasticbeanstalk_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 36069ad8f4f07c6974334fe8a23c5c526d73907b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:05 -0400 Subject: [PATCH 571/981] No need for import aliases - elasticsearch. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/elasticsearch/service_endpoint_resolver_gen.go b/internal/service/elasticsearch/service_endpoint_resolver_gen.go index 5c0d13000e1..3e7cb3420b6 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver elasticsearchservice_sdkv2.EndpointResolverV2 + defaultResolver elasticsearchservice.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: elasticsearchservice_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: elasticsearchservice.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params elasticsearchservice_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From bc63d9c3ba8190d2112e1a2e5ca677ddaf709794 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:05 -0400 Subject: [PATCH 572/981] No need for import aliases - elastictranscoder. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/elastictranscoder/service_endpoint_resolver_gen.go b/internal/service/elastictranscoder/service_endpoint_resolver_gen.go index 5f2459b54e7..4d6a627e351 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver elastictranscoder_sdkv2.EndpointResolverV2 + defaultResolver elastictranscoder.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: elastictranscoder_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: elastictranscoder.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params elastictranscoder_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 82797a7b764269ad14b5c4bc65dba4f5e55719a4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:05 -0400 Subject: [PATCH 573/981] No need for import aliases - elb. --- .../elb/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/elb/service_endpoint_resolver_gen.go b/internal/service/elb/service_endpoint_resolver_gen.go index 941c5efd895..f69997dd369 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver elasticloadbalancing_sdkv2.EndpointResolverV2 + defaultResolver elasticloadbalancing.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: elasticloadbalancing_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: elasticloadbalancing.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params elasticloadbalancing_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From b9e52450ee844573ad1cf19e866a87107f6f5d9e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:06 -0400 Subject: [PATCH 574/981] No need for import aliases - elbv2. --- .../elbv2/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/elbv2/service_endpoint_resolver_gen.go b/internal/service/elbv2/service_endpoint_resolver_gen.go index d1a1bde0233..ca4bf24a284 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver elasticloadbalancingv2_sdkv2.EndpointResolverV2 + defaultResolver elasticloadbalancingv2.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: elasticloadbalancingv2_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: elasticloadbalancingv2.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params elasticloadbalancingv2_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From a30c8b0276662e138ef0796d42f403ca55d3e0db Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:06 -0400 Subject: [PATCH 575/981] No need for import aliases - emr. --- .../emr/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/emr/service_endpoint_resolver_gen.go b/internal/service/emr/service_endpoint_resolver_gen.go index 33c970d203a..c19ce2f9615 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver emr_sdkv2.EndpointResolverV2 + defaultResolver emr.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: emr_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: emr.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params emr_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 7d874644aaee5c48ff0f1a3ad4ec35d7c07bcee1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:06 -0400 Subject: [PATCH 576/981] No need for import aliases - emrcontainers. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/emrcontainers/service_endpoint_resolver_gen.go b/internal/service/emrcontainers/service_endpoint_resolver_gen.go index 2836eabb49a..d1f95913261 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver emrcontainers_sdkv2.EndpointResolverV2 + defaultResolver emrcontainers.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: emrcontainers_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: emrcontainers.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params emrcontainers_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 58b24f752feba8f0eef76c60191889caffa1a453 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:06 -0400 Subject: [PATCH 577/981] No need for import aliases - emrserverless. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/emrserverless/service_endpoint_resolver_gen.go b/internal/service/emrserverless/service_endpoint_resolver_gen.go index 1e5a0a357fc..e15454f8dcf 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver emrserverless_sdkv2.EndpointResolverV2 + defaultResolver emrserverless.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: emrserverless_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: emrserverless.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params emrserverless_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From fe75152550d36eccb518af1a353f23d6a13d2de9 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:06 -0400 Subject: [PATCH 578/981] No need for import aliases - events. --- .../events/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/events/service_endpoint_resolver_gen.go b/internal/service/events/service_endpoint_resolver_gen.go index 3506ec51991..2f69a83725b 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver eventbridge_sdkv2.EndpointResolverV2 + defaultResolver eventbridge.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: eventbridge_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: eventbridge.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params eventbridge_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From f5a4ef2ad3b89cd66662aca29f76f8541a6cce3f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:06 -0400 Subject: [PATCH 579/981] No need for import aliases - evidently. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/evidently/service_endpoint_resolver_gen.go b/internal/service/evidently/service_endpoint_resolver_gen.go index ef4156707ad..72faf506aab 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver evidently_sdkv2.EndpointResolverV2 + defaultResolver evidently.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: evidently_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: evidently.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params evidently_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 3f45e2c72409870f03b906b3379a71b59a0c3ca7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:06 -0400 Subject: [PATCH 580/981] No need for import aliases - finspace. --- .../finspace/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/finspace/service_endpoint_resolver_gen.go b/internal/service/finspace/service_endpoint_resolver_gen.go index ee6aad2fed0..9c0150abcda 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver finspace_sdkv2.EndpointResolverV2 + defaultResolver finspace.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: finspace_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: finspace.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params finspace_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 3ef2d9f5c617830eff708e670394ab056186fc09 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:06 -0400 Subject: [PATCH 581/981] No need for import aliases - firehose. --- .../firehose/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/firehose/service_endpoint_resolver_gen.go b/internal/service/firehose/service_endpoint_resolver_gen.go index 35ce6c8e9cf..51f29e2df66 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver firehose_sdkv2.EndpointResolverV2 + defaultResolver firehose.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: firehose_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: firehose.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params firehose_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 0f70bcac1c3a29febca992f9cf96ca7e33fba62f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:06 -0400 Subject: [PATCH 582/981] No need for import aliases - fis. --- .../fis/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/fis/service_endpoint_resolver_gen.go b/internal/service/fis/service_endpoint_resolver_gen.go index 7d0816e8673..198d63863db 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver fis_sdkv2.EndpointResolverV2 + defaultResolver fis.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: fis_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: fis.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params fis_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From ba96fcb79a453d909f2c03c872604f83a5cbb1f9 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:06 -0400 Subject: [PATCH 583/981] No need for import aliases - fms. --- .../fms/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/fms/service_endpoint_resolver_gen.go b/internal/service/fms/service_endpoint_resolver_gen.go index cdfe197026f..6e767f8f840 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver fms_sdkv2.EndpointResolverV2 + defaultResolver fms.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: fms_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: fms.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params fms_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 6e8e5d9061356e184a8be5ec5f5c53e92e31f36f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:06 -0400 Subject: [PATCH 584/981] No need for import aliases - fsx. --- .../fsx/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/fsx/service_endpoint_resolver_gen.go b/internal/service/fsx/service_endpoint_resolver_gen.go index 43a93b544c2..100b8a217b4 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver fsx_sdkv2.EndpointResolverV2 + defaultResolver fsx.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: fsx_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: fsx.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params fsx_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From bba22c024a1748ff211246a0565427ec748ca1ea Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:06 -0400 Subject: [PATCH 585/981] No need for import aliases - gamelift. --- .../gamelift/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/gamelift/service_endpoint_resolver_gen.go b/internal/service/gamelift/service_endpoint_resolver_gen.go index 950bf453d4a..f8576cf8d5e 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver gamelift_sdkv2.EndpointResolverV2 + defaultResolver gamelift.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: gamelift_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: gamelift.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params gamelift_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From aec1711b4c3111c0b1b6ce8fd640b9b2a09ac9dc Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:06 -0400 Subject: [PATCH 586/981] No need for import aliases - glacier. --- .../glacier/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/glacier/service_endpoint_resolver_gen.go b/internal/service/glacier/service_endpoint_resolver_gen.go index 231b2af334a..2752be6c994 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver glacier_sdkv2.EndpointResolverV2 + defaultResolver glacier.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: glacier_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: glacier.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params glacier_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 78120bf2dce4c9e67011463a91a253ecef8d03aa Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:07 -0400 Subject: [PATCH 587/981] No need for import aliases - globalaccelerator. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/globalaccelerator/service_endpoint_resolver_gen.go b/internal/service/globalaccelerator/service_endpoint_resolver_gen.go index f278b6c4634..2a1af0af01d 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver globalaccelerator_sdkv2.EndpointResolverV2 + defaultResolver globalaccelerator.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: globalaccelerator_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: globalaccelerator.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params globalaccelerator_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 5370ccf8c63e3b88929d3a49df97a59499fea99e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:07 -0400 Subject: [PATCH 588/981] No need for import aliases - glue. --- .../glue/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/glue/service_endpoint_resolver_gen.go b/internal/service/glue/service_endpoint_resolver_gen.go index 727040172bb..3e89b13a919 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver glue_sdkv2.EndpointResolverV2 + defaultResolver glue.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: glue_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: glue.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params glue_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From dca65428a8ad081b6030cfa979f6d58a96155d2e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:07 -0400 Subject: [PATCH 589/981] No need for import aliases - grafana. --- .../grafana/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/grafana/service_endpoint_resolver_gen.go b/internal/service/grafana/service_endpoint_resolver_gen.go index 0b615b5eb0e..ac738b925c1 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver grafana_sdkv2.EndpointResolverV2 + defaultResolver grafana.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: grafana_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: grafana.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params grafana_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From e25de2352f4e580741f0e8b1c4b6c35a41548c98 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:07 -0400 Subject: [PATCH 590/981] No need for import aliases - greengrass. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/greengrass/service_endpoint_resolver_gen.go b/internal/service/greengrass/service_endpoint_resolver_gen.go index c1563d389c3..46a78f1ec93 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver greengrass_sdkv2.EndpointResolverV2 + defaultResolver greengrass.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: greengrass_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: greengrass.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params greengrass_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 99b2f41f98d9bd48a45d6d538f1255b52bc101ae Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:07 -0400 Subject: [PATCH 591/981] No need for import aliases - groundstation. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/groundstation/service_endpoint_resolver_gen.go b/internal/service/groundstation/service_endpoint_resolver_gen.go index e449cafde9f..8f81dc955fa 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver groundstation_sdkv2.EndpointResolverV2 + defaultResolver groundstation.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: groundstation_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: groundstation.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params groundstation_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From ae0534cf4d431eb71c283c55918c0e334c3b208a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:07 -0400 Subject: [PATCH 592/981] No need for import aliases - guardduty. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/guardduty/service_endpoint_resolver_gen.go b/internal/service/guardduty/service_endpoint_resolver_gen.go index 776011ae2e1..931e917be3a 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver guardduty_sdkv2.EndpointResolverV2 + defaultResolver guardduty.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: guardduty_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: guardduty.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params guardduty_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From bb6576fecfae69b30f2201a0fde4747b21f97709 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:07 -0400 Subject: [PATCH 593/981] No need for import aliases - healthlake. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/healthlake/service_endpoint_resolver_gen.go b/internal/service/healthlake/service_endpoint_resolver_gen.go index d106de30043..d96b8b80d30 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver healthlake_sdkv2.EndpointResolverV2 + defaultResolver healthlake.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: healthlake_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: healthlake.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params healthlake_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From a8036071aadcbab30aaef89289ae1876c1a65431 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:07 -0400 Subject: [PATCH 594/981] No need for import aliases - iam. --- .../iam/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/iam/service_endpoint_resolver_gen.go b/internal/service/iam/service_endpoint_resolver_gen.go index 288dd84b150..d9b319b2762 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver iam_sdkv2.EndpointResolverV2 + defaultResolver iam.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: iam_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: iam.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params iam_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From acdea19a6ef5cb80e35ba9f519449fa2b151f27f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:07 -0400 Subject: [PATCH 595/981] No need for import aliases - identitystore. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/identitystore/service_endpoint_resolver_gen.go b/internal/service/identitystore/service_endpoint_resolver_gen.go index f0ecaf695ce..71ad5643314 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver identitystore_sdkv2.EndpointResolverV2 + defaultResolver identitystore.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: identitystore_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: identitystore.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params identitystore_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 6ccf509030da69816fcacdef9555989ecbb8d072 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:07 -0400 Subject: [PATCH 596/981] No need for import aliases - imagebuilder. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/imagebuilder/service_endpoint_resolver_gen.go b/internal/service/imagebuilder/service_endpoint_resolver_gen.go index 21a9dff1235..98d7d0372fe 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver imagebuilder_sdkv2.EndpointResolverV2 + defaultResolver imagebuilder.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: imagebuilder_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: imagebuilder.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params imagebuilder_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From aa8011fbaff8000612192b47eb8bc65f357896fd Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:07 -0400 Subject: [PATCH 597/981] No need for import aliases - inspector. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/inspector/service_endpoint_resolver_gen.go b/internal/service/inspector/service_endpoint_resolver_gen.go index 8a62f5e1183..184869a50bd 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver inspector_sdkv2.EndpointResolverV2 + defaultResolver inspector.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: inspector_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: inspector.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params inspector_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 82a425d52a1cb3484b5e95b120597e13189ce6aa Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:07 -0400 Subject: [PATCH 598/981] No need for import aliases - inspector2. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/inspector2/service_endpoint_resolver_gen.go b/internal/service/inspector2/service_endpoint_resolver_gen.go index f01799d5882..2e74495ae36 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver inspector2_sdkv2.EndpointResolverV2 + defaultResolver inspector2.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: inspector2_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: inspector2.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params inspector2_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From fb68fc4268a8271c68ed81960399345ee9145610 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:07 -0400 Subject: [PATCH 599/981] No need for import aliases - internetmonitor. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/internetmonitor/service_endpoint_resolver_gen.go b/internal/service/internetmonitor/service_endpoint_resolver_gen.go index 2585620b6e9..d74ce017d6b 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver internetmonitor_sdkv2.EndpointResolverV2 + defaultResolver internetmonitor.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: internetmonitor_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: internetmonitor.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params internetmonitor_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From b3e5fe263b7ed9cef2eb6d336196c50ff85c97c4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:08 -0400 Subject: [PATCH 600/981] No need for import aliases - iot. --- .../iot/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/iot/service_endpoint_resolver_gen.go b/internal/service/iot/service_endpoint_resolver_gen.go index fedf65be258..3c98e6d4b83 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver iot_sdkv2.EndpointResolverV2 + defaultResolver iot.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: iot_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: iot.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params iot_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 831ef0d629c80c535c4b336d743c9698ab979d45 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:08 -0400 Subject: [PATCH 601/981] No need for import aliases - iotanalytics. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/iotanalytics/service_endpoint_resolver_gen.go b/internal/service/iotanalytics/service_endpoint_resolver_gen.go index eba81098a25..6bb06e22351 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver iotanalytics_sdkv2.EndpointResolverV2 + defaultResolver iotanalytics.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: iotanalytics_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: iotanalytics.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params iotanalytics_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From ddbc876e21ca061ffbcebed3f5343beb6bc5638b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:08 -0400 Subject: [PATCH 602/981] No need for import aliases - iotevents. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/iotevents/service_endpoint_resolver_gen.go b/internal/service/iotevents/service_endpoint_resolver_gen.go index 013e6dc51c6..f008d009d69 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver iotevents_sdkv2.EndpointResolverV2 + defaultResolver iotevents.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: iotevents_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: iotevents.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params iotevents_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 1f71286acd18e727f14115e6691baafdc45ad876 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:08 -0400 Subject: [PATCH 603/981] No need for import aliases - ivs. --- .../ivs/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/ivs/service_endpoint_resolver_gen.go b/internal/service/ivs/service_endpoint_resolver_gen.go index 58495c307fe..125d547c969 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver ivs_sdkv2.EndpointResolverV2 + defaultResolver ivs.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: ivs_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: ivs.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params ivs_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 33f09744ad455466f1490e2ae0d8bd2d3e457402 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:08 -0400 Subject: [PATCH 604/981] No need for import aliases - ivschat. --- .../ivschat/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/ivschat/service_endpoint_resolver_gen.go b/internal/service/ivschat/service_endpoint_resolver_gen.go index 846167405ce..7c667e6f493 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver ivschat_sdkv2.EndpointResolverV2 + defaultResolver ivschat.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: ivschat_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: ivschat.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params ivschat_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 5ed54b0bcee5a932df4674cc6d3b937c098085f6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:08 -0400 Subject: [PATCH 605/981] No need for import aliases - kafka. --- .../kafka/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/kafka/service_endpoint_resolver_gen.go b/internal/service/kafka/service_endpoint_resolver_gen.go index 8b1b945be3f..cbdb088921a 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver kafka_sdkv2.EndpointResolverV2 + defaultResolver kafka.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: kafka_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: kafka.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params kafka_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From ebf0bc57e088949f7bc522db0116653e8005ce38 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:08 -0400 Subject: [PATCH 606/981] No need for import aliases - kafkaconnect. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/kafkaconnect/service_endpoint_resolver_gen.go b/internal/service/kafkaconnect/service_endpoint_resolver_gen.go index ec9c3ea8ab5..4c3a55cc1ae 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver kafkaconnect_sdkv2.EndpointResolverV2 + defaultResolver kafkaconnect.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: kafkaconnect_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: kafkaconnect.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params kafkaconnect_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From c4ab43234900eeb912cfb1a2f39a9eb0d1af1dc1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:08 -0400 Subject: [PATCH 607/981] No need for import aliases - kendra. --- .../kendra/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/kendra/service_endpoint_resolver_gen.go b/internal/service/kendra/service_endpoint_resolver_gen.go index ebaa1cc8ade..af1e00451d1 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver kendra_sdkv2.EndpointResolverV2 + defaultResolver kendra.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: kendra_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: kendra.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params kendra_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 1052f64f361e43f064df361b9ce0373ec314584f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:08 -0400 Subject: [PATCH 608/981] No need for import aliases - keyspaces. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/keyspaces/service_endpoint_resolver_gen.go b/internal/service/keyspaces/service_endpoint_resolver_gen.go index d0ffb20e630..35c03fa6f46 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver keyspaces_sdkv2.EndpointResolverV2 + defaultResolver keyspaces.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: keyspaces_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: keyspaces.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params keyspaces_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 9b7949886b61ae18caed2a74f2aad2008642fd25 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:08 -0400 Subject: [PATCH 609/981] No need for import aliases - kinesis. --- .../kinesis/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/kinesis/service_endpoint_resolver_gen.go b/internal/service/kinesis/service_endpoint_resolver_gen.go index 155859018d3..f444c700fa3 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver kinesis_sdkv2.EndpointResolverV2 + defaultResolver kinesis.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: kinesis_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: kinesis.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params kinesis_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From d17f743c53da5e0e313a1793a2981031939147fc Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:08 -0400 Subject: [PATCH 610/981] No need for import aliases - kinesisanalytics. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/kinesisanalytics/service_endpoint_resolver_gen.go b/internal/service/kinesisanalytics/service_endpoint_resolver_gen.go index c51670b999a..ceb870c6611 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver kinesisanalytics_sdkv2.EndpointResolverV2 + defaultResolver kinesisanalytics.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: kinesisanalytics_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: kinesisanalytics.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params kinesisanalytics_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From c395eec0388620a66a80043433b3e9d231b9c694 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:08 -0400 Subject: [PATCH 611/981] No need for import aliases - kinesisanalyticsv2. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/kinesisanalyticsv2/service_endpoint_resolver_gen.go b/internal/service/kinesisanalyticsv2/service_endpoint_resolver_gen.go index bcf21b930d8..8d8fdcaa361 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver kinesisanalyticsv2_sdkv2.EndpointResolverV2 + defaultResolver kinesisanalyticsv2.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: kinesisanalyticsv2_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: kinesisanalyticsv2.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params kinesisanalyticsv2_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 60d335d10c2b79c6811b3e68ea294ae4ddc202c6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:08 -0400 Subject: [PATCH 612/981] No need for import aliases - kinesisvideo. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/kinesisvideo/service_endpoint_resolver_gen.go b/internal/service/kinesisvideo/service_endpoint_resolver_gen.go index 968336a5308..15f1ff68267 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver kinesisvideo_sdkv2.EndpointResolverV2 + defaultResolver kinesisvideo.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: kinesisvideo_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: kinesisvideo.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params kinesisvideo_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From c9a590c3870d959dfcfd72cd5d8b3afcd623f99b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:09 -0400 Subject: [PATCH 613/981] No need for import aliases - kms. --- .../kms/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/kms/service_endpoint_resolver_gen.go b/internal/service/kms/service_endpoint_resolver_gen.go index 3d191ecadc8..72bb2141ec7 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver kms_sdkv2.EndpointResolverV2 + defaultResolver kms.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: kms_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: kms.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params kms_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 1fc04df4b04c7c06118ad71cf6f4abcdd6113aa4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:09 -0400 Subject: [PATCH 614/981] No need for import aliases - lakeformation. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/lakeformation/service_endpoint_resolver_gen.go b/internal/service/lakeformation/service_endpoint_resolver_gen.go index 9da1ed421d4..695f1a6337e 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver lakeformation_sdkv2.EndpointResolverV2 + defaultResolver lakeformation.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: lakeformation_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: lakeformation.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params lakeformation_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 7d6e53d98f3ab0de605d212a1b977835473fae22 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:09 -0400 Subject: [PATCH 615/981] No need for import aliases - lambda. --- .../lambda/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/lambda/service_endpoint_resolver_gen.go b/internal/service/lambda/service_endpoint_resolver_gen.go index eddf02e25ce..27acfc7f3fa 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver lambda_sdkv2.EndpointResolverV2 + defaultResolver lambda.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: lambda_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: lambda.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params lambda_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 61d753a9361547f58a11ad418b75e5f435a123ea Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:09 -0400 Subject: [PATCH 616/981] No need for import aliases - launchwizard. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/launchwizard/service_endpoint_resolver_gen.go b/internal/service/launchwizard/service_endpoint_resolver_gen.go index 05074f34636..0fb66dc0f00 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver launchwizard_sdkv2.EndpointResolverV2 + defaultResolver launchwizard.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: launchwizard_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: launchwizard.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params launchwizard_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 9fb7075203c413918f9b5f377caa02250ed7a1da Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:09 -0400 Subject: [PATCH 617/981] No need for import aliases - lexmodels. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/lexmodels/service_endpoint_resolver_gen.go b/internal/service/lexmodels/service_endpoint_resolver_gen.go index c8a2a7bbb89..6cd8b3744a7 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver lexmodelbuildingservice_sdkv2.EndpointResolverV2 + defaultResolver lexmodelbuildingservice.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: lexmodelbuildingservice_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: lexmodelbuildingservice.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params lexmodelbuildingservice_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 7c9b96fae813205af4fce832ae26410e116ef8d6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:09 -0400 Subject: [PATCH 618/981] No need for import aliases - lexv2models. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/lexv2models/service_endpoint_resolver_gen.go b/internal/service/lexv2models/service_endpoint_resolver_gen.go index 58668959901..07a2b9d447a 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver lexmodelsv2_sdkv2.EndpointResolverV2 + defaultResolver lexmodelsv2.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: lexmodelsv2_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: lexmodelsv2.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params lexmodelsv2_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 0eff8cbdacba39c4c4ab301077fe04bad6febfde Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:09 -0400 Subject: [PATCH 619/981] No need for import aliases - licensemanager. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/licensemanager/service_endpoint_resolver_gen.go b/internal/service/licensemanager/service_endpoint_resolver_gen.go index 45f67af9a71..2789abf7cca 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver licensemanager_sdkv2.EndpointResolverV2 + defaultResolver licensemanager.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: licensemanager_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: licensemanager.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params licensemanager_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From f43d428ba7615a7cf945c101929e51fc0de4e64f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:09 -0400 Subject: [PATCH 620/981] No need for import aliases - lightsail. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/lightsail/service_endpoint_resolver_gen.go b/internal/service/lightsail/service_endpoint_resolver_gen.go index b8945a34e37..895f99d4ba1 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver lightsail_sdkv2.EndpointResolverV2 + defaultResolver lightsail.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: lightsail_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: lightsail.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params lightsail_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From a5fa0faec0cad76e6f747cca1e49144f641800ba Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:09 -0400 Subject: [PATCH 621/981] No need for import aliases - location. --- .../location/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/location/service_endpoint_resolver_gen.go b/internal/service/location/service_endpoint_resolver_gen.go index b709d78159b..b593592e5e4 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver location_sdkv2.EndpointResolverV2 + defaultResolver location.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: location_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: location.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params location_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 8c027f998a6a0e19f9642368daeabe4bdaf6bd6d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:09 -0400 Subject: [PATCH 622/981] No need for import aliases - logs. --- .../logs/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/logs/service_endpoint_resolver_gen.go b/internal/service/logs/service_endpoint_resolver_gen.go index ad3874557d0..ed6e6b68453 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver cloudwatchlogs_sdkv2.EndpointResolverV2 + defaultResolver cloudwatchlogs.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: cloudwatchlogs_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: cloudwatchlogs.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params cloudwatchlogs_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 2c4a96197f057581598b356db444340fe8daded9 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:09 -0400 Subject: [PATCH 623/981] No need for import aliases - lookoutmetrics. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/lookoutmetrics/service_endpoint_resolver_gen.go b/internal/service/lookoutmetrics/service_endpoint_resolver_gen.go index 4bba23d3d1d..ce781cdd80a 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver lookoutmetrics_sdkv2.EndpointResolverV2 + defaultResolver lookoutmetrics.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: lookoutmetrics_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: lookoutmetrics.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params lookoutmetrics_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 5cf0d9aa849575d7c8e8e4a9dfa084c5a081c40b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:09 -0400 Subject: [PATCH 624/981] No need for import aliases - m2. --- .../m2/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/m2/service_endpoint_resolver_gen.go b/internal/service/m2/service_endpoint_resolver_gen.go index b02504b1580..0355265a953 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver m2_sdkv2.EndpointResolverV2 + defaultResolver m2.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: m2_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: m2.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params m2_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 9dd5029935140b55f78510b2359c07d9cab434be Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:09 -0400 Subject: [PATCH 625/981] No need for import aliases - macie2. --- .../macie2/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/macie2/service_endpoint_resolver_gen.go b/internal/service/macie2/service_endpoint_resolver_gen.go index 2e0a6340dcf..c67dd8385be 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver macie2_sdkv2.EndpointResolverV2 + defaultResolver macie2.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: macie2_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: macie2.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params macie2_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 90d74651445d90310b0db8c37fd63feab24595ee Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:10 -0400 Subject: [PATCH 626/981] No need for import aliases - mediaconnect. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/mediaconnect/service_endpoint_resolver_gen.go b/internal/service/mediaconnect/service_endpoint_resolver_gen.go index edce80ae4b4..644f7b24a89 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver mediaconnect_sdkv2.EndpointResolverV2 + defaultResolver mediaconnect.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: mediaconnect_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: mediaconnect.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params mediaconnect_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 893a7b679fb8e51a174b27110f9e8be19ddc13b5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:10 -0400 Subject: [PATCH 627/981] No need for import aliases - mediaconvert. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/mediaconvert/service_endpoint_resolver_gen.go b/internal/service/mediaconvert/service_endpoint_resolver_gen.go index f18489f36d9..ba68e09e3ff 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver mediaconvert_sdkv2.EndpointResolverV2 + defaultResolver mediaconvert.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: mediaconvert_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: mediaconvert.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params mediaconvert_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From f0a0b2321345fa124026c4d742faa14d3597fb39 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:10 -0400 Subject: [PATCH 628/981] No need for import aliases - medialive. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/medialive/service_endpoint_resolver_gen.go b/internal/service/medialive/service_endpoint_resolver_gen.go index fbaf32ec2b4..60c97ed1f54 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver medialive_sdkv2.EndpointResolverV2 + defaultResolver medialive.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: medialive_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: medialive.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params medialive_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 3dbdd6df6d115f5b7eac8ff9fde5a9b2c0846903 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:10 -0400 Subject: [PATCH 629/981] No need for import aliases - mediapackage. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/mediapackage/service_endpoint_resolver_gen.go b/internal/service/mediapackage/service_endpoint_resolver_gen.go index 10e45dc9536..c08575f2cfa 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver mediapackage_sdkv2.EndpointResolverV2 + defaultResolver mediapackage.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: mediapackage_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: mediapackage.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params mediapackage_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 1403bd017f0d7fc5f1f7fe7d5784f59422e2b457 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:10 -0400 Subject: [PATCH 630/981] No need for import aliases - mediapackagev2. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/mediapackagev2/service_endpoint_resolver_gen.go b/internal/service/mediapackagev2/service_endpoint_resolver_gen.go index 1173787d817..fed8c80fa63 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver mediapackagev2_sdkv2.EndpointResolverV2 + defaultResolver mediapackagev2.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: mediapackagev2_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: mediapackagev2.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params mediapackagev2_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 77618ea7d2756ff5785a90edca82008c2750d6ff Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:10 -0400 Subject: [PATCH 631/981] No need for import aliases - mediastore. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/mediastore/service_endpoint_resolver_gen.go b/internal/service/mediastore/service_endpoint_resolver_gen.go index a3f770246ac..14238c0b3b4 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver mediastore_sdkv2.EndpointResolverV2 + defaultResolver mediastore.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: mediastore_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: mediastore.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params mediastore_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 93d936247eb370acbc53d01605739d088dddd89c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:10 -0400 Subject: [PATCH 632/981] No need for import aliases - memorydb. --- .../memorydb/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/memorydb/service_endpoint_resolver_gen.go b/internal/service/memorydb/service_endpoint_resolver_gen.go index 70fe548a565..dbf17f83386 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver memorydb_sdkv2.EndpointResolverV2 + defaultResolver memorydb.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: memorydb_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: memorydb.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params memorydb_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 5050c96e9eca3a95fdef77e840106273d7107df0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:10 -0400 Subject: [PATCH 633/981] No need for import aliases - mq. --- .../mq/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/mq/service_endpoint_resolver_gen.go b/internal/service/mq/service_endpoint_resolver_gen.go index b34425906f7..28f89a1f491 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver mq_sdkv2.EndpointResolverV2 + defaultResolver mq.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: mq_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: mq.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params mq_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 6aeded5c2a8731dd0a3295e924de260534026d9c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:10 -0400 Subject: [PATCH 634/981] No need for import aliases - mwaa. --- .../mwaa/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/mwaa/service_endpoint_resolver_gen.go b/internal/service/mwaa/service_endpoint_resolver_gen.go index f2d52704cc6..63a913bd433 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver mwaa_sdkv2.EndpointResolverV2 + defaultResolver mwaa.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: mwaa_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: mwaa.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params mwaa_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From ee897ac9fc4ec689a3e40ddaee0561c20d32e497 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:10 -0400 Subject: [PATCH 635/981] No need for import aliases - neptune. --- .../neptune/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/neptune/service_endpoint_resolver_gen.go b/internal/service/neptune/service_endpoint_resolver_gen.go index 7ae3934b75f..613c500bb5d 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver neptune_sdkv2.EndpointResolverV2 + defaultResolver neptune.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: neptune_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: neptune.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params neptune_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From ba29ecc40f4fdf03c0101dd3d7b63d4a105c77d0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:10 -0400 Subject: [PATCH 636/981] No need for import aliases - neptunegraph. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/neptunegraph/service_endpoint_resolver_gen.go b/internal/service/neptunegraph/service_endpoint_resolver_gen.go index 20805e472f0..aa3d698afa9 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver neptunegraph_sdkv2.EndpointResolverV2 + defaultResolver neptunegraph.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: neptunegraph_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: neptunegraph.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params neptunegraph_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From e01843ece71cd5c739bbe9b89d78d04692692c37 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:10 -0400 Subject: [PATCH 637/981] No need for import aliases - networkfirewall. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/networkfirewall/service_endpoint_resolver_gen.go b/internal/service/networkfirewall/service_endpoint_resolver_gen.go index cde2ef0198d..eeaad79e005 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver networkfirewall_sdkv2.EndpointResolverV2 + defaultResolver networkfirewall.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: networkfirewall_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: networkfirewall.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params networkfirewall_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 4515c17a1d01a5c5903656d72c14abe104fdbe81 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:11 -0400 Subject: [PATCH 638/981] No need for import aliases - networkmanager. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/networkmanager/service_endpoint_resolver_gen.go b/internal/service/networkmanager/service_endpoint_resolver_gen.go index 7120137df00..fb17fd55f87 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver networkmanager_sdkv2.EndpointResolverV2 + defaultResolver networkmanager.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: networkmanager_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: networkmanager.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params networkmanager_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 23dc94627eae4902003fa63401ba35e57170a7cd Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:11 -0400 Subject: [PATCH 639/981] No need for import aliases - networkmonitor. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/networkmonitor/service_endpoint_resolver_gen.go b/internal/service/networkmonitor/service_endpoint_resolver_gen.go index c4505310f2d..a716fb216f2 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver networkmonitor_sdkv2.EndpointResolverV2 + defaultResolver networkmonitor.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: networkmonitor_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: networkmonitor.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params networkmonitor_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From f43b2e75e8616fef324c87ec737357bf92f3beb5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:11 -0400 Subject: [PATCH 640/981] No need for import aliases - oam. --- .../oam/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/oam/service_endpoint_resolver_gen.go b/internal/service/oam/service_endpoint_resolver_gen.go index 06de202246c..5b4501d9b76 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver oam_sdkv2.EndpointResolverV2 + defaultResolver oam.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: oam_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: oam.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params oam_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 5d41b1b6c0af8dd9f26748de9860a105a3f7b3bf Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:11 -0400 Subject: [PATCH 641/981] No need for import aliases - opensearch. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/opensearch/service_endpoint_resolver_gen.go b/internal/service/opensearch/service_endpoint_resolver_gen.go index 91637f6dbc3..e3e9bce153d 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver opensearch_sdkv2.EndpointResolverV2 + defaultResolver opensearch.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: opensearch_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: opensearch.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params opensearch_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 22a061b5a96788cdf8582be7e1e3ae181ce78b8f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:11 -0400 Subject: [PATCH 642/981] No need for import aliases - opensearchserverless. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/opensearchserverless/service_endpoint_resolver_gen.go b/internal/service/opensearchserverless/service_endpoint_resolver_gen.go index 5d8f1b501c6..cbf23cc8754 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver opensearchserverless_sdkv2.EndpointResolverV2 + defaultResolver opensearchserverless.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: opensearchserverless_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: opensearchserverless.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params opensearchserverless_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 0c5df864f96727d55cec9375c15a259c455aa4d1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:11 -0400 Subject: [PATCH 643/981] No need for import aliases - opsworks. --- .../opsworks/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/opsworks/service_endpoint_resolver_gen.go b/internal/service/opsworks/service_endpoint_resolver_gen.go index 8067dbf5d88..aeaa72aac0f 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver opsworks_sdkv2.EndpointResolverV2 + defaultResolver opsworks.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: opsworks_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: opsworks.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params opsworks_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 25f88b784216aebe4e0ae3a47702e377bae82d2d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:11 -0400 Subject: [PATCH 644/981] No need for import aliases - organizations. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/organizations/service_endpoint_resolver_gen.go b/internal/service/organizations/service_endpoint_resolver_gen.go index 6d88c9fd916..e9778ef823c 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver organizations_sdkv2.EndpointResolverV2 + defaultResolver organizations.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: organizations_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: organizations.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params organizations_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From e1093194bae71201f32e5232ea7416e73bd95aaa Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:11 -0400 Subject: [PATCH 645/981] No need for import aliases - osis. --- .../osis/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/osis/service_endpoint_resolver_gen.go b/internal/service/osis/service_endpoint_resolver_gen.go index 5f57e01330e..7b51e1c1d44 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver osis_sdkv2.EndpointResolverV2 + defaultResolver osis.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: osis_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: osis.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params osis_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From aa95393461d6c55198e0db33c949cec5e2872231 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:11 -0400 Subject: [PATCH 646/981] No need for import aliases - outposts. --- .../outposts/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/outposts/service_endpoint_resolver_gen.go b/internal/service/outposts/service_endpoint_resolver_gen.go index 890bf403a77..6d0aa8172c3 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver outposts_sdkv2.EndpointResolverV2 + defaultResolver outposts.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: outposts_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: outposts.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params outposts_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From b51616ba3b8b35c7f4035c473e543cadbb5b5f62 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:11 -0400 Subject: [PATCH 647/981] No need for import aliases - paymentcryptography. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/paymentcryptography/service_endpoint_resolver_gen.go b/internal/service/paymentcryptography/service_endpoint_resolver_gen.go index fc57ac8a514..2d844d5bab6 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver paymentcryptography_sdkv2.EndpointResolverV2 + defaultResolver paymentcryptography.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: paymentcryptography_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: paymentcryptography.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params paymentcryptography_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 4f957126eb97999562f040543f802712f3050dd0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:11 -0400 Subject: [PATCH 648/981] No need for import aliases - pcaconnectorad. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/pcaconnectorad/service_endpoint_resolver_gen.go b/internal/service/pcaconnectorad/service_endpoint_resolver_gen.go index dc488d05723..defd06e6851 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver pcaconnectorad_sdkv2.EndpointResolverV2 + defaultResolver pcaconnectorad.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: pcaconnectorad_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: pcaconnectorad.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params pcaconnectorad_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 8863a6c3ff038c2c618dea89d4965eab1b4504d7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:11 -0400 Subject: [PATCH 649/981] No need for import aliases - pcs. --- .../pcs/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/pcs/service_endpoint_resolver_gen.go b/internal/service/pcs/service_endpoint_resolver_gen.go index 3204aa60cea..b806d65e28f 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver pcs_sdkv2.EndpointResolverV2 + defaultResolver pcs.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: pcs_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: pcs.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params pcs_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 1748bf0b66e37035ab882a29154327f225cdd0e4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:11 -0400 Subject: [PATCH 650/981] No need for import aliases - pinpoint. --- .../pinpoint/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/pinpoint/service_endpoint_resolver_gen.go b/internal/service/pinpoint/service_endpoint_resolver_gen.go index f6005571bad..c085133fd65 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver pinpoint_sdkv2.EndpointResolverV2 + defaultResolver pinpoint.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: pinpoint_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: pinpoint.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params pinpoint_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 80867ae4c89263361d12352e60b06554a59217a2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:12 -0400 Subject: [PATCH 651/981] No need for import aliases - pinpointsmsvoicev2. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/pinpointsmsvoicev2/service_endpoint_resolver_gen.go b/internal/service/pinpointsmsvoicev2/service_endpoint_resolver_gen.go index 9122247763a..3b45f4953e9 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver pinpointsmsvoicev2_sdkv2.EndpointResolverV2 + defaultResolver pinpointsmsvoicev2.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: pinpointsmsvoicev2_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: pinpointsmsvoicev2.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params pinpointsmsvoicev2_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From d2a1a239fa5dddfa6d4f44be71734adc601d503e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:12 -0400 Subject: [PATCH 652/981] No need for import aliases - pipes. --- .../pipes/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/pipes/service_endpoint_resolver_gen.go b/internal/service/pipes/service_endpoint_resolver_gen.go index 81c0d5f49b1..2ae92669278 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver pipes_sdkv2.EndpointResolverV2 + defaultResolver pipes.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: pipes_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: pipes.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params pipes_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 460f9f6ef10387f4db1346687ece5a93467520ce Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:12 -0400 Subject: [PATCH 653/981] No need for import aliases - polly. --- .../polly/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/polly/service_endpoint_resolver_gen.go b/internal/service/polly/service_endpoint_resolver_gen.go index cd3672f6520..97c6d65f647 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver polly_sdkv2.EndpointResolverV2 + defaultResolver polly.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: polly_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: polly.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params polly_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 32ed889da934f7d0058c94a8002bd95d0d2a4a69 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:12 -0400 Subject: [PATCH 654/981] No need for import aliases - pricing. --- .../pricing/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/pricing/service_endpoint_resolver_gen.go b/internal/service/pricing/service_endpoint_resolver_gen.go index 15b32059979..841f73cc725 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver pricing_sdkv2.EndpointResolverV2 + defaultResolver pricing.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: pricing_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: pricing.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params pricing_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From a3fa62ec70a61911a8e2a7e94f94863a32be8f6d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:12 -0400 Subject: [PATCH 655/981] No need for import aliases - qbusiness. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/qbusiness/service_endpoint_resolver_gen.go b/internal/service/qbusiness/service_endpoint_resolver_gen.go index 1d24494ea9a..e028f0cd7ce 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver qbusiness_sdkv2.EndpointResolverV2 + defaultResolver qbusiness.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: qbusiness_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: qbusiness.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params qbusiness_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 758232fefdcbdb685d777e53a956c08b9ce8f362 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:12 -0400 Subject: [PATCH 656/981] No need for import aliases - qldb. --- .../qldb/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/qldb/service_endpoint_resolver_gen.go b/internal/service/qldb/service_endpoint_resolver_gen.go index 1db7b08627a..c7f8d0e58c7 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver qldb_sdkv2.EndpointResolverV2 + defaultResolver qldb.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: qldb_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: qldb.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params qldb_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 475ba813111ab03db730a1b40bbb741ace08bb52 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:12 -0400 Subject: [PATCH 657/981] No need for import aliases - quicksight. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/quicksight/service_endpoint_resolver_gen.go b/internal/service/quicksight/service_endpoint_resolver_gen.go index da8fc75c94b..e689374e696 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver quicksight_sdkv2.EndpointResolverV2 + defaultResolver quicksight.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: quicksight_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: quicksight.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params quicksight_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From ea85845f8bd816041f102e9604efff2555b344d5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:12 -0400 Subject: [PATCH 658/981] No need for import aliases - ram. --- .../ram/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/ram/service_endpoint_resolver_gen.go b/internal/service/ram/service_endpoint_resolver_gen.go index 850db742de4..e0472da1974 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver ram_sdkv2.EndpointResolverV2 + defaultResolver ram.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: ram_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: ram.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params ram_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 8f7d072dc271beb464eb02c3e20e2e780ce006b0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:12 -0400 Subject: [PATCH 659/981] No need for import aliases - rbin. --- .../rbin/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/rbin/service_endpoint_resolver_gen.go b/internal/service/rbin/service_endpoint_resolver_gen.go index c2030262e0e..7f13cc1c34e 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver rbin_sdkv2.EndpointResolverV2 + defaultResolver rbin.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: rbin_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: rbin.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params rbin_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 81e6fcd0046a2326ee2df116f989888b995aac9d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:12 -0400 Subject: [PATCH 660/981] No need for import aliases - rds. --- .../rds/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/rds/service_endpoint_resolver_gen.go b/internal/service/rds/service_endpoint_resolver_gen.go index ffa5506c1da..6485c366c7b 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver rds_sdkv2.EndpointResolverV2 + defaultResolver rds.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: rds_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: rds.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params rds_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 8909d59162bf4b5462f4c046a1514922ae416771 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:12 -0400 Subject: [PATCH 661/981] No need for import aliases - redshift. --- .../redshift/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/redshift/service_endpoint_resolver_gen.go b/internal/service/redshift/service_endpoint_resolver_gen.go index b2e949f4c80..159fbbd918e 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver redshift_sdkv2.EndpointResolverV2 + defaultResolver redshift.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: redshift_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: redshift.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params redshift_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 0d2aae8bb4b6fd652b73adfb17d07ada684db605 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:12 -0400 Subject: [PATCH 662/981] No need for import aliases - redshiftdata. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/redshiftdata/service_endpoint_resolver_gen.go b/internal/service/redshiftdata/service_endpoint_resolver_gen.go index 1dcefd43622..573f6754cab 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver redshiftdata_sdkv2.EndpointResolverV2 + defaultResolver redshiftdata.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: redshiftdata_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: redshiftdata.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params redshiftdata_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 175cd8bee038e75b57128dad26af1ba307e78ef2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:13 -0400 Subject: [PATCH 663/981] No need for import aliases - redshiftserverless. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/redshiftserverless/service_endpoint_resolver_gen.go b/internal/service/redshiftserverless/service_endpoint_resolver_gen.go index f5aab0139b8..13cd0a440c1 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver redshiftserverless_sdkv2.EndpointResolverV2 + defaultResolver redshiftserverless.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: redshiftserverless_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: redshiftserverless.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params redshiftserverless_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 903f65d942e934eebd0c826723ab4c51323972da Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:13 -0400 Subject: [PATCH 664/981] No need for import aliases - rekognition. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/rekognition/service_endpoint_resolver_gen.go b/internal/service/rekognition/service_endpoint_resolver_gen.go index 5a8fe0a7ff1..3323bc89699 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver rekognition_sdkv2.EndpointResolverV2 + defaultResolver rekognition.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: rekognition_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: rekognition.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params rekognition_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 0688b0c337a6ce18ad5e36530444a67f88e402ad Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:13 -0400 Subject: [PATCH 665/981] No need for import aliases - resiliencehub. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/resiliencehub/service_endpoint_resolver_gen.go b/internal/service/resiliencehub/service_endpoint_resolver_gen.go index cc413c903fb..8a234b70e00 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver resiliencehub_sdkv2.EndpointResolverV2 + defaultResolver resiliencehub.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: resiliencehub_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: resiliencehub.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params resiliencehub_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 77219a6ea197203f5de6a7c5a27c1444210d0fde Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:13 -0400 Subject: [PATCH 666/981] No need for import aliases - resourceexplorer2. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/resourceexplorer2/service_endpoint_resolver_gen.go b/internal/service/resourceexplorer2/service_endpoint_resolver_gen.go index f1bfe5122bf..f348471eb9a 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver resourceexplorer2_sdkv2.EndpointResolverV2 + defaultResolver resourceexplorer2.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: resourceexplorer2_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: resourceexplorer2.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params resourceexplorer2_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 5f8744be76af9e6b4262b10504cc2834675c444f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:13 -0400 Subject: [PATCH 667/981] No need for import aliases - resourcegroups. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/resourcegroups/service_endpoint_resolver_gen.go b/internal/service/resourcegroups/service_endpoint_resolver_gen.go index 5153c50eca9..98b7d05e7af 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver resourcegroups_sdkv2.EndpointResolverV2 + defaultResolver resourcegroups.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: resourcegroups_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: resourcegroups.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params resourcegroups_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From af1e9d31129e353fe03be3f5b84a87a82091adcc Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:13 -0400 Subject: [PATCH 668/981] No need for import aliases - resourcegroupstaggingapi. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/resourcegroupstaggingapi/service_endpoint_resolver_gen.go b/internal/service/resourcegroupstaggingapi/service_endpoint_resolver_gen.go index 470727433f2..114253dcdce 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver resourcegroupstaggingapi_sdkv2.EndpointResolverV2 + defaultResolver resourcegroupstaggingapi.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: resourcegroupstaggingapi_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: resourcegroupstaggingapi.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params resourcegroupstaggingapi_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 85b7e2b23caa3ddd7e7e2135632e25219f966f52 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:13 -0400 Subject: [PATCH 669/981] No need for import aliases - rolesanywhere. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/rolesanywhere/service_endpoint_resolver_gen.go b/internal/service/rolesanywhere/service_endpoint_resolver_gen.go index 5d03433d57c..29097ed1c8d 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver rolesanywhere_sdkv2.EndpointResolverV2 + defaultResolver rolesanywhere.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: rolesanywhere_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: rolesanywhere.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params rolesanywhere_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 07eb27dff7f3670fc6325fff106eb4160f4b5988 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:13 -0400 Subject: [PATCH 670/981] No need for import aliases - route53. --- .../route53/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/route53/service_endpoint_resolver_gen.go b/internal/service/route53/service_endpoint_resolver_gen.go index db1d4a68e6c..fde454849af 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver route53_sdkv2.EndpointResolverV2 + defaultResolver route53.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: route53_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: route53.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params route53_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From c4112a2d5a3d2d0c84caf19d338ae66761c405c5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:13 -0400 Subject: [PATCH 671/981] No need for import aliases - route53domains. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/route53domains/service_endpoint_resolver_gen.go b/internal/service/route53domains/service_endpoint_resolver_gen.go index 7ef9fe3f5af..a132593f78c 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver route53domains_sdkv2.EndpointResolverV2 + defaultResolver route53domains.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: route53domains_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: route53domains.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params route53domains_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 879de97b630d6e0d8f54d0f85d8ad8560c76cd7a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:13 -0400 Subject: [PATCH 672/981] No need for import aliases - route53profiles. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/route53profiles/service_endpoint_resolver_gen.go b/internal/service/route53profiles/service_endpoint_resolver_gen.go index d15c75fb9dc..2a3e570b39f 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver route53profiles_sdkv2.EndpointResolverV2 + defaultResolver route53profiles.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: route53profiles_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: route53profiles.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params route53profiles_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 056cf7abcd216bc7a830e497fcdbb98ea4e6d94e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:13 -0400 Subject: [PATCH 673/981] No need for import aliases - route53recoverycontrolconfig. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/route53recoverycontrolconfig/service_endpoint_resolver_gen.go b/internal/service/route53recoverycontrolconfig/service_endpoint_resolver_gen.go index 7c86edfea6e..8305b7e8eaf 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver route53recoverycontrolconfig_sdkv2.EndpointResolverV2 + defaultResolver route53recoverycontrolconfig.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: route53recoverycontrolconfig_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: route53recoverycontrolconfig.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params route53recoverycontrolconfig_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From fb054682041503f4d7720d5040b52cb728266031 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:13 -0400 Subject: [PATCH 674/981] No need for import aliases - route53recoveryreadiness. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/route53recoveryreadiness/service_endpoint_resolver_gen.go b/internal/service/route53recoveryreadiness/service_endpoint_resolver_gen.go index 0a4ee9472a2..9a1b0dbe38c 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver route53recoveryreadiness_sdkv2.EndpointResolverV2 + defaultResolver route53recoveryreadiness.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: route53recoveryreadiness_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: route53recoveryreadiness.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params route53recoveryreadiness_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From e674b2ecafb48857055a05df8d71450d5c27bbd6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:13 -0400 Subject: [PATCH 675/981] No need for import aliases - route53resolver. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/route53resolver/service_endpoint_resolver_gen.go b/internal/service/route53resolver/service_endpoint_resolver_gen.go index 493496fc66f..3cd7b6f69d2 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver route53resolver_sdkv2.EndpointResolverV2 + defaultResolver route53resolver.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: route53resolver_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: route53resolver.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params route53resolver_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 390a9289f0509bb98d32c11e1fc2e89c47df7bca Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:14 -0400 Subject: [PATCH 676/981] No need for import aliases - rum. --- .../rum/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/rum/service_endpoint_resolver_gen.go b/internal/service/rum/service_endpoint_resolver_gen.go index 1c954121cf4..6ade933c4d3 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver rum_sdkv2.EndpointResolverV2 + defaultResolver rum.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: rum_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: rum.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params rum_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From efefc78a78471e22b890ed34374d8cdd0c0b2af5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:14 -0400 Subject: [PATCH 677/981] No need for import aliases - s3. --- .../s3/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/s3/service_endpoint_resolver_gen.go b/internal/service/s3/service_endpoint_resolver_gen.go index 85140be3a69..5bca003df6f 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver s3_sdkv2.EndpointResolverV2 + defaultResolver s3.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: s3_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: s3.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params s3_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 2df0c6aefa180790257f780dfa3495a9f2f14572 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:14 -0400 Subject: [PATCH 678/981] No need for import aliases - s3control. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/s3control/service_endpoint_resolver_gen.go b/internal/service/s3control/service_endpoint_resolver_gen.go index 2446353f251..0c7d4cd2437 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver s3control_sdkv2.EndpointResolverV2 + defaultResolver s3control.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: s3control_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: s3control.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params s3control_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From e22c16637835d620cbc4e3aa7cca73acae916d8c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:14 -0400 Subject: [PATCH 679/981] No need for import aliases - s3outposts. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/s3outposts/service_endpoint_resolver_gen.go b/internal/service/s3outposts/service_endpoint_resolver_gen.go index f35e76b6608..97189439388 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver s3outposts_sdkv2.EndpointResolverV2 + defaultResolver s3outposts.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: s3outposts_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: s3outposts.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params s3outposts_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From ee4294964da7ed75d938c481902fe84834c9a22c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:14 -0400 Subject: [PATCH 680/981] No need for import aliases - sagemaker. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/sagemaker/service_endpoint_resolver_gen.go b/internal/service/sagemaker/service_endpoint_resolver_gen.go index 66eeb066d7f..f49d8016546 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver sagemaker_sdkv2.EndpointResolverV2 + defaultResolver sagemaker.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: sagemaker_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: sagemaker.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params sagemaker_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 7216958cb49c67c8f7ce86a56d94c61016b08abd Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:14 -0400 Subject: [PATCH 681/981] No need for import aliases - scheduler. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/scheduler/service_endpoint_resolver_gen.go b/internal/service/scheduler/service_endpoint_resolver_gen.go index 44b5b63e288..0f51958bc9e 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver scheduler_sdkv2.EndpointResolverV2 + defaultResolver scheduler.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: scheduler_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: scheduler.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params scheduler_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 4b7a2e21800139296f77ceeb812bf007160f3df9 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:14 -0400 Subject: [PATCH 682/981] No need for import aliases - schemas. --- .../schemas/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/schemas/service_endpoint_resolver_gen.go b/internal/service/schemas/service_endpoint_resolver_gen.go index 7cc298f1c7d..a36aea1e08d 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver schemas_sdkv2.EndpointResolverV2 + defaultResolver schemas.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: schemas_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: schemas.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params schemas_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 7f3ad05eca3b582a77fd9178dc8e49eeb79cc288 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:14 -0400 Subject: [PATCH 683/981] No need for import aliases - secretsmanager. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/secretsmanager/service_endpoint_resolver_gen.go b/internal/service/secretsmanager/service_endpoint_resolver_gen.go index 1bbe5694033..c44d981da13 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver secretsmanager_sdkv2.EndpointResolverV2 + defaultResolver secretsmanager.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: secretsmanager_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: secretsmanager.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params secretsmanager_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 2d2738a7b1aee713105dbdeb8780dab2f2cdb0e8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:14 -0400 Subject: [PATCH 684/981] No need for import aliases - securityhub. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/securityhub/service_endpoint_resolver_gen.go b/internal/service/securityhub/service_endpoint_resolver_gen.go index 260276a3d68..26467c5ba3e 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver securityhub_sdkv2.EndpointResolverV2 + defaultResolver securityhub.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: securityhub_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: securityhub.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params securityhub_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 65a337ade7ddd6f17ecccc862e0a2a8d3dc786a0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:14 -0400 Subject: [PATCH 685/981] No need for import aliases - securitylake. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/securitylake/service_endpoint_resolver_gen.go b/internal/service/securitylake/service_endpoint_resolver_gen.go index 3b3ebacd62b..2ec07382daf 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver securitylake_sdkv2.EndpointResolverV2 + defaultResolver securitylake.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: securitylake_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: securitylake.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params securitylake_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From dd67a843383dab87fdaccc3f2ecfa4e10eabcbaf Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:14 -0400 Subject: [PATCH 686/981] No need for import aliases - serverlessrepo. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/serverlessrepo/service_endpoint_resolver_gen.go b/internal/service/serverlessrepo/service_endpoint_resolver_gen.go index fb2d0158e0d..79c0f39ddda 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver serverlessapplicationrepository_sdkv2.EndpointResolverV2 + defaultResolver serverlessapplicationrepository.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: serverlessapplicationrepository_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: serverlessapplicationrepository.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params serverlessapplicationrepository_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 11b9da25921bb23c455bf13f47775f4238ed15b3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:14 -0400 Subject: [PATCH 687/981] No need for import aliases - servicecatalog. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/servicecatalog/service_endpoint_resolver_gen.go b/internal/service/servicecatalog/service_endpoint_resolver_gen.go index b6009030edf..c4b7e2ac0bf 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver servicecatalog_sdkv2.EndpointResolverV2 + defaultResolver servicecatalog.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: servicecatalog_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: servicecatalog.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params servicecatalog_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 5a9d8452108eb20c59f730e45bb9fc89079fa92d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:14 -0400 Subject: [PATCH 688/981] No need for import aliases - servicecatalogappregistry. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/servicecatalogappregistry/service_endpoint_resolver_gen.go b/internal/service/servicecatalogappregistry/service_endpoint_resolver_gen.go index f1bb6b26621..612819e19d0 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver servicecatalogappregistry_sdkv2.EndpointResolverV2 + defaultResolver servicecatalogappregistry.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: servicecatalogappregistry_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: servicecatalogappregistry.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params servicecatalogappregistry_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 1904ddbebc7d01e38f0defe6df87dd8de12c02fe Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:15 -0400 Subject: [PATCH 689/981] No need for import aliases - servicediscovery. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/servicediscovery/service_endpoint_resolver_gen.go b/internal/service/servicediscovery/service_endpoint_resolver_gen.go index 55fb327fef9..952e20e7110 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver servicediscovery_sdkv2.EndpointResolverV2 + defaultResolver servicediscovery.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: servicediscovery_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: servicediscovery.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params servicediscovery_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 7a39179d5603b52175db8431d6d53b720a6b23a8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:15 -0400 Subject: [PATCH 690/981] No need for import aliases - servicequotas. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/servicequotas/service_endpoint_resolver_gen.go b/internal/service/servicequotas/service_endpoint_resolver_gen.go index f461cb7eb56..80847044d60 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver servicequotas_sdkv2.EndpointResolverV2 + defaultResolver servicequotas.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: servicequotas_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: servicequotas.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params servicequotas_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From fc9e74065f019d1560064c1e46e860db632d09b0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:15 -0400 Subject: [PATCH 691/981] No need for import aliases - ses. --- .../ses/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/ses/service_endpoint_resolver_gen.go b/internal/service/ses/service_endpoint_resolver_gen.go index 26208041d98..6693c1c206b 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver ses_sdkv2.EndpointResolverV2 + defaultResolver ses.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: ses_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: ses.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params ses_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From ab0e04612bc8547c29a91b8b1960d24666c36aea Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:15 -0400 Subject: [PATCH 692/981] No need for import aliases - sesv2. --- .../sesv2/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/sesv2/service_endpoint_resolver_gen.go b/internal/service/sesv2/service_endpoint_resolver_gen.go index 9ca7f81bec2..b8920b3687a 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver sesv2_sdkv2.EndpointResolverV2 + defaultResolver sesv2.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: sesv2_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: sesv2.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params sesv2_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 6ae8826b771cae74181a40888f1c567150810a22 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:15 -0400 Subject: [PATCH 693/981] No need for import aliases - sfn. --- .../sfn/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/sfn/service_endpoint_resolver_gen.go b/internal/service/sfn/service_endpoint_resolver_gen.go index 2abda1cfad8..5f940dbca6d 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver sfn_sdkv2.EndpointResolverV2 + defaultResolver sfn.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: sfn_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: sfn.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params sfn_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From bdb09563b23f411da3011d0ab47b290af4415b51 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:15 -0400 Subject: [PATCH 694/981] No need for import aliases - shield. --- .../shield/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/shield/service_endpoint_resolver_gen.go b/internal/service/shield/service_endpoint_resolver_gen.go index c5b364751a9..03a663af139 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver shield_sdkv2.EndpointResolverV2 + defaultResolver shield.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: shield_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: shield.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params shield_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 2db0264c6e6ba91a9cad40e29baaf0946cfecdf1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:15 -0400 Subject: [PATCH 695/981] No need for import aliases - signer. --- .../signer/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/signer/service_endpoint_resolver_gen.go b/internal/service/signer/service_endpoint_resolver_gen.go index 298c6e9901e..e9defc0023b 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver signer_sdkv2.EndpointResolverV2 + defaultResolver signer.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: signer_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: signer.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params signer_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 0b4a431f46d581494f1da8f73f34c952369401a1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:15 -0400 Subject: [PATCH 696/981] No need for import aliases - sns. --- .../sns/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/sns/service_endpoint_resolver_gen.go b/internal/service/sns/service_endpoint_resolver_gen.go index 2d7084ab7b6..c90ad98438b 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver sns_sdkv2.EndpointResolverV2 + defaultResolver sns.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: sns_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: sns.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params sns_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 35e1b4b704ea693dd9618e898c4e9b12b339cf3c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:15 -0400 Subject: [PATCH 697/981] No need for import aliases - sqs. --- .../sqs/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/sqs/service_endpoint_resolver_gen.go b/internal/service/sqs/service_endpoint_resolver_gen.go index cbbbf1ebfc7..1312b0b89ef 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver sqs_sdkv2.EndpointResolverV2 + defaultResolver sqs.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: sqs_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: sqs.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params sqs_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 15e4d06ad165e3411243452283f8b9659f7cafeb Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:15 -0400 Subject: [PATCH 698/981] No need for import aliases - ssm. --- .../ssm/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/ssm/service_endpoint_resolver_gen.go b/internal/service/ssm/service_endpoint_resolver_gen.go index e40aad9a4db..297a9053f0e 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver ssm_sdkv2.EndpointResolverV2 + defaultResolver ssm.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: ssm_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: ssm.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params ssm_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From d59290c53ba184618d0a10e0b0e226abe0e7fa90 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:15 -0400 Subject: [PATCH 699/981] No need for import aliases - ssmcontacts. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/ssmcontacts/service_endpoint_resolver_gen.go b/internal/service/ssmcontacts/service_endpoint_resolver_gen.go index eb359b3c3bd..5de3f9e29d6 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver ssmcontacts_sdkv2.EndpointResolverV2 + defaultResolver ssmcontacts.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: ssmcontacts_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: ssmcontacts.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params ssmcontacts_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 7090cb0744ff37899883ffd3d10967b695b8b633 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:16 -0400 Subject: [PATCH 700/981] No need for import aliases - ssmincidents. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/ssmincidents/service_endpoint_resolver_gen.go b/internal/service/ssmincidents/service_endpoint_resolver_gen.go index 873f96d0978..a2f41a3998d 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver ssmincidents_sdkv2.EndpointResolverV2 + defaultResolver ssmincidents.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: ssmincidents_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: ssmincidents.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params ssmincidents_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 279f66e55cf86ce054c1d50c2e52ad05163eb3d6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:16 -0400 Subject: [PATCH 701/981] No need for import aliases - ssmquicksetup. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/ssmquicksetup/service_endpoint_resolver_gen.go b/internal/service/ssmquicksetup/service_endpoint_resolver_gen.go index 2653b663979..ee4794ff6c9 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver ssmquicksetup_sdkv2.EndpointResolverV2 + defaultResolver ssmquicksetup.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: ssmquicksetup_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: ssmquicksetup.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params ssmquicksetup_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From deb8434f07a0e52a75a60ad1aa1ed882ecf7d7a3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:16 -0400 Subject: [PATCH 702/981] No need for import aliases - ssmsap. --- .../ssmsap/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/ssmsap/service_endpoint_resolver_gen.go b/internal/service/ssmsap/service_endpoint_resolver_gen.go index b0849ab8fbd..613b7ceece4 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver ssmsap_sdkv2.EndpointResolverV2 + defaultResolver ssmsap.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: ssmsap_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: ssmsap.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params ssmsap_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 1656db3df90bddf59e66992fac7e570b8ab8777b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:16 -0400 Subject: [PATCH 703/981] No need for import aliases - sso. --- .../sso/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/sso/service_endpoint_resolver_gen.go b/internal/service/sso/service_endpoint_resolver_gen.go index a2318fec977..b6e21ded4cb 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver sso_sdkv2.EndpointResolverV2 + defaultResolver sso.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: sso_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: sso.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params sso_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From e83af5b354715ab4a93a1d1d8756d59d3137f35b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:16 -0400 Subject: [PATCH 704/981] No need for import aliases - ssoadmin. --- .../ssoadmin/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/ssoadmin/service_endpoint_resolver_gen.go b/internal/service/ssoadmin/service_endpoint_resolver_gen.go index 01948c036ac..85b646dd3e1 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver ssoadmin_sdkv2.EndpointResolverV2 + defaultResolver ssoadmin.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: ssoadmin_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: ssoadmin.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params ssoadmin_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 12fe639cbe24ec8ec09fd07fdc78d6feafe526f6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:16 -0400 Subject: [PATCH 705/981] No need for import aliases - storagegateway. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/storagegateway/service_endpoint_resolver_gen.go b/internal/service/storagegateway/service_endpoint_resolver_gen.go index c8134416e82..2138b7d498a 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver storagegateway_sdkv2.EndpointResolverV2 + defaultResolver storagegateway.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: storagegateway_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: storagegateway.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params storagegateway_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From a8d3b05d655791348b70c5cc41319fd4c407edb7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:16 -0400 Subject: [PATCH 706/981] No need for import aliases - sts. --- .../sts/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/sts/service_endpoint_resolver_gen.go b/internal/service/sts/service_endpoint_resolver_gen.go index ce9a1b1df5a..971b01b6325 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver sts_sdkv2.EndpointResolverV2 + defaultResolver sts.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: sts_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: sts.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params sts_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From c52c2fb0c26137ce0739e63104061935b54f23a9 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:16 -0400 Subject: [PATCH 707/981] No need for import aliases - swf. --- .../swf/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/swf/service_endpoint_resolver_gen.go b/internal/service/swf/service_endpoint_resolver_gen.go index f5e0da6321d..57538c2990a 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver swf_sdkv2.EndpointResolverV2 + defaultResolver swf.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: swf_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: swf.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params swf_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From d0bc5a557b6cab43d5bfaf5c4e9760a08f20ad17 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:16 -0400 Subject: [PATCH 708/981] No need for import aliases - synthetics. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/synthetics/service_endpoint_resolver_gen.go b/internal/service/synthetics/service_endpoint_resolver_gen.go index 1d34dd22c25..a34909806f1 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver synthetics_sdkv2.EndpointResolverV2 + defaultResolver synthetics.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: synthetics_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: synthetics.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params synthetics_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 1f924e117a36166e89df69f74309c224b6397ce9 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:16 -0400 Subject: [PATCH 709/981] No need for import aliases - timestreaminfluxdb. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/timestreaminfluxdb/service_endpoint_resolver_gen.go b/internal/service/timestreaminfluxdb/service_endpoint_resolver_gen.go index 1899dc095c1..a6a741b4bb9 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver timestreaminfluxdb_sdkv2.EndpointResolverV2 + defaultResolver timestreaminfluxdb.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: timestreaminfluxdb_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: timestreaminfluxdb.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params timestreaminfluxdb_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 5e935ca042bd6f8f124ab0adc3fcb069afaa1d03 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:16 -0400 Subject: [PATCH 710/981] No need for import aliases - timestreamwrite. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/timestreamwrite/service_endpoint_resolver_gen.go b/internal/service/timestreamwrite/service_endpoint_resolver_gen.go index 0c8cf804610..218b5e9af7a 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver timestreamwrite_sdkv2.EndpointResolverV2 + defaultResolver timestreamwrite.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: timestreamwrite_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: timestreamwrite.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params timestreamwrite_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 537d430c572340644863734d1054dcb99d3e630a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:16 -0400 Subject: [PATCH 711/981] No need for import aliases - transcribe. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/transcribe/service_endpoint_resolver_gen.go b/internal/service/transcribe/service_endpoint_resolver_gen.go index d915cb32bd2..d56ce6216f2 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver transcribe_sdkv2.EndpointResolverV2 + defaultResolver transcribe.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: transcribe_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: transcribe.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params transcribe_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From c13ba02ca4e92295587d8a9815b1bdfdcee62272 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:17 -0400 Subject: [PATCH 712/981] No need for import aliases - transfer. --- .../transfer/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/transfer/service_endpoint_resolver_gen.go b/internal/service/transfer/service_endpoint_resolver_gen.go index e2fe2f0ea22..333e77b0503 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver transfer_sdkv2.EndpointResolverV2 + defaultResolver transfer.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: transfer_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: transfer.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params transfer_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 1ff21854fef4574abc452659ba3e1f1923f27b08 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:17 -0400 Subject: [PATCH 713/981] No need for import aliases - verifiedpermissions. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/verifiedpermissions/service_endpoint_resolver_gen.go b/internal/service/verifiedpermissions/service_endpoint_resolver_gen.go index 984e26718e7..b8bb5f4cc80 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver verifiedpermissions_sdkv2.EndpointResolverV2 + defaultResolver verifiedpermissions.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: verifiedpermissions_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: verifiedpermissions.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params verifiedpermissions_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From aeca0dc9dc3128954b57cd577810741cef413b4c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:17 -0400 Subject: [PATCH 714/981] No need for import aliases - vpclattice. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/vpclattice/service_endpoint_resolver_gen.go b/internal/service/vpclattice/service_endpoint_resolver_gen.go index b517529cb12..78fc2f62d45 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver vpclattice_sdkv2.EndpointResolverV2 + defaultResolver vpclattice.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: vpclattice_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: vpclattice.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params vpclattice_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 8fdbdc58c472d868d57703853c4fe9ac53e65657 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:17 -0400 Subject: [PATCH 715/981] No need for import aliases - waf. --- .../waf/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/waf/service_endpoint_resolver_gen.go b/internal/service/waf/service_endpoint_resolver_gen.go index cb4177efb49..2e589d7b719 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver waf_sdkv2.EndpointResolverV2 + defaultResolver waf.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: waf_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: waf.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params waf_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 8b1c7ded7844b2f064e2acf81646db2c2a2b550b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:17 -0400 Subject: [PATCH 716/981] No need for import aliases - wafregional. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/wafregional/service_endpoint_resolver_gen.go b/internal/service/wafregional/service_endpoint_resolver_gen.go index 4b97d5e2387..f3f52ceba53 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver wafregional_sdkv2.EndpointResolverV2 + defaultResolver wafregional.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: wafregional_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: wafregional.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params wafregional_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From a67dc2220bbcde23b9207e23c5f78c4c2ce24ae0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:17 -0400 Subject: [PATCH 717/981] No need for import aliases - wafv2. --- .../wafv2/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/wafv2/service_endpoint_resolver_gen.go b/internal/service/wafv2/service_endpoint_resolver_gen.go index 27df5d8997d..6d73ed3262c 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver wafv2_sdkv2.EndpointResolverV2 + defaultResolver wafv2.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: wafv2_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: wafv2.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params wafv2_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From b07f77962dfd3d2e52bea85794db7017e7153ed2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:17 -0400 Subject: [PATCH 718/981] No need for import aliases - wellarchitected. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/wellarchitected/service_endpoint_resolver_gen.go b/internal/service/wellarchitected/service_endpoint_resolver_gen.go index 85faee69813..359bfdd22dd 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver wellarchitected_sdkv2.EndpointResolverV2 + defaultResolver wellarchitected.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: wellarchitected_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: wellarchitected.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params wellarchitected_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 639127332f8f4dbce4f75b91db8660954791ca30 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:17 -0400 Subject: [PATCH 719/981] No need for import aliases - worklink. --- .../worklink/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/worklink/service_endpoint_resolver_gen.go b/internal/service/worklink/service_endpoint_resolver_gen.go index 8a80889b03b..a6af671fe7e 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver worklink_sdkv2.EndpointResolverV2 + defaultResolver worklink.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: worklink_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: worklink.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params worklink_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From f6bf60269b7e36d9aa9c4220e7867002eb85e229 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:17 -0400 Subject: [PATCH 720/981] No need for import aliases - workspaces. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/workspaces/service_endpoint_resolver_gen.go b/internal/service/workspaces/service_endpoint_resolver_gen.go index 37a015e3e16..1994fc864c7 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver workspaces_sdkv2.EndpointResolverV2 + defaultResolver workspaces.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: workspaces_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: workspaces.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params workspaces_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 845277ec0dace3b81aa0a1bb5ccb99d80c0349ed Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:17 -0400 Subject: [PATCH 721/981] No need for import aliases - workspacesweb. --- .../service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/workspacesweb/service_endpoint_resolver_gen.go b/internal/service/workspacesweb/service_endpoint_resolver_gen.go index 9775fb0a93d..87d7b6f8afd 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver workspacesweb_sdkv2.EndpointResolverV2 + defaultResolver workspacesweb.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: workspacesweb_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: workspacesweb.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params workspacesweb_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From f6781521ba88d6f46f2b846cb5fed5946f70286f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:02:17 -0400 Subject: [PATCH 722/981] No need for import aliases - xray. --- .../xray/service_endpoint_resolver_gen.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/xray/service_endpoint_resolver_gen.go b/internal/service/xray/service_endpoint_resolver_gen.go index a2aa0dedb3f..b196afe9383 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 = resolverSDKv2{} type resolverSDKv2 struct { - defaultResolver xray_sdkv2.EndpointResolverV2 + defaultResolver xray.EndpointResolverV2 } func newEndpointResolverSDKv2() resolverSDKv2 { return resolverSDKv2{ - defaultResolver: xray_sdkv2.NewDefaultEndpointResolverV2(), + defaultResolver: xray.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params xray_sdkv2.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { +func (r resolverSDKv2) 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) } } } From 241eab1ab4a5158d0a2b1e4ea764ea714c638cea Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:04:23 -0400 Subject: [PATCH 723/981] No need for import aliases. --- internal/service/ec2/service_package.go | 46 ++++++++++++------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/internal/service/ec2/service_package.go b/internal/service/ec2/service_package.go index a83c137dc10..276aefbf4f2 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(newEndpointResolverSDKv2()), 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 From bb4b3b95960a6176e0543385e0251ccfe0da7490 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:05:13 -0400 Subject: [PATCH 724/981] No need for import aliases. --- internal/service/rds/blue_green.go | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) 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), } From 9b6b29846ffdd877e9a6fed27f891481c2134e05 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:06:40 -0400 Subject: [PATCH 725/981] No need for import aliases. --- internal/provider/provider_acc_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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(), From d4fc352d14eeaf7db50b3a4c29c917c575bf68b7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 09:14:21 -0400 Subject: [PATCH 726/981] acctest: Remove use of 'github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr'. --- internal/acctest/acctest.go | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/internal/acctest/acctest.go b/internal/acctest/acctest.go index 0205fbc312e..b6724b1323a 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" @@ -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 From e39e912efa86b70de3bef038a49ea7d4cb68f91b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 11:18:44 -0400 Subject: [PATCH 727/981] Tweak 'time-equality' semgrep rule for AWS SDK for Go v2. --- .ci/.semgrep.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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: | From 69627f58687c85fe7619a55bafcfea5c5ef33e32 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 11:19:57 -0400 Subject: [PATCH 728/981] Remove 'aws-api-context' semgrep rule -- n/a to AWS SDK for Go v2. --- .ci/semgrep/migrate/context.yml | 38 --------------------------------- 1 file changed, 38 deletions(-) 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()` From 7fb14d8cd68dfa25966d3d14be0d8c09c041d9b9 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 11:21:51 -0400 Subject: [PATCH 729/981] 'aws-go-sdk-error-code-helper' semgrep rule n/a to AWS SDK for Go v2. --- .ci/semgrep/aws/awserr.yml | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 .ci/semgrep/aws/awserr.yml 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 From e75dac5eb42e371d9c1fc688fa0953da58730a9f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 11:26:10 -0400 Subject: [PATCH 730/981] Tweak go-sdk semgrep rules for AWS SDK for Go v2. --- .ci/semgrep/aws/go-sdk.yml | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/.ci/semgrep/aws/go-sdk.yml b/.ci/semgrep/aws/go-sdk.yml index 4dce3e2b306..53a1f9d8b24 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/service-v2/[^/]+$' 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 From b5b75560b80c126d991e93934236e3babad755d7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 11:37:14 -0400 Subject: [PATCH 731/981] Add 'ci.semgrep.aws.aws-sdk-go-imports' semgrep rule. --- .ci/semgrep/aws/go-sdk-v1.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .ci/semgrep/aws/go-sdk-v1.yml diff --git a/.ci/semgrep/aws/go-sdk-v1.yml b/.ci/semgrep/aws/go-sdk-v1.yml new file mode 100644 index 00000000000..f2ebb0357dc --- /dev/null +++ b/.ci/semgrep/aws/go-sdk-v1.yml @@ -0,0 +1,17 @@ +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/**/*.go" + patterns: + - pattern: | + import ("$X") + - metavariable-regex: + metavariable: "$X" + regex: '^github.com/aws/aws-sdk-go/.+$' + severity: WARNING \ No newline at end of file From dc3b8778518151f43a282f0743e71a994947c22f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 11:38:09 -0400 Subject: [PATCH 732/981] Fix 'ci.semgrep.aws.aws-sdk-go-imports'. --- internal/service/route53profiles/association.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/route53profiles/association.go b/internal/service/route53profiles/association.go index bb460f3268d..9be747de019 100644 --- a/internal/service/route53profiles/association.go +++ b/internal/service/route53profiles/association.go @@ -10,9 +10,9 @@ import ( "time" "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/path" "github.com/hashicorp/terraform-plugin-framework/resource" From cf020a4ab693b7a6a99a34202f1ac07fd4f5d3dc Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 11:49:25 -0400 Subject: [PATCH 733/981] Add 'ci.semgrep.aws.aws-sdk-go-base-awsv1shim-imports'. --- .ci/semgrep/aws/go-sdk-v1.yml | 19 ++++++++++++++++++- .ci/semgrep/aws/go-sdk.yml | 2 +- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/.ci/semgrep/aws/go-sdk-v1.yml b/.ci/semgrep/aws/go-sdk-v1.yml index f2ebb0357dc..a2bb929b039 100644 --- a/.ci/semgrep/aws/go-sdk-v1.yml +++ b/.ci/semgrep/aws/go-sdk-v1.yml @@ -7,11 +7,28 @@ rules: - internal/ exclude: - "internal/service/simpledb/*.go" - - "internal/conns/**/*.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 \ No newline at end of file diff --git a/.ci/semgrep/aws/go-sdk.yml b/.ci/semgrep/aws/go-sdk.yml index 53a1f9d8b24..ab63b1186d6 100644 --- a/.ci/semgrep/aws/go-sdk.yml +++ b/.ci/semgrep/aws/go-sdk.yml @@ -19,7 +19,7 @@ rules: regex: '^github.com/aws/aws-sdk-go-v2/service/[^/]+$' - metavariable-regex: metavariable: "$Y" - regex: '^github.com/aws/aws-sdk-go/service-v2/[^/]+$' + regex: '^github.com/aws/aws-sdk-go-v2/service/[^/]+$' severity: WARNING - id: prefer-pointer-conversion-assignment From ff9cc22e3ff47f23b7a988479dd0057406a852e7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 11:51:33 -0400 Subject: [PATCH 734/981] Fix 'ci.semgrep.aws.aws-sdk-go-base-awsv1shim-imports'. --- internal/service/simpledb/sweep.go | 88 +++++++++++++++++++++++++++- internal/sweep/awsv1/skip.go | 92 ------------------------------ 2 files changed, 86 insertions(+), 94 deletions(-) delete mode 100644 internal/sweep/awsv1/skip.go diff --git a/internal/service/simpledb/sweep.go b/internal/service/simpledb/sweep.go index 4de411247c4..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" ) @@ -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/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 -} From 399e75aca3e956e791130acb01303d0fb99bbc2f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 11:57:33 -0400 Subject: [PATCH 735/981] Fix yamllint '[new-line-at-end-of-file] no new line character at the end of file'. --- .ci/semgrep/aws/go-sdk-v1.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/semgrep/aws/go-sdk-v1.yml b/.ci/semgrep/aws/go-sdk-v1.yml index a2bb929b039..211ff4e9ba0 100644 --- a/.ci/semgrep/aws/go-sdk-v1.yml +++ b/.ci/semgrep/aws/go-sdk-v1.yml @@ -31,4 +31,4 @@ rules: - metavariable-regex: metavariable: "$X" regex: '^github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/?.*$' - severity: WARNING \ No newline at end of file + severity: WARNING From d449cb3106b0cc8ba40db9a845dcc3e27029e1f6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 16:01:03 -0400 Subject: [PATCH 736/981] internal/conns: Use partition and regions constants from 'endpoints'. --- internal/conns/awsclient.go | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/internal/conns/awsclient.go b/internal/conns/awsclient.go index 3d27fceb2c1..a3b429e5ea4 100644 --- a/internal/conns/awsclient.go +++ b/internal/conns/awsclient.go @@ -12,10 +12,11 @@ import ( "strings" "sync" - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" + "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" @@ -31,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 @@ -40,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 } @@ -62,7 +63,7 @@ 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() } @@ -92,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 { @@ -158,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 @@ -204,7 +205,7 @@ func (c *AWSClient) ReverseDNSPrefix(ctx context.Context) string { // 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" } @@ -214,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" } From bd78d26dbb4b7b8dbd655d9e30a4840b2a451e7f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 22 Oct 2024 16:04:49 -0400 Subject: [PATCH 737/981] Move 'ReverseDNS' from 'names' to 'internal/conns'. --- internal/acctest/acctest.go | 2 +- internal/conns/awsclient.go | 13 ++++++++- internal/conns/awsclient_test.go | 46 ++++++++++++++++++++++++++++++++ names/names.go | 12 --------- names/names_test.go | 46 -------------------------------- 5 files changed, 59 insertions(+), 60 deletions(-) diff --git a/internal/acctest/acctest.go b/internal/acctest/acctest.go index b6724b1323a..a5559b583ec 100644 --- a/internal/acctest/acctest.go +++ b/internal/acctest/acctest.go @@ -902,7 +902,7 @@ func PartitionDNSSuffix() string { } func PartitionReverseDNSPrefix() string { - return names.ReverseDNS(PartitionDNSSuffix()) + return conns.ReverseDNS(PartitionDNSSuffix()) } func alternateRegionPartition() string { diff --git a/internal/conns/awsclient.go b/internal/conns/awsclient.go index a3b429e5ea4..9425b4a16de 100644 --- a/internal/conns/awsclient.go +++ b/internal/conns/awsclient.go @@ -199,7 +199,7 @@ 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. @@ -232,6 +232,17 @@ 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) } 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/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() From c7e12e239138210aa6254c004aac197e54fcbad7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 10:52:46 -0400 Subject: [PATCH 738/981] internal/generate/servicepackage: Rename generated endpoint resolver struct type. --- .../generate/servicepackage/endpoint_resolver.go.gtpl | 10 +++++----- internal/generate/servicepackage/file.gtpl | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/generate/servicepackage/endpoint_resolver.go.gtpl b/internal/generate/servicepackage/endpoint_resolver.go.gtpl index 5a2153f01ee..d4fbc9a1967 100644 --- a/internal/generate/servicepackage/endpoint_resolver.go.gtpl +++ b/internal/generate/servicepackage/endpoint_resolver.go.gtpl @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ {{ .GoV2Package }}.EndpointResolverV2 = resolverSDKv2{} +var _ {{ .GoV2Package }}.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver {{ .GoV2Package }}.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: {{ .GoV2Package }}.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params {{ .GoV2Package }}.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.ToBool(params.UseFIPS) diff --git a/internal/generate/servicepackage/file.gtpl b/internal/generate/servicepackage/file.gtpl index 4ceef5bacf4..45aa0c3c471 100644 --- a/internal/generate/servicepackage/file.gtpl +++ b/internal/generate/servicepackage/file.gtpl @@ -126,7 +126,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return {{ .GoV2Package }}.NewFromConfig(cfg, - {{ .GoV2Package }}.WithEndpointResolverV2(newEndpointResolverSDKv2()), + {{ .GoV2Package }}.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 86bf793b4d60e100c96479019a71767b3c5950c3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:08 -0400 Subject: [PATCH 739/981] Rename endpoint resolver struct type - accessanalyzer. --- .../accessanalyzer/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/accessanalyzer/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/accessanalyzer/service_endpoint_resolver_gen.go b/internal/service/accessanalyzer/service_endpoint_resolver_gen.go index 439e3c9a664..4faed4295d8 100644 --- a/internal/service/accessanalyzer/service_endpoint_resolver_gen.go +++ b/internal/service/accessanalyzer/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ accessanalyzer.EndpointResolverV2 = resolverSDKv2{} +var _ accessanalyzer.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver accessanalyzer.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: accessanalyzer.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params accessanalyzer.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.ToBool(params.UseFIPS) diff --git a/internal/service/accessanalyzer/service_package_gen.go b/internal/service/accessanalyzer/service_package_gen.go index 88ec16d3666..9e63a0d828f 100644 --- a/internal/service/accessanalyzer/service_package_gen.go +++ b/internal/service/accessanalyzer/service_package_gen.go @@ -52,7 +52,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return accessanalyzer.NewFromConfig(cfg, - accessanalyzer.WithEndpointResolverV2(newEndpointResolverSDKv2()), + accessanalyzer.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 43fed3e2ab75e096f0ae8beaa843d62d39efa3a7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:08 -0400 Subject: [PATCH 740/981] Rename endpoint resolver struct type - account. --- .../service/account/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/account/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/account/service_endpoint_resolver_gen.go b/internal/service/account/service_endpoint_resolver_gen.go index 3adffb2dbd3..55e9cb6c98f 100644 --- a/internal/service/account/service_endpoint_resolver_gen.go +++ b/internal/service/account/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ account.EndpointResolverV2 = resolverSDKv2{} +var _ account.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver account.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: account.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params account.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.ToBool(params.UseFIPS) diff --git a/internal/service/account/service_package_gen.go b/internal/service/account/service_package_gen.go index 989446bf6a2..b65ea6af0c7 100644 --- a/internal/service/account/service_package_gen.go +++ b/internal/service/account/service_package_gen.go @@ -53,7 +53,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return account.NewFromConfig(cfg, - account.WithEndpointResolverV2(newEndpointResolverSDKv2()), + account.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 492004993e798f0249937b829f5f457303cf194d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:08 -0400 Subject: [PATCH 741/981] Rename endpoint resolver struct type - acm. --- internal/service/acm/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/acm/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/acm/service_endpoint_resolver_gen.go b/internal/service/acm/service_endpoint_resolver_gen.go index f9b84c54756..464025a8ed4 100644 --- a/internal/service/acm/service_endpoint_resolver_gen.go +++ b/internal/service/acm/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ acm.EndpointResolverV2 = resolverSDKv2{} +var _ acm.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver acm.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: acm.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params acm.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.ToBool(params.UseFIPS) diff --git a/internal/service/acm/service_package_gen.go b/internal/service/acm/service_package_gen.go index 4e7c6f6509b..90c139864a7 100644 --- a/internal/service/acm/service_package_gen.go +++ b/internal/service/acm/service_package_gen.go @@ -61,7 +61,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return acm.NewFromConfig(cfg, - acm.WithEndpointResolverV2(newEndpointResolverSDKv2()), + acm.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From dbec2e0c07f787a7bca45580908f718dd94533d8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:08 -0400 Subject: [PATCH 742/981] Rename endpoint resolver struct type - acmpca. --- .../service/acmpca/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/acmpca/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/acmpca/service_endpoint_resolver_gen.go b/internal/service/acmpca/service_endpoint_resolver_gen.go index 1330a0b201b..cb328c16cd2 100644 --- a/internal/service/acmpca/service_endpoint_resolver_gen.go +++ b/internal/service/acmpca/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ acmpca.EndpointResolverV2 = resolverSDKv2{} +var _ acmpca.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver acmpca.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: acmpca.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params acmpca.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.ToBool(params.UseFIPS) diff --git a/internal/service/acmpca/service_package_gen.go b/internal/service/acmpca/service_package_gen.go index b5c886c9a27..c2b374e3a64 100644 --- a/internal/service/acmpca/service_package_gen.go +++ b/internal/service/acmpca/service_package_gen.go @@ -82,7 +82,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return acmpca.NewFromConfig(cfg, - acmpca.WithEndpointResolverV2(newEndpointResolverSDKv2()), + acmpca.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 3095d688d9d71bf5e704aee756f9a7118910c59c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:08 -0400 Subject: [PATCH 743/981] Rename endpoint resolver struct type - amp. --- internal/service/amp/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/amp/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/amp/service_endpoint_resolver_gen.go b/internal/service/amp/service_endpoint_resolver_gen.go index e2d6cdefb08..3d710609ed7 100644 --- a/internal/service/amp/service_endpoint_resolver_gen.go +++ b/internal/service/amp/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ amp.EndpointResolverV2 = resolverSDKv2{} +var _ amp.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver amp.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: amp.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params amp.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.ToBool(params.UseFIPS) diff --git a/internal/service/amp/service_package_gen.go b/internal/service/amp/service_package_gen.go index cbff1e940a9..5c926df82eb 100644 --- a/internal/service/amp/service_package_gen.go +++ b/internal/service/amp/service_package_gen.go @@ -83,7 +83,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return amp.NewFromConfig(cfg, - amp.WithEndpointResolverV2(newEndpointResolverSDKv2()), + amp.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From e2b4d568d8f8a364fe8072244a8dc2f9209003b7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:08 -0400 Subject: [PATCH 744/981] Rename endpoint resolver struct type - amplify. --- .../service/amplify/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/amplify/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/amplify/service_endpoint_resolver_gen.go b/internal/service/amplify/service_endpoint_resolver_gen.go index 7c8d3fa0bd4..3c59ee3b2f4 100644 --- a/internal/service/amplify/service_endpoint_resolver_gen.go +++ b/internal/service/amplify/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ amplify.EndpointResolverV2 = resolverSDKv2{} +var _ amplify.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver amplify.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: amplify.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params amplify.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.ToBool(params.UseFIPS) diff --git a/internal/service/amplify/service_package_gen.go b/internal/service/amplify/service_package_gen.go index 7a2147a61eb..8957bf34285 100644 --- a/internal/service/amplify/service_package_gen.go +++ b/internal/service/amplify/service_package_gen.go @@ -71,7 +71,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return amplify.NewFromConfig(cfg, - amplify.WithEndpointResolverV2(newEndpointResolverSDKv2()), + amplify.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 743ef2b11beaacfe97d05e8363b7ee4cbd112303 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:08 -0400 Subject: [PATCH 745/981] Rename endpoint resolver struct type - apigateway. --- .../apigateway/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/apigateway/service_package.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/apigateway/service_endpoint_resolver_gen.go b/internal/service/apigateway/service_endpoint_resolver_gen.go index 5df720bdf1b..d936de2594e 100644 --- a/internal/service/apigateway/service_endpoint_resolver_gen.go +++ b/internal/service/apigateway/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ apigateway.EndpointResolverV2 = resolverSDKv2{} +var _ apigateway.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver apigateway.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: apigateway.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params apigateway.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.ToBool(params.UseFIPS) 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 { From 006c9500c4f32196b3900a675b93c7a3847bc4df Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:08 -0400 Subject: [PATCH 746/981] Rename endpoint resolver struct type - apigatewayv2. --- .../apigatewayv2/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/apigatewayv2/service_package.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/apigatewayv2/service_endpoint_resolver_gen.go b/internal/service/apigatewayv2/service_endpoint_resolver_gen.go index 7376c04594e..b82d77e3be6 100644 --- a/internal/service/apigatewayv2/service_endpoint_resolver_gen.go +++ b/internal/service/apigatewayv2/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ apigatewayv2.EndpointResolverV2 = resolverSDKv2{} +var _ apigatewayv2.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver apigatewayv2.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: apigatewayv2.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params apigatewayv2.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.ToBool(params.UseFIPS) 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 { From c54453ccf817abcfe9a60931223c9ab897813b12 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:08 -0400 Subject: [PATCH 747/981] Rename endpoint resolver struct type - appautoscaling. --- .../appautoscaling/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/appautoscaling/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/appautoscaling/service_endpoint_resolver_gen.go b/internal/service/appautoscaling/service_endpoint_resolver_gen.go index b913bf6acc5..c5ef078ea28 100644 --- a/internal/service/appautoscaling/service_endpoint_resolver_gen.go +++ b/internal/service/appautoscaling/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ applicationautoscaling.EndpointResolverV2 = resolverSDKv2{} +var _ applicationautoscaling.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver applicationautoscaling.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: applicationautoscaling.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params applicationautoscaling.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.ToBool(params.UseFIPS) diff --git a/internal/service/appautoscaling/service_package_gen.go b/internal/service/appautoscaling/service_package_gen.go index a9a289cb37f..89fe97d1f1a 100644 --- a/internal/service/appautoscaling/service_package_gen.go +++ b/internal/service/appautoscaling/service_package_gen.go @@ -57,7 +57,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return applicationautoscaling.NewFromConfig(cfg, - applicationautoscaling.WithEndpointResolverV2(newEndpointResolverSDKv2()), + applicationautoscaling.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 2181a836130cd309400dbc98a71019529857f1db Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:08 -0400 Subject: [PATCH 748/981] Rename endpoint resolver struct type - appconfig. --- .../service/appconfig/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/appconfig/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/appconfig/service_endpoint_resolver_gen.go b/internal/service/appconfig/service_endpoint_resolver_gen.go index 1e7c5643688..8c47518f9d8 100644 --- a/internal/service/appconfig/service_endpoint_resolver_gen.go +++ b/internal/service/appconfig/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ appconfig.EndpointResolverV2 = resolverSDKv2{} +var _ appconfig.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver appconfig.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: appconfig.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params appconfig.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.ToBool(params.UseFIPS) diff --git a/internal/service/appconfig/service_package_gen.go b/internal/service/appconfig/service_package_gen.go index 44df11e5bc8..c69c970f4c4 100644 --- a/internal/service/appconfig/service_package_gen.go +++ b/internal/service/appconfig/service_package_gen.go @@ -123,7 +123,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return appconfig.NewFromConfig(cfg, - appconfig.WithEndpointResolverV2(newEndpointResolverSDKv2()), + appconfig.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From e59151d5a0b819942ff1c22e5319e0a21b6876ed Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:08 -0400 Subject: [PATCH 749/981] Rename endpoint resolver struct type - appfabric. --- .../service/appfabric/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/appfabric/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/appfabric/service_endpoint_resolver_gen.go b/internal/service/appfabric/service_endpoint_resolver_gen.go index 662739c4585..6d8411d2afd 100644 --- a/internal/service/appfabric/service_endpoint_resolver_gen.go +++ b/internal/service/appfabric/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ appfabric.EndpointResolverV2 = resolverSDKv2{} +var _ appfabric.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver appfabric.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: appfabric.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params appfabric.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.ToBool(params.UseFIPS) diff --git a/internal/service/appfabric/service_package_gen.go b/internal/service/appfabric/service_package_gen.go index 77bc23b3ded..09abc7fb232 100644 --- a/internal/service/appfabric/service_package_gen.go +++ b/internal/service/appfabric/service_package_gen.go @@ -72,7 +72,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return appfabric.NewFromConfig(cfg, - appfabric.WithEndpointResolverV2(newEndpointResolverSDKv2()), + appfabric.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From a925f7862e10e2fd7f8d53a2d03b880d1feb8683 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:08 -0400 Subject: [PATCH 750/981] Rename endpoint resolver struct type - appflow. --- .../service/appflow/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/appflow/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/appflow/service_endpoint_resolver_gen.go b/internal/service/appflow/service_endpoint_resolver_gen.go index a6720a139e3..166b2bbf49c 100644 --- a/internal/service/appflow/service_endpoint_resolver_gen.go +++ b/internal/service/appflow/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ appflow.EndpointResolverV2 = resolverSDKv2{} +var _ appflow.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver appflow.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: appflow.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params appflow.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.ToBool(params.UseFIPS) diff --git a/internal/service/appflow/service_package_gen.go b/internal/service/appflow/service_package_gen.go index 4b3750992b1..b0ca281652c 100644 --- a/internal/service/appflow/service_package_gen.go +++ b/internal/service/appflow/service_package_gen.go @@ -53,7 +53,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return appflow.NewFromConfig(cfg, - appflow.WithEndpointResolverV2(newEndpointResolverSDKv2()), + appflow.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From dd8dd1a97e64c4b3b505f1185f492ba50008d30f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:09 -0400 Subject: [PATCH 751/981] Rename endpoint resolver struct type - appintegrations. --- .../appintegrations/service_endpoint_resolver_gen.go | 10 +++++----- .../service/appintegrations/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/appintegrations/service_endpoint_resolver_gen.go b/internal/service/appintegrations/service_endpoint_resolver_gen.go index 0e49563eabf..d715dce688a 100644 --- a/internal/service/appintegrations/service_endpoint_resolver_gen.go +++ b/internal/service/appintegrations/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ appintegrations.EndpointResolverV2 = resolverSDKv2{} +var _ appintegrations.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver appintegrations.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: appintegrations.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params appintegrations.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.ToBool(params.UseFIPS) diff --git a/internal/service/appintegrations/service_package_gen.go b/internal/service/appintegrations/service_package_gen.go index 7d6d4cb5a62..f468e19a2b5 100644 --- a/internal/service/appintegrations/service_package_gen.go +++ b/internal/service/appintegrations/service_package_gen.go @@ -63,7 +63,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return appintegrations.NewFromConfig(cfg, - appintegrations.WithEndpointResolverV2(newEndpointResolverSDKv2()), + appintegrations.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 40dcbf841c458216382f8730392621ec3ab24850 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:09 -0400 Subject: [PATCH 752/981] Rename endpoint resolver struct type - applicationinsights. --- .../service_endpoint_resolver_gen.go | 10 +++++----- .../service/applicationinsights/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/applicationinsights/service_endpoint_resolver_gen.go b/internal/service/applicationinsights/service_endpoint_resolver_gen.go index 1359581fb7a..36f65e3254b 100644 --- a/internal/service/applicationinsights/service_endpoint_resolver_gen.go +++ b/internal/service/applicationinsights/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ applicationinsights.EndpointResolverV2 = resolverSDKv2{} +var _ applicationinsights.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver applicationinsights.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: applicationinsights.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params applicationinsights.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.ToBool(params.UseFIPS) diff --git a/internal/service/applicationinsights/service_package_gen.go b/internal/service/applicationinsights/service_package_gen.go index 41b6fed4b80..d0e5ac3670b 100644 --- a/internal/service/applicationinsights/service_package_gen.go +++ b/internal/service/applicationinsights/service_package_gen.go @@ -48,7 +48,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return applicationinsights.NewFromConfig(cfg, - applicationinsights.WithEndpointResolverV2(newEndpointResolverSDKv2()), + applicationinsights.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From bdfe4100fc7ce5bcb98c57c7f17d79de1d5ae90e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:09 -0400 Subject: [PATCH 753/981] Rename endpoint resolver struct type - applicationsignals. --- .../service_endpoint_resolver_gen.go | 10 +++++----- .../service/applicationsignals/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/applicationsignals/service_endpoint_resolver_gen.go b/internal/service/applicationsignals/service_endpoint_resolver_gen.go index e7b2f300b1c..07ec75d8062 100644 --- a/internal/service/applicationsignals/service_endpoint_resolver_gen.go +++ b/internal/service/applicationsignals/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ applicationsignals.EndpointResolverV2 = resolverSDKv2{} +var _ applicationsignals.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver applicationsignals.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: applicationsignals.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params applicationsignals.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.ToBool(params.UseFIPS) diff --git a/internal/service/applicationsignals/service_package_gen.go b/internal/service/applicationsignals/service_package_gen.go index 46d78b1399e..edba302f39e 100644 --- a/internal/service/applicationsignals/service_package_gen.go +++ b/internal/service/applicationsignals/service_package_gen.go @@ -39,7 +39,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return applicationsignals.NewFromConfig(cfg, - applicationsignals.WithEndpointResolverV2(newEndpointResolverSDKv2()), + applicationsignals.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From eef98d2437eec60c864cbfe05bbbda204d08c764 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:09 -0400 Subject: [PATCH 754/981] Rename endpoint resolver struct type - appmesh. --- .../service/appmesh/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/appmesh/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/appmesh/service_endpoint_resolver_gen.go b/internal/service/appmesh/service_endpoint_resolver_gen.go index fcee08a602c..78f11cbea77 100644 --- a/internal/service/appmesh/service_endpoint_resolver_gen.go +++ b/internal/service/appmesh/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ appmesh.EndpointResolverV2 = resolverSDKv2{} +var _ appmesh.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver appmesh.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: appmesh.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params appmesh.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.ToBool(params.UseFIPS) diff --git a/internal/service/appmesh/service_package_gen.go b/internal/service/appmesh/service_package_gen.go index fe44bef921a..c74789750f9 100644 --- a/internal/service/appmesh/service_package_gen.go +++ b/internal/service/appmesh/service_package_gen.go @@ -139,7 +139,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return appmesh.NewFromConfig(cfg, - appmesh.WithEndpointResolverV2(newEndpointResolverSDKv2()), + appmesh.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From f1225763488c33504c2a9d9888da580572056a58 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:09 -0400 Subject: [PATCH 755/981] Rename endpoint resolver struct type - apprunner. --- .../service/apprunner/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/apprunner/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/apprunner/service_endpoint_resolver_gen.go b/internal/service/apprunner/service_endpoint_resolver_gen.go index 1c154aae64b..cb153b853ab 100644 --- a/internal/service/apprunner/service_endpoint_resolver_gen.go +++ b/internal/service/apprunner/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ apprunner.EndpointResolverV2 = resolverSDKv2{} +var _ apprunner.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver apprunner.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: apprunner.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params apprunner.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.ToBool(params.UseFIPS) diff --git a/internal/service/apprunner/service_package_gen.go b/internal/service/apprunner/service_package_gen.go index 9fa99227a14..2e5cda74c30 100644 --- a/internal/service/apprunner/service_package_gen.go +++ b/internal/service/apprunner/service_package_gen.go @@ -107,7 +107,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return apprunner.NewFromConfig(cfg, - apprunner.WithEndpointResolverV2(newEndpointResolverSDKv2()), + apprunner.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 689047cd9be8750ff8c5e3d0d24cc96d8c50ff2e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:09 -0400 Subject: [PATCH 756/981] Rename endpoint resolver struct type - appstream. --- .../service/appstream/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/appstream/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/appstream/service_endpoint_resolver_gen.go b/internal/service/appstream/service_endpoint_resolver_gen.go index ec7c0ef1517..4937a6a51bc 100644 --- a/internal/service/appstream/service_endpoint_resolver_gen.go +++ b/internal/service/appstream/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ appstream.EndpointResolverV2 = resolverSDKv2{} +var _ appstream.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver appstream.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: appstream.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params appstream.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.ToBool(params.UseFIPS) diff --git a/internal/service/appstream/service_package_gen.go b/internal/service/appstream/service_package_gen.go index 981f1734c90..c540613b969 100644 --- a/internal/service/appstream/service_package_gen.go +++ b/internal/service/appstream/service_package_gen.go @@ -85,7 +85,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return appstream.NewFromConfig(cfg, - appstream.WithEndpointResolverV2(newEndpointResolverSDKv2()), + appstream.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 8d726340f0af3c61992316a5d1cb5338f8747893 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:09 -0400 Subject: [PATCH 757/981] Rename endpoint resolver struct type - appsync. --- .../service/appsync/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/appsync/service_package.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/appsync/service_endpoint_resolver_gen.go b/internal/service/appsync/service_endpoint_resolver_gen.go index b8a76b77b00..e079e6f8177 100644 --- a/internal/service/appsync/service_endpoint_resolver_gen.go +++ b/internal/service/appsync/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ appsync.EndpointResolverV2 = resolverSDKv2{} +var _ appsync.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver appsync.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: appsync.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params appsync.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.ToBool(params.UseFIPS) 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 { From 68cce587f42160a1107316abbf4a2fb34f6aa517 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:09 -0400 Subject: [PATCH 758/981] Rename endpoint resolver struct type - athena. --- .../service/athena/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/athena/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/athena/service_endpoint_resolver_gen.go b/internal/service/athena/service_endpoint_resolver_gen.go index e691f76fe4b..6b32c8f767f 100644 --- a/internal/service/athena/service_endpoint_resolver_gen.go +++ b/internal/service/athena/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ athena.EndpointResolverV2 = resolverSDKv2{} +var _ athena.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver athena.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: athena.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params athena.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.ToBool(params.UseFIPS) diff --git a/internal/service/athena/service_package_gen.go b/internal/service/athena/service_package_gen.go index 50a13157c83..55978fa0c40 100644 --- a/internal/service/athena/service_package_gen.go +++ b/internal/service/athena/service_package_gen.go @@ -74,7 +74,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return athena.NewFromConfig(cfg, - athena.WithEndpointResolverV2(newEndpointResolverSDKv2()), + athena.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From b727cf6581fc2e620c7ad0c4695e74e6b3625a93 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:09 -0400 Subject: [PATCH 759/981] Rename endpoint resolver struct type - auditmanager. --- .../auditmanager/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/auditmanager/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/auditmanager/service_endpoint_resolver_gen.go b/internal/service/auditmanager/service_endpoint_resolver_gen.go index 33246bf69f6..69264740bc5 100644 --- a/internal/service/auditmanager/service_endpoint_resolver_gen.go +++ b/internal/service/auditmanager/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ auditmanager.EndpointResolverV2 = resolverSDKv2{} +var _ auditmanager.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver auditmanager.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: auditmanager.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params auditmanager.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.ToBool(params.UseFIPS) diff --git a/internal/service/auditmanager/service_package_gen.go b/internal/service/auditmanager/service_package_gen.go index efdae722607..251cac1b893 100644 --- a/internal/service/auditmanager/service_package_gen.go +++ b/internal/service/auditmanager/service_package_gen.go @@ -83,7 +83,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return auditmanager.NewFromConfig(cfg, - auditmanager.WithEndpointResolverV2(newEndpointResolverSDKv2()), + auditmanager.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From b6bc2aa34f70d4e13e7d1664e88c765ffbf2db18 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:09 -0400 Subject: [PATCH 760/981] Rename endpoint resolver struct type - autoscaling. --- .../autoscaling/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/autoscaling/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/autoscaling/service_endpoint_resolver_gen.go b/internal/service/autoscaling/service_endpoint_resolver_gen.go index 2c142a3648a..2bc2ceb136e 100644 --- a/internal/service/autoscaling/service_endpoint_resolver_gen.go +++ b/internal/service/autoscaling/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ autoscaling.EndpointResolverV2 = resolverSDKv2{} +var _ autoscaling.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver autoscaling.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: autoscaling.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params autoscaling.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.ToBool(params.UseFIPS) diff --git a/internal/service/autoscaling/service_package_gen.go b/internal/service/autoscaling/service_package_gen.go index 6f5e11aefe5..b4f52e69d11 100644 --- a/internal/service/autoscaling/service_package_gen.go +++ b/internal/service/autoscaling/service_package_gen.go @@ -101,7 +101,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return autoscaling.NewFromConfig(cfg, - autoscaling.WithEndpointResolverV2(newEndpointResolverSDKv2()), + autoscaling.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From f9a5f69d014ee830f92cd8016770644c3a31adbc Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:09 -0400 Subject: [PATCH 761/981] Rename endpoint resolver struct type - autoscalingplans. --- .../autoscalingplans/service_endpoint_resolver_gen.go | 10 +++++----- .../service/autoscalingplans/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/autoscalingplans/service_endpoint_resolver_gen.go b/internal/service/autoscalingplans/service_endpoint_resolver_gen.go index 3ab42a7e423..321a5ef5400 100644 --- a/internal/service/autoscalingplans/service_endpoint_resolver_gen.go +++ b/internal/service/autoscalingplans/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ autoscalingplans.EndpointResolverV2 = resolverSDKv2{} +var _ autoscalingplans.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver autoscalingplans.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: autoscalingplans.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params autoscalingplans.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.ToBool(params.UseFIPS) diff --git a/internal/service/autoscalingplans/service_package_gen.go b/internal/service/autoscalingplans/service_package_gen.go index a61c868c50d..a404320210d 100644 --- a/internal/service/autoscalingplans/service_package_gen.go +++ b/internal/service/autoscalingplans/service_package_gen.go @@ -44,7 +44,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return autoscalingplans.NewFromConfig(cfg, - autoscalingplans.WithEndpointResolverV2(newEndpointResolverSDKv2()), + autoscalingplans.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 37d80f8d8910b770c4219571d72f46a41c45658d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:09 -0400 Subject: [PATCH 762/981] Rename endpoint resolver struct type - backup. --- .../service/backup/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/backup/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/backup/service_endpoint_resolver_gen.go b/internal/service/backup/service_endpoint_resolver_gen.go index ed821c0bef4..3c3173a9d90 100644 --- a/internal/service/backup/service_endpoint_resolver_gen.go +++ b/internal/service/backup/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ backup.EndpointResolverV2 = resolverSDKv2{} +var _ backup.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver backup.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: backup.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params backup.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.ToBool(params.UseFIPS) diff --git a/internal/service/backup/service_package_gen.go b/internal/service/backup/service_package_gen.go index 5039267dbf6..08508d1b2e1 100644 --- a/internal/service/backup/service_package_gen.go +++ b/internal/service/backup/service_package_gen.go @@ -159,7 +159,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return backup.NewFromConfig(cfg, - backup.WithEndpointResolverV2(newEndpointResolverSDKv2()), + backup.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From dda230c2330ad56c58ca00f4f84f212c09e711da Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:09 -0400 Subject: [PATCH 763/981] Rename endpoint resolver struct type - batch. --- .../service/batch/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/batch/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/batch/service_endpoint_resolver_gen.go b/internal/service/batch/service_endpoint_resolver_gen.go index 8833c959df1..7120a8c0d05 100644 --- a/internal/service/batch/service_endpoint_resolver_gen.go +++ b/internal/service/batch/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ batch.EndpointResolverV2 = resolverSDKv2{} +var _ batch.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver batch.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: batch.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params batch.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.ToBool(params.UseFIPS) diff --git a/internal/service/batch/service_package_gen.go b/internal/service/batch/service_package_gen.go index fac160c33ad..00e1b5ab7bb 100644 --- a/internal/service/batch/service_package_gen.go +++ b/internal/service/batch/service_package_gen.go @@ -96,7 +96,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return batch.NewFromConfig(cfg, - batch.WithEndpointResolverV2(newEndpointResolverSDKv2()), + batch.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 4e3df4f5fc872b5291072dc02303bb1010988c83 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:10 -0400 Subject: [PATCH 764/981] Rename endpoint resolver struct type - bcmdataexports. --- .../bcmdataexports/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/bcmdataexports/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/bcmdataexports/service_endpoint_resolver_gen.go b/internal/service/bcmdataexports/service_endpoint_resolver_gen.go index 67aa7f41d9b..ff004f03d34 100644 --- a/internal/service/bcmdataexports/service_endpoint_resolver_gen.go +++ b/internal/service/bcmdataexports/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ bcmdataexports.EndpointResolverV2 = resolverSDKv2{} +var _ bcmdataexports.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver bcmdataexports.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: bcmdataexports.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params bcmdataexports.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.ToBool(params.UseFIPS) diff --git a/internal/service/bcmdataexports/service_package_gen.go b/internal/service/bcmdataexports/service_package_gen.go index eebc3a3e71e..7d1c63aa14b 100644 --- a/internal/service/bcmdataexports/service_package_gen.go +++ b/internal/service/bcmdataexports/service_package_gen.go @@ -47,7 +47,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return bcmdataexports.NewFromConfig(cfg, - bcmdataexports.WithEndpointResolverV2(newEndpointResolverSDKv2()), + bcmdataexports.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 0807098d3f70f4fe73baf636563b64293550d9bc Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:10 -0400 Subject: [PATCH 765/981] Rename endpoint resolver struct type - bedrock. --- .../service/bedrock/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/bedrock/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/bedrock/service_endpoint_resolver_gen.go b/internal/service/bedrock/service_endpoint_resolver_gen.go index d050ca66224..bb9ed437716 100644 --- a/internal/service/bedrock/service_endpoint_resolver_gen.go +++ b/internal/service/bedrock/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ bedrock.EndpointResolverV2 = resolverSDKv2{} +var _ bedrock.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver bedrock.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: bedrock.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params bedrock.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.ToBool(params.UseFIPS) diff --git a/internal/service/bedrock/service_package_gen.go b/internal/service/bedrock/service_package_gen.go index bd4ab015f18..f4899cbe9ea 100644 --- a/internal/service/bedrock/service_package_gen.go +++ b/internal/service/bedrock/service_package_gen.go @@ -94,7 +94,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return bedrock.NewFromConfig(cfg, - bedrock.WithEndpointResolverV2(newEndpointResolverSDKv2()), + bedrock.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 5fe99d064ad0e6aa6b015ef9df44231dfcfc3663 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:10 -0400 Subject: [PATCH 766/981] Rename endpoint resolver struct type - bedrockagent. --- .../bedrockagent/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/bedrockagent/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/bedrockagent/service_endpoint_resolver_gen.go b/internal/service/bedrockagent/service_endpoint_resolver_gen.go index 356fc622567..850cef4a6aa 100644 --- a/internal/service/bedrockagent/service_endpoint_resolver_gen.go +++ b/internal/service/bedrockagent/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ bedrockagent.EndpointResolverV2 = resolverSDKv2{} +var _ bedrockagent.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver bedrockagent.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: bedrockagent.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params bedrockagent.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.ToBool(params.UseFIPS) diff --git a/internal/service/bedrockagent/service_package_gen.go b/internal/service/bedrockagent/service_package_gen.go index a67782e020d..2fa8121da9a 100644 --- a/internal/service/bedrockagent/service_package_gen.go +++ b/internal/service/bedrockagent/service_package_gen.go @@ -78,7 +78,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return bedrockagent.NewFromConfig(cfg, - bedrockagent.WithEndpointResolverV2(newEndpointResolverSDKv2()), + bedrockagent.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 25258b6273badf689aba0caede73fc44d96bb973 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:10 -0400 Subject: [PATCH 767/981] Rename endpoint resolver struct type - budgets. --- .../service/budgets/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/budgets/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/budgets/service_endpoint_resolver_gen.go b/internal/service/budgets/service_endpoint_resolver_gen.go index 0f48155c259..6bf3f2bc6a3 100644 --- a/internal/service/budgets/service_endpoint_resolver_gen.go +++ b/internal/service/budgets/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ budgets.EndpointResolverV2 = resolverSDKv2{} +var _ budgets.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver budgets.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: budgets.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params budgets.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.ToBool(params.UseFIPS) diff --git a/internal/service/budgets/service_package_gen.go b/internal/service/budgets/service_package_gen.go index 77d93d23df0..cf321a8e7e4 100644 --- a/internal/service/budgets/service_package_gen.go +++ b/internal/service/budgets/service_package_gen.go @@ -64,7 +64,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return budgets.NewFromConfig(cfg, - budgets.WithEndpointResolverV2(newEndpointResolverSDKv2()), + budgets.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 7f685a216688f3f687935c9a86dc242efcf0f8ef Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:10 -0400 Subject: [PATCH 768/981] Rename endpoint resolver struct type - ce. --- internal/service/ce/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/ce/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/ce/service_endpoint_resolver_gen.go b/internal/service/ce/service_endpoint_resolver_gen.go index 6ac5a37b7f3..0dfbcce2992 100644 --- a/internal/service/ce/service_endpoint_resolver_gen.go +++ b/internal/service/ce/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ costexplorer.EndpointResolverV2 = resolverSDKv2{} +var _ costexplorer.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver costexplorer.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: costexplorer.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params costexplorer.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.ToBool(params.UseFIPS) diff --git a/internal/service/ce/service_package_gen.go b/internal/service/ce/service_package_gen.go index 792fe594504..4d08451699b 100644 --- a/internal/service/ce/service_package_gen.go +++ b/internal/service/ce/service_package_gen.go @@ -80,7 +80,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return costexplorer.NewFromConfig(cfg, - costexplorer.WithEndpointResolverV2(newEndpointResolverSDKv2()), + costexplorer.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 9f2e592c55dc499baeb3565862a6aa604da2d820 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:10 -0400 Subject: [PATCH 769/981] Rename endpoint resolver struct type - chatbot. --- .../service/chatbot/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/chatbot/service_package.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/chatbot/service_endpoint_resolver_gen.go b/internal/service/chatbot/service_endpoint_resolver_gen.go index 2efffeb8d1d..b6a7aaa0bc5 100644 --- a/internal/service/chatbot/service_endpoint_resolver_gen.go +++ b/internal/service/chatbot/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ chatbot.EndpointResolverV2 = resolverSDKv2{} +var _ chatbot.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver chatbot.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: chatbot.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params chatbot.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.ToBool(params.UseFIPS) 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 { From 1180e8a0b181690b42df1a3e5cab0d3083bdebc7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:10 -0400 Subject: [PATCH 770/981] Rename endpoint resolver struct type - chime. --- .../service/chime/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/chime/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/chime/service_endpoint_resolver_gen.go b/internal/service/chime/service_endpoint_resolver_gen.go index 4c95775b8df..c1547bf192d 100644 --- a/internal/service/chime/service_endpoint_resolver_gen.go +++ b/internal/service/chime/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ chime.EndpointResolverV2 = resolverSDKv2{} +var _ chime.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver chime.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: chime.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params chime.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.ToBool(params.UseFIPS) diff --git a/internal/service/chime/service_package_gen.go b/internal/service/chime/service_package_gen.go index f3ce577fe30..ee06654b1ce 100644 --- a/internal/service/chime/service_package_gen.go +++ b/internal/service/chime/service_package_gen.go @@ -72,7 +72,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return chime.NewFromConfig(cfg, - chime.WithEndpointResolverV2(newEndpointResolverSDKv2()), + chime.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From f362d2fdf3b2433ccd2580b8d64e0f07665caec4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:10 -0400 Subject: [PATCH 771/981] Rename endpoint resolver struct type - chimesdkmediapipelines. --- .../service_endpoint_resolver_gen.go | 10 +++++----- .../chimesdkmediapipelines/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/chimesdkmediapipelines/service_endpoint_resolver_gen.go b/internal/service/chimesdkmediapipelines/service_endpoint_resolver_gen.go index 49c1d745d3b..ff3d66a2a6d 100644 --- a/internal/service/chimesdkmediapipelines/service_endpoint_resolver_gen.go +++ b/internal/service/chimesdkmediapipelines/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ chimesdkmediapipelines.EndpointResolverV2 = resolverSDKv2{} +var _ chimesdkmediapipelines.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver chimesdkmediapipelines.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: chimesdkmediapipelines.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params chimesdkmediapipelines.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.ToBool(params.UseFIPS) diff --git a/internal/service/chimesdkmediapipelines/service_package_gen.go b/internal/service/chimesdkmediapipelines/service_package_gen.go index d70f8de8426..f3c0f28badc 100644 --- a/internal/service/chimesdkmediapipelines/service_package_gen.go +++ b/internal/service/chimesdkmediapipelines/service_package_gen.go @@ -48,7 +48,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return chimesdkmediapipelines.NewFromConfig(cfg, - chimesdkmediapipelines.WithEndpointResolverV2(newEndpointResolverSDKv2()), + chimesdkmediapipelines.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From b953163fa6c6e649770c33a1a3e0769dfc2da7ad Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:10 -0400 Subject: [PATCH 772/981] Rename endpoint resolver struct type - chimesdkvoice. --- .../chimesdkvoice/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/chimesdkvoice/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/chimesdkvoice/service_endpoint_resolver_gen.go b/internal/service/chimesdkvoice/service_endpoint_resolver_gen.go index d5397bf5497..bfa91a8bc12 100644 --- a/internal/service/chimesdkvoice/service_endpoint_resolver_gen.go +++ b/internal/service/chimesdkvoice/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ chimesdkvoice.EndpointResolverV2 = resolverSDKv2{} +var _ chimesdkvoice.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver chimesdkvoice.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: chimesdkvoice.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params chimesdkvoice.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.ToBool(params.UseFIPS) diff --git a/internal/service/chimesdkvoice/service_package_gen.go b/internal/service/chimesdkvoice/service_package_gen.go index c4dc3464a8f..390ffc4d76f 100644 --- a/internal/service/chimesdkvoice/service_package_gen.go +++ b/internal/service/chimesdkvoice/service_package_gen.go @@ -65,7 +65,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return chimesdkvoice.NewFromConfig(cfg, - chimesdkvoice.WithEndpointResolverV2(newEndpointResolverSDKv2()), + chimesdkvoice.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 0ab2036edc99640d5addf8fe4660bddabcc91881 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:10 -0400 Subject: [PATCH 773/981] Rename endpoint resolver struct type - cleanrooms. --- .../cleanrooms/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/cleanrooms/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/cleanrooms/service_endpoint_resolver_gen.go b/internal/service/cleanrooms/service_endpoint_resolver_gen.go index 4d4c7f495b1..4e95202f948 100644 --- a/internal/service/cleanrooms/service_endpoint_resolver_gen.go +++ b/internal/service/cleanrooms/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ cleanrooms.EndpointResolverV2 = resolverSDKv2{} +var _ cleanrooms.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver cleanrooms.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: cleanrooms.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params cleanrooms.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.ToBool(params.UseFIPS) diff --git a/internal/service/cleanrooms/service_package_gen.go b/internal/service/cleanrooms/service_package_gen.go index 6b7a32dab39..86d064391ef 100644 --- a/internal/service/cleanrooms/service_package_gen.go +++ b/internal/service/cleanrooms/service_package_gen.go @@ -54,7 +54,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return cleanrooms.NewFromConfig(cfg, - cleanrooms.WithEndpointResolverV2(newEndpointResolverSDKv2()), + cleanrooms.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 328135e2e3fbe80c6594b6b9e8ddfd9ec18800b8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:10 -0400 Subject: [PATCH 774/981] Rename endpoint resolver struct type - cloud9. --- .../service/cloud9/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/cloud9/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/cloud9/service_endpoint_resolver_gen.go b/internal/service/cloud9/service_endpoint_resolver_gen.go index 5f7a81abd26..cd6e259f288 100644 --- a/internal/service/cloud9/service_endpoint_resolver_gen.go +++ b/internal/service/cloud9/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ cloud9.EndpointResolverV2 = resolverSDKv2{} +var _ cloud9.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver cloud9.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: cloud9.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params cloud9.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.ToBool(params.UseFIPS) diff --git a/internal/service/cloud9/service_package_gen.go b/internal/service/cloud9/service_package_gen.go index 88b300eedbb..3c49e9c8a41 100644 --- a/internal/service/cloud9/service_package_gen.go +++ b/internal/service/cloud9/service_package_gen.go @@ -53,7 +53,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return cloud9.NewFromConfig(cfg, - cloud9.WithEndpointResolverV2(newEndpointResolverSDKv2()), + cloud9.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From a89c43967edea3376e9f09dc9bac615dca05c357 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:10 -0400 Subject: [PATCH 775/981] Rename endpoint resolver struct type - cloudcontrol. --- .../cloudcontrol/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/cloudcontrol/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/cloudcontrol/service_endpoint_resolver_gen.go b/internal/service/cloudcontrol/service_endpoint_resolver_gen.go index 5d6d7b147b3..d1bec3b0eac 100644 --- a/internal/service/cloudcontrol/service_endpoint_resolver_gen.go +++ b/internal/service/cloudcontrol/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ cloudcontrol.EndpointResolverV2 = resolverSDKv2{} +var _ cloudcontrol.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver cloudcontrol.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: cloudcontrol.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params cloudcontrol.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.ToBool(params.UseFIPS) diff --git a/internal/service/cloudcontrol/service_package_gen.go b/internal/service/cloudcontrol/service_package_gen.go index cf8d3f3caaa..fadcc38fe5c 100644 --- a/internal/service/cloudcontrol/service_package_gen.go +++ b/internal/service/cloudcontrol/service_package_gen.go @@ -51,7 +51,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return cloudcontrol.NewFromConfig(cfg, - cloudcontrol.WithEndpointResolverV2(newEndpointResolverSDKv2()), + cloudcontrol.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 850fd65a7bd35d4380e7f019db10b176e0eedd48 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:11 -0400 Subject: [PATCH 776/981] Rename endpoint resolver struct type - cloudformation. --- .../cloudformation/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/cloudformation/service_package.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/cloudformation/service_endpoint_resolver_gen.go b/internal/service/cloudformation/service_endpoint_resolver_gen.go index fcd7f338274..dc5167c44bb 100644 --- a/internal/service/cloudformation/service_endpoint_resolver_gen.go +++ b/internal/service/cloudformation/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ cloudformation.EndpointResolverV2 = resolverSDKv2{} +var _ cloudformation.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver cloudformation.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: cloudformation.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params cloudformation.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.ToBool(params.UseFIPS) 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 { From 886ee912ecb35d8b0d9e711568f6947ceb7da889 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:11 -0400 Subject: [PATCH 777/981] Rename endpoint resolver struct type - cloudfront. --- .../cloudfront/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/cloudfront/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/cloudfront/service_endpoint_resolver_gen.go b/internal/service/cloudfront/service_endpoint_resolver_gen.go index 56e3b0f0fcf..6aecb5c2857 100644 --- a/internal/service/cloudfront/service_endpoint_resolver_gen.go +++ b/internal/service/cloudfront/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ cloudfront.EndpointResolverV2 = resolverSDKv2{} +var _ cloudfront.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver cloudfront.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: cloudfront.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params cloudfront.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.ToBool(params.UseFIPS) diff --git a/internal/service/cloudfront/service_package_gen.go b/internal/service/cloudfront/service_package_gen.go index 5e66e7a3ca9..52b5f8c7f82 100644 --- a/internal/service/cloudfront/service_package_gen.go +++ b/internal/service/cloudfront/service_package_gen.go @@ -171,7 +171,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return cloudfront.NewFromConfig(cfg, - cloudfront.WithEndpointResolverV2(newEndpointResolverSDKv2()), + cloudfront.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 61d8eb58997f49865cc8a123aa02603142fd2e65 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:11 -0400 Subject: [PATCH 778/981] Rename endpoint resolver struct type - cloudfrontkeyvaluestore. --- .../service_endpoint_resolver_gen.go | 10 +++++----- .../cloudfrontkeyvaluestore/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/cloudfrontkeyvaluestore/service_endpoint_resolver_gen.go b/internal/service/cloudfrontkeyvaluestore/service_endpoint_resolver_gen.go index d49241b4fae..6081c3ff4f5 100644 --- a/internal/service/cloudfrontkeyvaluestore/service_endpoint_resolver_gen.go +++ b/internal/service/cloudfrontkeyvaluestore/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ cloudfrontkeyvaluestore.EndpointResolverV2 = resolverSDKv2{} +var _ cloudfrontkeyvaluestore.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver cloudfrontkeyvaluestore.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: cloudfrontkeyvaluestore.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params cloudfrontkeyvaluestore.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.ToBool(params.UseFIPS) diff --git a/internal/service/cloudfrontkeyvaluestore/service_package_gen.go b/internal/service/cloudfrontkeyvaluestore/service_package_gen.go index 53261c0ab3d..ae78942fa7a 100644 --- a/internal/service/cloudfrontkeyvaluestore/service_package_gen.go +++ b/internal/service/cloudfrontkeyvaluestore/service_package_gen.go @@ -44,7 +44,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return cloudfrontkeyvaluestore.NewFromConfig(cfg, - cloudfrontkeyvaluestore.WithEndpointResolverV2(newEndpointResolverSDKv2()), + cloudfrontkeyvaluestore.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 7fcf88c39df9d7de97d5bc60a0ebecee192468d3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:11 -0400 Subject: [PATCH 779/981] Rename endpoint resolver struct type - cloudhsmv2. --- .../cloudhsmv2/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/cloudhsmv2/service_package.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/cloudhsmv2/service_endpoint_resolver_gen.go b/internal/service/cloudhsmv2/service_endpoint_resolver_gen.go index bea2902ee82..9e96cdb3d5a 100644 --- a/internal/service/cloudhsmv2/service_endpoint_resolver_gen.go +++ b/internal/service/cloudhsmv2/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ cloudhsmv2.EndpointResolverV2 = resolverSDKv2{} +var _ cloudhsmv2.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver cloudhsmv2.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: cloudhsmv2.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params cloudhsmv2.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.ToBool(params.UseFIPS) 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 { From e5c5561133d57693bb04cb8ec55fba475815d5ba Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:11 -0400 Subject: [PATCH 780/981] Rename endpoint resolver struct type - cloudsearch. --- .../cloudsearch/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/cloudsearch/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/cloudsearch/service_endpoint_resolver_gen.go b/internal/service/cloudsearch/service_endpoint_resolver_gen.go index 0846290d77c..9b46d750eb0 100644 --- a/internal/service/cloudsearch/service_endpoint_resolver_gen.go +++ b/internal/service/cloudsearch/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ cloudsearch.EndpointResolverV2 = resolverSDKv2{} +var _ cloudsearch.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver cloudsearch.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: cloudsearch.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params cloudsearch.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.ToBool(params.UseFIPS) diff --git a/internal/service/cloudsearch/service_package_gen.go b/internal/service/cloudsearch/service_package_gen.go index 842edc1ddd4..f931957f0c8 100644 --- a/internal/service/cloudsearch/service_package_gen.go +++ b/internal/service/cloudsearch/service_package_gen.go @@ -50,7 +50,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return cloudsearch.NewFromConfig(cfg, - cloudsearch.WithEndpointResolverV2(newEndpointResolverSDKv2()), + cloudsearch.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From e0052b9dce3a710e26d45de14b9bcb52ba388c6c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:11 -0400 Subject: [PATCH 781/981] Rename endpoint resolver struct type - cloudtrail. --- .../cloudtrail/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/cloudtrail/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/cloudtrail/service_endpoint_resolver_gen.go b/internal/service/cloudtrail/service_endpoint_resolver_gen.go index 3d4b4b2cc13..9658d09eb2d 100644 --- a/internal/service/cloudtrail/service_endpoint_resolver_gen.go +++ b/internal/service/cloudtrail/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ cloudtrail.EndpointResolverV2 = resolverSDKv2{} +var _ cloudtrail.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver cloudtrail.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: cloudtrail.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params cloudtrail.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.ToBool(params.UseFIPS) diff --git a/internal/service/cloudtrail/service_package_gen.go b/internal/service/cloudtrail/service_package_gen.go index 3bd72c4566c..b8a0d8abbc4 100644 --- a/internal/service/cloudtrail/service_package_gen.go +++ b/internal/service/cloudtrail/service_package_gen.go @@ -67,7 +67,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return cloudtrail.NewFromConfig(cfg, - cloudtrail.WithEndpointResolverV2(newEndpointResolverSDKv2()), + cloudtrail.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 7db12d966f9609d3cdd472205ed121edca7c99e6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:11 -0400 Subject: [PATCH 782/981] Rename endpoint resolver struct type - cloudwatch. --- .../cloudwatch/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/cloudwatch/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/cloudwatch/service_endpoint_resolver_gen.go b/internal/service/cloudwatch/service_endpoint_resolver_gen.go index 931dedd77fe..2430cfac6f3 100644 --- a/internal/service/cloudwatch/service_endpoint_resolver_gen.go +++ b/internal/service/cloudwatch/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ cloudwatch.EndpointResolverV2 = resolverSDKv2{} +var _ cloudwatch.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver cloudwatch.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: cloudwatch.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params cloudwatch.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.ToBool(params.UseFIPS) diff --git a/internal/service/cloudwatch/service_package_gen.go b/internal/service/cloudwatch/service_package_gen.go index 288df904667..173bb0c0094 100644 --- a/internal/service/cloudwatch/service_package_gen.go +++ b/internal/service/cloudwatch/service_package_gen.go @@ -69,7 +69,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return cloudwatch.NewFromConfig(cfg, - cloudwatch.WithEndpointResolverV2(newEndpointResolverSDKv2()), + cloudwatch.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From d97a6647d325816e905dbe955394c52c0d07b8b8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:11 -0400 Subject: [PATCH 783/981] Rename endpoint resolver struct type - codeartifact. --- .../codeartifact/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/codeartifact/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/codeartifact/service_endpoint_resolver_gen.go b/internal/service/codeartifact/service_endpoint_resolver_gen.go index feebff5637d..0dbf8a6633e 100644 --- a/internal/service/codeartifact/service_endpoint_resolver_gen.go +++ b/internal/service/codeartifact/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ codeartifact.EndpointResolverV2 = resolverSDKv2{} +var _ codeartifact.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver codeartifact.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: codeartifact.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params codeartifact.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.ToBool(params.UseFIPS) diff --git a/internal/service/codeartifact/service_package_gen.go b/internal/service/codeartifact/service_package_gen.go index 69bde6c84ae..48848e0fc95 100644 --- a/internal/service/codeartifact/service_package_gen.go +++ b/internal/service/codeartifact/service_package_gen.go @@ -77,7 +77,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return codeartifact.NewFromConfig(cfg, - codeartifact.WithEndpointResolverV2(newEndpointResolverSDKv2()), + codeartifact.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From d45a2ccfafb5af2023ccd87e9cf14f164e688205 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:11 -0400 Subject: [PATCH 784/981] Rename endpoint resolver struct type - codebuild. --- .../service/codebuild/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/codebuild/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/codebuild/service_endpoint_resolver_gen.go b/internal/service/codebuild/service_endpoint_resolver_gen.go index 85ad2110635..6d53d631f81 100644 --- a/internal/service/codebuild/service_endpoint_resolver_gen.go +++ b/internal/service/codebuild/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ codebuild.EndpointResolverV2 = resolverSDKv2{} +var _ codebuild.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver codebuild.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: codebuild.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params codebuild.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.ToBool(params.UseFIPS) diff --git a/internal/service/codebuild/service_package_gen.go b/internal/service/codebuild/service_package_gen.go index e3bc77c8c63..1790cbf446e 100644 --- a/internal/service/codebuild/service_package_gen.go +++ b/internal/service/codebuild/service_package_gen.go @@ -81,7 +81,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return codebuild.NewFromConfig(cfg, - codebuild.WithEndpointResolverV2(newEndpointResolverSDKv2()), + codebuild.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From acd23cac4d1b461233cf68dabd15f051b66d1ecd Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:11 -0400 Subject: [PATCH 785/981] Rename endpoint resolver struct type - codecatalyst. --- .../codecatalyst/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/codecatalyst/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/codecatalyst/service_endpoint_resolver_gen.go b/internal/service/codecatalyst/service_endpoint_resolver_gen.go index d0937bb3e97..b872e775e92 100644 --- a/internal/service/codecatalyst/service_endpoint_resolver_gen.go +++ b/internal/service/codecatalyst/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ codecatalyst.EndpointResolverV2 = resolverSDKv2{} +var _ codecatalyst.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver codecatalyst.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: codecatalyst.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params codecatalyst.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.ToBool(params.UseFIPS) diff --git a/internal/service/codecatalyst/service_package_gen.go b/internal/service/codecatalyst/service_package_gen.go index dff591d56e8..ba9e30a0f22 100644 --- a/internal/service/codecatalyst/service_package_gen.go +++ b/internal/service/codecatalyst/service_package_gen.go @@ -61,7 +61,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return codecatalyst.NewFromConfig(cfg, - codecatalyst.WithEndpointResolverV2(newEndpointResolverSDKv2()), + codecatalyst.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 579aceeedaaeb7a93f919356469c2519b86ce354 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:11 -0400 Subject: [PATCH 786/981] Rename endpoint resolver struct type - codecommit. --- .../codecommit/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/codecommit/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/codecommit/service_endpoint_resolver_gen.go b/internal/service/codecommit/service_endpoint_resolver_gen.go index 06e923d1106..cebee387ec6 100644 --- a/internal/service/codecommit/service_endpoint_resolver_gen.go +++ b/internal/service/codecommit/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ codecommit.EndpointResolverV2 = resolverSDKv2{} +var _ codecommit.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver codecommit.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: codecommit.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params codecommit.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.ToBool(params.UseFIPS) diff --git a/internal/service/codecommit/service_package_gen.go b/internal/service/codecommit/service_package_gen.go index 200ed4ce1dc..3c4754bf18e 100644 --- a/internal/service/codecommit/service_package_gen.go +++ b/internal/service/codecommit/service_package_gen.go @@ -74,7 +74,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return codecommit.NewFromConfig(cfg, - codecommit.WithEndpointResolverV2(newEndpointResolverSDKv2()), + codecommit.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From cb5a4d858b1dd82fa8c7271d2b0035b294978209 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:11 -0400 Subject: [PATCH 787/981] Rename endpoint resolver struct type - codeconnections. --- .../codeconnections/service_endpoint_resolver_gen.go | 10 +++++----- .../service/codeconnections/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/codeconnections/service_endpoint_resolver_gen.go b/internal/service/codeconnections/service_endpoint_resolver_gen.go index 76bbb6a5360..9ee7a27a43a 100644 --- a/internal/service/codeconnections/service_endpoint_resolver_gen.go +++ b/internal/service/codeconnections/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ codeconnections.EndpointResolverV2 = resolverSDKv2{} +var _ codeconnections.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver codeconnections.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: codeconnections.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params codeconnections.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.ToBool(params.UseFIPS) diff --git a/internal/service/codeconnections/service_package_gen.go b/internal/service/codeconnections/service_package_gen.go index 9e87d2469e6..7cfb8922be4 100644 --- a/internal/service/codeconnections/service_package_gen.go +++ b/internal/service/codeconnections/service_package_gen.go @@ -39,7 +39,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return codeconnections.NewFromConfig(cfg, - codeconnections.WithEndpointResolverV2(newEndpointResolverSDKv2()), + codeconnections.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 7e73b021dd834d19b8beb38fde2b2586351806a4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:11 -0400 Subject: [PATCH 788/981] Rename endpoint resolver struct type - codeguruprofiler. --- .../codeguruprofiler/service_endpoint_resolver_gen.go | 10 +++++----- .../service/codeguruprofiler/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/codeguruprofiler/service_endpoint_resolver_gen.go b/internal/service/codeguruprofiler/service_endpoint_resolver_gen.go index 7b136c977f4..6f115a1df58 100644 --- a/internal/service/codeguruprofiler/service_endpoint_resolver_gen.go +++ b/internal/service/codeguruprofiler/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ codeguruprofiler.EndpointResolverV2 = resolverSDKv2{} +var _ codeguruprofiler.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver codeguruprofiler.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: codeguruprofiler.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params codeguruprofiler.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.ToBool(params.UseFIPS) diff --git a/internal/service/codeguruprofiler/service_package_gen.go b/internal/service/codeguruprofiler/service_package_gen.go index ea31a362312..6d4493fb63b 100644 --- a/internal/service/codeguruprofiler/service_package_gen.go +++ b/internal/service/codeguruprofiler/service_package_gen.go @@ -52,7 +52,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return codeguruprofiler.NewFromConfig(cfg, - codeguruprofiler.WithEndpointResolverV2(newEndpointResolverSDKv2()), + codeguruprofiler.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From d1f5b70693e9c3974b52298e0a4792134ab5a747 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:12 -0400 Subject: [PATCH 789/981] Rename endpoint resolver struct type - codegurureviewer. --- .../codegurureviewer/service_endpoint_resolver_gen.go | 10 +++++----- .../service/codegurureviewer/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/codegurureviewer/service_endpoint_resolver_gen.go b/internal/service/codegurureviewer/service_endpoint_resolver_gen.go index febf1299391..0d7e0ab38a2 100644 --- a/internal/service/codegurureviewer/service_endpoint_resolver_gen.go +++ b/internal/service/codegurureviewer/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ codegurureviewer.EndpointResolverV2 = resolverSDKv2{} +var _ codegurureviewer.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver codegurureviewer.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: codegurureviewer.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params codegurureviewer.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.ToBool(params.UseFIPS) diff --git a/internal/service/codegurureviewer/service_package_gen.go b/internal/service/codegurureviewer/service_package_gen.go index 696fc33c08f..ba93b2250be 100644 --- a/internal/service/codegurureviewer/service_package_gen.go +++ b/internal/service/codegurureviewer/service_package_gen.go @@ -48,7 +48,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return codegurureviewer.NewFromConfig(cfg, - codegurureviewer.WithEndpointResolverV2(newEndpointResolverSDKv2()), + codegurureviewer.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 5d9380892bc3bd3c749734129e1dd71821ee642a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:12 -0400 Subject: [PATCH 790/981] Rename endpoint resolver struct type - codepipeline. --- .../codepipeline/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/codepipeline/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/codepipeline/service_endpoint_resolver_gen.go b/internal/service/codepipeline/service_endpoint_resolver_gen.go index 58c404872f1..c0b3834345d 100644 --- a/internal/service/codepipeline/service_endpoint_resolver_gen.go +++ b/internal/service/codepipeline/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ codepipeline.EndpointResolverV2 = resolverSDKv2{} +var _ codepipeline.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver codepipeline.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: codepipeline.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params codepipeline.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.ToBool(params.UseFIPS) diff --git a/internal/service/codepipeline/service_package_gen.go b/internal/service/codepipeline/service_package_gen.go index df27edaec5e..d91a2fcb9ff 100644 --- a/internal/service/codepipeline/service_package_gen.go +++ b/internal/service/codepipeline/service_package_gen.go @@ -64,7 +64,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return codepipeline.NewFromConfig(cfg, - codepipeline.WithEndpointResolverV2(newEndpointResolverSDKv2()), + codepipeline.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 9f8b04af0732d33d6b27dcc3c2b69d6d12d6e0fd Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:12 -0400 Subject: [PATCH 791/981] Rename endpoint resolver struct type - codestarconnections. --- .../service_endpoint_resolver_gen.go | 10 +++++----- .../service/codestarconnections/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/codestarconnections/service_endpoint_resolver_gen.go b/internal/service/codestarconnections/service_endpoint_resolver_gen.go index 6d03c0510c1..0309b4aabb7 100644 --- a/internal/service/codestarconnections/service_endpoint_resolver_gen.go +++ b/internal/service/codestarconnections/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ codestarconnections.EndpointResolverV2 = resolverSDKv2{} +var _ codestarconnections.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver codestarconnections.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: codestarconnections.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params codestarconnections.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.ToBool(params.UseFIPS) diff --git a/internal/service/codestarconnections/service_package_gen.go b/internal/service/codestarconnections/service_package_gen.go index 81331d83f7a..3a34df3d751 100644 --- a/internal/service/codestarconnections/service_package_gen.go +++ b/internal/service/codestarconnections/service_package_gen.go @@ -58,7 +58,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return codestarconnections.NewFromConfig(cfg, - codestarconnections.WithEndpointResolverV2(newEndpointResolverSDKv2()), + codestarconnections.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From dd5254b59c7cc0e89da1d2eee547573872ff3fbf Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:12 -0400 Subject: [PATCH 792/981] Rename endpoint resolver struct type - codestarnotifications. --- .../service_endpoint_resolver_gen.go | 10 +++++----- .../codestarnotifications/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/codestarnotifications/service_endpoint_resolver_gen.go b/internal/service/codestarnotifications/service_endpoint_resolver_gen.go index 45b0d54f8ba..61b664d9643 100644 --- a/internal/service/codestarnotifications/service_endpoint_resolver_gen.go +++ b/internal/service/codestarnotifications/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ codestarnotifications.EndpointResolverV2 = resolverSDKv2{} +var _ codestarnotifications.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver codestarnotifications.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: codestarnotifications.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params codestarnotifications.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.ToBool(params.UseFIPS) diff --git a/internal/service/codestarnotifications/service_package_gen.go b/internal/service/codestarnotifications/service_package_gen.go index 02460a6a085..ed806b6e031 100644 --- a/internal/service/codestarnotifications/service_package_gen.go +++ b/internal/service/codestarnotifications/service_package_gen.go @@ -48,7 +48,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return codestarnotifications.NewFromConfig(cfg, - codestarnotifications.WithEndpointResolverV2(newEndpointResolverSDKv2()), + codestarnotifications.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 2110952e03f35039f002c6ef39716cb2c6cb740e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:12 -0400 Subject: [PATCH 793/981] Rename endpoint resolver struct type - cognitoidentity. --- .../cognitoidentity/service_endpoint_resolver_gen.go | 10 +++++----- .../service/cognitoidentity/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/cognitoidentity/service_endpoint_resolver_gen.go b/internal/service/cognitoidentity/service_endpoint_resolver_gen.go index f2056304233..c14463b14c5 100644 --- a/internal/service/cognitoidentity/service_endpoint_resolver_gen.go +++ b/internal/service/cognitoidentity/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ cognitoidentity.EndpointResolverV2 = resolverSDKv2{} +var _ cognitoidentity.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver cognitoidentity.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: cognitoidentity.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params cognitoidentity.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.ToBool(params.UseFIPS) diff --git a/internal/service/cognitoidentity/service_package_gen.go b/internal/service/cognitoidentity/service_package_gen.go index 7a2602b8e6b..48c7e372e0a 100644 --- a/internal/service/cognitoidentity/service_package_gen.go +++ b/internal/service/cognitoidentity/service_package_gen.go @@ -67,7 +67,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return cognitoidentity.NewFromConfig(cfg, - cognitoidentity.WithEndpointResolverV2(newEndpointResolverSDKv2()), + cognitoidentity.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 2bff92acc2ac4108abd57135acd9bc2f5cf743cf Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:12 -0400 Subject: [PATCH 794/981] Rename endpoint resolver struct type - cognitoidp. --- .../cognitoidp/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/cognitoidp/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/cognitoidp/service_endpoint_resolver_gen.go b/internal/service/cognitoidp/service_endpoint_resolver_gen.go index 66e0b0d0070..703a68b75e7 100644 --- a/internal/service/cognitoidp/service_endpoint_resolver_gen.go +++ b/internal/service/cognitoidp/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ cognitoidentityprovider.EndpointResolverV2 = resolverSDKv2{} +var _ cognitoidentityprovider.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver cognitoidentityprovider.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: cognitoidentityprovider.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params cognitoidentityprovider.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.ToBool(params.UseFIPS) diff --git a/internal/service/cognitoidp/service_package_gen.go b/internal/service/cognitoidp/service_package_gen.go index 49958975ce6..e3b426218a6 100644 --- a/internal/service/cognitoidp/service_package_gen.go +++ b/internal/service/cognitoidp/service_package_gen.go @@ -131,7 +131,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return cognitoidentityprovider.NewFromConfig(cfg, - cognitoidentityprovider.WithEndpointResolverV2(newEndpointResolverSDKv2()), + cognitoidentityprovider.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From c0375b47353224b915b5c2f2d7da10b0524f1710 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:12 -0400 Subject: [PATCH 795/981] Rename endpoint resolver struct type - comprehend. --- .../comprehend/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/comprehend/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/comprehend/service_endpoint_resolver_gen.go b/internal/service/comprehend/service_endpoint_resolver_gen.go index 4909aba48f3..b0affcf9206 100644 --- a/internal/service/comprehend/service_endpoint_resolver_gen.go +++ b/internal/service/comprehend/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ comprehend.EndpointResolverV2 = resolverSDKv2{} +var _ comprehend.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver comprehend.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: comprehend.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params comprehend.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.ToBool(params.UseFIPS) diff --git a/internal/service/comprehend/service_package_gen.go b/internal/service/comprehend/service_package_gen.go index a37cd837a05..dbb9a801246 100644 --- a/internal/service/comprehend/service_package_gen.go +++ b/internal/service/comprehend/service_package_gen.go @@ -56,7 +56,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return comprehend.NewFromConfig(cfg, - comprehend.WithEndpointResolverV2(newEndpointResolverSDKv2()), + comprehend.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 8ebd3c196c01bd2c1af633fc49f01ff5dbb0d2b1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:12 -0400 Subject: [PATCH 796/981] Rename endpoint resolver struct type - computeoptimizer. --- .../computeoptimizer/service_endpoint_resolver_gen.go | 10 +++++----- .../service/computeoptimizer/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/computeoptimizer/service_endpoint_resolver_gen.go b/internal/service/computeoptimizer/service_endpoint_resolver_gen.go index afcd91ac443..973c7333a38 100644 --- a/internal/service/computeoptimizer/service_endpoint_resolver_gen.go +++ b/internal/service/computeoptimizer/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ computeoptimizer.EndpointResolverV2 = resolverSDKv2{} +var _ computeoptimizer.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver computeoptimizer.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: computeoptimizer.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params computeoptimizer.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.ToBool(params.UseFIPS) diff --git a/internal/service/computeoptimizer/service_package_gen.go b/internal/service/computeoptimizer/service_package_gen.go index e855d508ea5..594947f7085 100644 --- a/internal/service/computeoptimizer/service_package_gen.go +++ b/internal/service/computeoptimizer/service_package_gen.go @@ -48,7 +48,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return computeoptimizer.NewFromConfig(cfg, - computeoptimizer.WithEndpointResolverV2(newEndpointResolverSDKv2()), + computeoptimizer.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 63752f2d7023d41b36d36c5bc072eeee1d694ca6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:12 -0400 Subject: [PATCH 797/981] Rename endpoint resolver struct type - configservice. --- .../configservice/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/configservice/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/configservice/service_endpoint_resolver_gen.go b/internal/service/configservice/service_endpoint_resolver_gen.go index 1e2cc229a5e..e01df606078 100644 --- a/internal/service/configservice/service_endpoint_resolver_gen.go +++ b/internal/service/configservice/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ configservice.EndpointResolverV2 = resolverSDKv2{} +var _ configservice.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver configservice.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: configservice.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params configservice.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.ToBool(params.UseFIPS) diff --git a/internal/service/configservice/service_package_gen.go b/internal/service/configservice/service_package_gen.go index fd3647756bb..e132f46aeaa 100644 --- a/internal/service/configservice/service_package_gen.go +++ b/internal/service/configservice/service_package_gen.go @@ -114,7 +114,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return configservice.NewFromConfig(cfg, - configservice.WithEndpointResolverV2(newEndpointResolverSDKv2()), + configservice.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From aeeb6f7c5aa8e237c138d69ca4b32333bde49a86 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:12 -0400 Subject: [PATCH 798/981] Rename endpoint resolver struct type - connect. --- .../service/connect/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/connect/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/connect/service_endpoint_resolver_gen.go b/internal/service/connect/service_endpoint_resolver_gen.go index 2b3b2d262e7..b4680b90f28 100644 --- a/internal/service/connect/service_endpoint_resolver_gen.go +++ b/internal/service/connect/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ connect.EndpointResolverV2 = resolverSDKv2{} +var _ connect.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver connect.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: connect.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params connect.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.ToBool(params.UseFIPS) diff --git a/internal/service/connect/service_package_gen.go b/internal/service/connect/service_package_gen.go index 13da0c16e13..edfd18e3280 100644 --- a/internal/service/connect/service_package_gen.go +++ b/internal/service/connect/service_package_gen.go @@ -247,7 +247,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return connect.NewFromConfig(cfg, - connect.WithEndpointResolverV2(newEndpointResolverSDKv2()), + connect.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From d5aaa4bfcf3ef37bb572f564a9eef1730d8a5be6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:12 -0400 Subject: [PATCH 799/981] Rename endpoint resolver struct type - connectcases. --- .../connectcases/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/connectcases/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/connectcases/service_endpoint_resolver_gen.go b/internal/service/connectcases/service_endpoint_resolver_gen.go index 37edf60ad15..8cfc2cd3ab0 100644 --- a/internal/service/connectcases/service_endpoint_resolver_gen.go +++ b/internal/service/connectcases/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ connectcases.EndpointResolverV2 = resolverSDKv2{} +var _ connectcases.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver connectcases.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: connectcases.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params connectcases.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.ToBool(params.UseFIPS) diff --git a/internal/service/connectcases/service_package_gen.go b/internal/service/connectcases/service_package_gen.go index 85feaec5ad5..d82959710b8 100644 --- a/internal/service/connectcases/service_package_gen.go +++ b/internal/service/connectcases/service_package_gen.go @@ -39,7 +39,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return connectcases.NewFromConfig(cfg, - connectcases.WithEndpointResolverV2(newEndpointResolverSDKv2()), + connectcases.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 8f23e13b0bc1034079acdfa39be4a0da05b55046 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:12 -0400 Subject: [PATCH 800/981] Rename endpoint resolver struct type - controltower. --- .../controltower/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/controltower/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/controltower/service_endpoint_resolver_gen.go b/internal/service/controltower/service_endpoint_resolver_gen.go index be971871437..f5c63b95e4a 100644 --- a/internal/service/controltower/service_endpoint_resolver_gen.go +++ b/internal/service/controltower/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ controltower.EndpointResolverV2 = resolverSDKv2{} +var _ controltower.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver controltower.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: controltower.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params controltower.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.ToBool(params.UseFIPS) diff --git a/internal/service/controltower/service_package_gen.go b/internal/service/controltower/service_package_gen.go index b6d88d0a1d0..1331ac1587e 100644 --- a/internal/service/controltower/service_package_gen.go +++ b/internal/service/controltower/service_package_gen.go @@ -59,7 +59,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return controltower.NewFromConfig(cfg, - controltower.WithEndpointResolverV2(newEndpointResolverSDKv2()), + controltower.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 05ff399625bebfe35150c6bf77d650eb092b5544 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:13 -0400 Subject: [PATCH 801/981] Rename endpoint resolver struct type - costoptimizationhub. --- .../service_endpoint_resolver_gen.go | 10 +++++----- .../service/costoptimizationhub/service_package.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/costoptimizationhub/service_endpoint_resolver_gen.go b/internal/service/costoptimizationhub/service_endpoint_resolver_gen.go index 84cfea9c01c..3a9ff94db75 100644 --- a/internal/service/costoptimizationhub/service_endpoint_resolver_gen.go +++ b/internal/service/costoptimizationhub/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ costoptimizationhub.EndpointResolverV2 = resolverSDKv2{} +var _ costoptimizationhub.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver costoptimizationhub.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: costoptimizationhub.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params costoptimizationhub.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.ToBool(params.UseFIPS) 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 { From 9a55626dcf2f95dbc90c9009f4daf40adb985b17 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:13 -0400 Subject: [PATCH 802/981] Rename endpoint resolver struct type - cur. --- internal/service/cur/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/cur/service_package.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/cur/service_endpoint_resolver_gen.go b/internal/service/cur/service_endpoint_resolver_gen.go index 33687f28859..c61e30369f0 100644 --- a/internal/service/cur/service_endpoint_resolver_gen.go +++ b/internal/service/cur/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ costandusagereportservice.EndpointResolverV2 = resolverSDKv2{} +var _ costandusagereportservice.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver costandusagereportservice.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: costandusagereportservice.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params costandusagereportservice.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.ToBool(params.UseFIPS) 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 { From 86b3943bbff2661dd944fff930c2f25db00a9ff5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:13 -0400 Subject: [PATCH 803/981] Rename endpoint resolver struct type - customerprofiles. --- .../customerprofiles/service_endpoint_resolver_gen.go | 10 +++++----- .../service/customerprofiles/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/customerprofiles/service_endpoint_resolver_gen.go b/internal/service/customerprofiles/service_endpoint_resolver_gen.go index f379ad95f8d..e07d29c3a98 100644 --- a/internal/service/customerprofiles/service_endpoint_resolver_gen.go +++ b/internal/service/customerprofiles/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ customerprofiles.EndpointResolverV2 = resolverSDKv2{} +var _ customerprofiles.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver customerprofiles.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: customerprofiles.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params customerprofiles.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.ToBool(params.UseFIPS) diff --git a/internal/service/customerprofiles/service_package_gen.go b/internal/service/customerprofiles/service_package_gen.go index 50638c071ca..b9c0233a5fa 100644 --- a/internal/service/customerprofiles/service_package_gen.go +++ b/internal/service/customerprofiles/service_package_gen.go @@ -51,7 +51,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return customerprofiles.NewFromConfig(cfg, - customerprofiles.WithEndpointResolverV2(newEndpointResolverSDKv2()), + customerprofiles.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 02dd95ace42cc1c03ce8fd99d8186bf2f76eab60 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:13 -0400 Subject: [PATCH 804/981] Rename endpoint resolver struct type - databrew. --- .../service/databrew/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/databrew/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/databrew/service_endpoint_resolver_gen.go b/internal/service/databrew/service_endpoint_resolver_gen.go index 193b9889fd6..1a5af3d567d 100644 --- a/internal/service/databrew/service_endpoint_resolver_gen.go +++ b/internal/service/databrew/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ databrew.EndpointResolverV2 = resolverSDKv2{} +var _ databrew.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver databrew.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: databrew.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params databrew.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.ToBool(params.UseFIPS) diff --git a/internal/service/databrew/service_package_gen.go b/internal/service/databrew/service_package_gen.go index aa44573cd24..8b5b8d5d162 100644 --- a/internal/service/databrew/service_package_gen.go +++ b/internal/service/databrew/service_package_gen.go @@ -39,7 +39,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return databrew.NewFromConfig(cfg, - databrew.WithEndpointResolverV2(newEndpointResolverSDKv2()), + databrew.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From fbfc3efd9a0887583ea532444547944086cdce0c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:13 -0400 Subject: [PATCH 805/981] Rename endpoint resolver struct type - dataexchange. --- .../dataexchange/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/dataexchange/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/dataexchange/service_endpoint_resolver_gen.go b/internal/service/dataexchange/service_endpoint_resolver_gen.go index 378c59eab07..0ebda75769a 100644 --- a/internal/service/dataexchange/service_endpoint_resolver_gen.go +++ b/internal/service/dataexchange/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ dataexchange.EndpointResolverV2 = resolverSDKv2{} +var _ dataexchange.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver dataexchange.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: dataexchange.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params dataexchange.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.ToBool(params.UseFIPS) diff --git a/internal/service/dataexchange/service_package_gen.go b/internal/service/dataexchange/service_package_gen.go index 61cd2f3c6e8..5c9a126bdb5 100644 --- a/internal/service/dataexchange/service_package_gen.go +++ b/internal/service/dataexchange/service_package_gen.go @@ -56,7 +56,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return dataexchange.NewFromConfig(cfg, - dataexchange.WithEndpointResolverV2(newEndpointResolverSDKv2()), + dataexchange.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 4f0bc25d404813edbe6d3bcbb1f0233c89f68505 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:13 -0400 Subject: [PATCH 806/981] Rename endpoint resolver struct type - datapipeline. --- .../datapipeline/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/datapipeline/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/datapipeline/service_endpoint_resolver_gen.go b/internal/service/datapipeline/service_endpoint_resolver_gen.go index 6def99ec3a6..9ce33bd4e96 100644 --- a/internal/service/datapipeline/service_endpoint_resolver_gen.go +++ b/internal/service/datapipeline/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ datapipeline.EndpointResolverV2 = resolverSDKv2{} +var _ datapipeline.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver datapipeline.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: datapipeline.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params datapipeline.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.ToBool(params.UseFIPS) diff --git a/internal/service/datapipeline/service_package_gen.go b/internal/service/datapipeline/service_package_gen.go index f776771b0ce..e98566e74d8 100644 --- a/internal/service/datapipeline/service_package_gen.go +++ b/internal/service/datapipeline/service_package_gen.go @@ -63,7 +63,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return datapipeline.NewFromConfig(cfg, - datapipeline.WithEndpointResolverV2(newEndpointResolverSDKv2()), + datapipeline.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 2ce5dbdd9fa0a10b942e78a8c86ef7b2815f1bbe Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:13 -0400 Subject: [PATCH 807/981] Rename endpoint resolver struct type - datasync. --- .../service/datasync/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/datasync/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/datasync/service_endpoint_resolver_gen.go b/internal/service/datasync/service_endpoint_resolver_gen.go index 4638fae23e0..307d27b963c 100644 --- a/internal/service/datasync/service_endpoint_resolver_gen.go +++ b/internal/service/datasync/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ datasync.EndpointResolverV2 = resolverSDKv2{} +var _ datasync.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver datasync.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: datasync.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params datasync.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.ToBool(params.UseFIPS) diff --git a/internal/service/datasync/service_package_gen.go b/internal/service/datasync/service_package_gen.go index 20a1b96c713..8fdd2bd5882 100644 --- a/internal/service/datasync/service_package_gen.go +++ b/internal/service/datasync/service_package_gen.go @@ -144,7 +144,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return datasync.NewFromConfig(cfg, - datasync.WithEndpointResolverV2(newEndpointResolverSDKv2()), + datasync.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 3969cafbb23d2ae6f2ae3217399274cdd39548b4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:13 -0400 Subject: [PATCH 808/981] Rename endpoint resolver struct type - datazone. --- .../service/datazone/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/datazone/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/datazone/service_endpoint_resolver_gen.go b/internal/service/datazone/service_endpoint_resolver_gen.go index 4fda7d8e886..31347a04968 100644 --- a/internal/service/datazone/service_endpoint_resolver_gen.go +++ b/internal/service/datazone/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ datazone.EndpointResolverV2 = resolverSDKv2{} +var _ datazone.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver datazone.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: datazone.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params datazone.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.ToBool(params.UseFIPS) diff --git a/internal/service/datazone/service_package_gen.go b/internal/service/datazone/service_package_gen.go index 502a28374f1..f9b98ad43f8 100644 --- a/internal/service/datazone/service_package_gen.go +++ b/internal/service/datazone/service_package_gen.go @@ -88,7 +88,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return datazone.NewFromConfig(cfg, - datazone.WithEndpointResolverV2(newEndpointResolverSDKv2()), + datazone.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 5d56c4a31fed548784d6e6516aa2fe71e2895fd0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:13 -0400 Subject: [PATCH 809/981] Rename endpoint resolver struct type - dax. --- internal/service/dax/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/dax/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/dax/service_endpoint_resolver_gen.go b/internal/service/dax/service_endpoint_resolver_gen.go index de0bb5208cb..9f70e0fc675 100644 --- a/internal/service/dax/service_endpoint_resolver_gen.go +++ b/internal/service/dax/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ dax.EndpointResolverV2 = resolverSDKv2{} +var _ dax.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver dax.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: dax.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params dax.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.ToBool(params.UseFIPS) diff --git a/internal/service/dax/service_package_gen.go b/internal/service/dax/service_package_gen.go index a7e15897b2f..f6bbf10c1c2 100644 --- a/internal/service/dax/service_package_gen.go +++ b/internal/service/dax/service_package_gen.go @@ -56,7 +56,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return dax.NewFromConfig(cfg, - dax.WithEndpointResolverV2(newEndpointResolverSDKv2()), + dax.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 480929bd5a3dba80999280f276fdba9ab869fb8f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:13 -0400 Subject: [PATCH 810/981] Rename endpoint resolver struct type - deploy. --- .../service/deploy/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/deploy/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/deploy/service_endpoint_resolver_gen.go b/internal/service/deploy/service_endpoint_resolver_gen.go index fbb9c0ba4ea..3561dea007c 100644 --- a/internal/service/deploy/service_endpoint_resolver_gen.go +++ b/internal/service/deploy/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ codedeploy.EndpointResolverV2 = resolverSDKv2{} +var _ codedeploy.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver codedeploy.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: codedeploy.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params codedeploy.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.ToBool(params.UseFIPS) diff --git a/internal/service/deploy/service_package_gen.go b/internal/service/deploy/service_package_gen.go index e45deadb4f5..f41d7892470 100644 --- a/internal/service/deploy/service_package_gen.go +++ b/internal/service/deploy/service_package_gen.go @@ -61,7 +61,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return codedeploy.NewFromConfig(cfg, - codedeploy.WithEndpointResolverV2(newEndpointResolverSDKv2()), + codedeploy.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 222da047f3c89cbb2fe0201d254079518c6bbda5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:13 -0400 Subject: [PATCH 811/981] Rename endpoint resolver struct type - detective. --- .../service/detective/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/detective/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/detective/service_endpoint_resolver_gen.go b/internal/service/detective/service_endpoint_resolver_gen.go index 9e509ba8347..5bf3fbefadd 100644 --- a/internal/service/detective/service_endpoint_resolver_gen.go +++ b/internal/service/detective/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ detective.EndpointResolverV2 = resolverSDKv2{} +var _ detective.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver detective.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: detective.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params detective.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.ToBool(params.UseFIPS) diff --git a/internal/service/detective/service_package_gen.go b/internal/service/detective/service_package_gen.go index 72af4eae10d..a6d35f31b1f 100644 --- a/internal/service/detective/service_package_gen.go +++ b/internal/service/detective/service_package_gen.go @@ -64,7 +64,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return detective.NewFromConfig(cfg, - detective.WithEndpointResolverV2(newEndpointResolverSDKv2()), + detective.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 6460d2a9c0e068d8af5126bbc9a35b95aa720398 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:13 -0400 Subject: [PATCH 812/981] Rename endpoint resolver struct type - devicefarm. --- .../devicefarm/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/devicefarm/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/devicefarm/service_endpoint_resolver_gen.go b/internal/service/devicefarm/service_endpoint_resolver_gen.go index 2c11d1cf10e..093e86cec0f 100644 --- a/internal/service/devicefarm/service_endpoint_resolver_gen.go +++ b/internal/service/devicefarm/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ devicefarm.EndpointResolverV2 = resolverSDKv2{} +var _ devicefarm.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver devicefarm.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: devicefarm.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params devicefarm.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.ToBool(params.UseFIPS) diff --git a/internal/service/devicefarm/service_package_gen.go b/internal/service/devicefarm/service_package_gen.go index 5b3aec3daf5..2e2fad363c5 100644 --- a/internal/service/devicefarm/service_package_gen.go +++ b/internal/service/devicefarm/service_package_gen.go @@ -85,7 +85,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return devicefarm.NewFromConfig(cfg, - devicefarm.WithEndpointResolverV2(newEndpointResolverSDKv2()), + devicefarm.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 53df83de21c669ba2e529e5a7bd2d9cceef223ba Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:13 -0400 Subject: [PATCH 813/981] Rename endpoint resolver struct type - devopsguru. --- .../devopsguru/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/devopsguru/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/devopsguru/service_endpoint_resolver_gen.go b/internal/service/devopsguru/service_endpoint_resolver_gen.go index 2b4adaadf58..2e3c105cb46 100644 --- a/internal/service/devopsguru/service_endpoint_resolver_gen.go +++ b/internal/service/devopsguru/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ devopsguru.EndpointResolverV2 = resolverSDKv2{} +var _ devopsguru.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver devopsguru.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: devopsguru.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params devopsguru.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.ToBool(params.UseFIPS) diff --git a/internal/service/devopsguru/service_package_gen.go b/internal/service/devopsguru/service_package_gen.go index 524455f9217..ff41666f99f 100644 --- a/internal/service/devopsguru/service_package_gen.go +++ b/internal/service/devopsguru/service_package_gen.go @@ -65,7 +65,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return devopsguru.NewFromConfig(cfg, - devopsguru.WithEndpointResolverV2(newEndpointResolverSDKv2()), + devopsguru.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From fe0fbb850b39eb66b12f3688b72301ee148fa59c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:14 -0400 Subject: [PATCH 814/981] Rename endpoint resolver struct type - directconnect. --- .../directconnect/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/directconnect/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/directconnect/service_endpoint_resolver_gen.go b/internal/service/directconnect/service_endpoint_resolver_gen.go index d79805cce88..01356443ed8 100644 --- a/internal/service/directconnect/service_endpoint_resolver_gen.go +++ b/internal/service/directconnect/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ directconnect.EndpointResolverV2 = resolverSDKv2{} +var _ directconnect.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver directconnect.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: directconnect.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params directconnect.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.ToBool(params.UseFIPS) diff --git a/internal/service/directconnect/service_package_gen.go b/internal/service/directconnect/service_package_gen.go index b2019aad4a0..f32c41cbfbd 100644 --- a/internal/service/directconnect/service_package_gen.go +++ b/internal/service/directconnect/service_package_gen.go @@ -185,7 +185,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return directconnect.NewFromConfig(cfg, - directconnect.WithEndpointResolverV2(newEndpointResolverSDKv2()), + directconnect.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From dac2c0b191357e7881b796a79ab1d6bd9a4cc7e2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:14 -0400 Subject: [PATCH 815/981] Rename endpoint resolver struct type - dlm. --- internal/service/dlm/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/dlm/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/dlm/service_endpoint_resolver_gen.go b/internal/service/dlm/service_endpoint_resolver_gen.go index 3e9159420d9..750643613da 100644 --- a/internal/service/dlm/service_endpoint_resolver_gen.go +++ b/internal/service/dlm/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ dlm.EndpointResolverV2 = resolverSDKv2{} +var _ dlm.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver dlm.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: dlm.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params dlm.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.ToBool(params.UseFIPS) diff --git a/internal/service/dlm/service_package_gen.go b/internal/service/dlm/service_package_gen.go index 42373c6fded..7135240dca6 100644 --- a/internal/service/dlm/service_package_gen.go +++ b/internal/service/dlm/service_package_gen.go @@ -48,7 +48,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return dlm.NewFromConfig(cfg, - dlm.WithEndpointResolverV2(newEndpointResolverSDKv2()), + dlm.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From e5aa3f155b8e266b7e98c65da0960283f8167af3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:14 -0400 Subject: [PATCH 816/981] Rename endpoint resolver struct type - dms. --- internal/service/dms/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/dms/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/dms/service_endpoint_resolver_gen.go b/internal/service/dms/service_endpoint_resolver_gen.go index a9219a717bf..1a3d3746126 100644 --- a/internal/service/dms/service_endpoint_resolver_gen.go +++ b/internal/service/dms/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ databasemigrationservice.EndpointResolverV2 = resolverSDKv2{} +var _ databasemigrationservice.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver databasemigrationservice.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: databasemigrationservice.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params databasemigrationservice.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.ToBool(params.UseFIPS) diff --git a/internal/service/dms/service_package_gen.go b/internal/service/dms/service_package_gen.go index 160dcf081be..afb9e2ede5f 100644 --- a/internal/service/dms/service_package_gen.go +++ b/internal/service/dms/service_package_gen.go @@ -145,7 +145,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return databasemigrationservice.NewFromConfig(cfg, - databasemigrationservice.WithEndpointResolverV2(newEndpointResolverSDKv2()), + databasemigrationservice.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 2e8d34422b893f837a2413e41052523b29a2fc69 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:14 -0400 Subject: [PATCH 817/981] Rename endpoint resolver struct type - docdb. --- .../service/docdb/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/docdb/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/docdb/service_endpoint_resolver_gen.go b/internal/service/docdb/service_endpoint_resolver_gen.go index 9f1b60ca13f..e8255189f57 100644 --- a/internal/service/docdb/service_endpoint_resolver_gen.go +++ b/internal/service/docdb/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ docdb.EndpointResolverV2 = resolverSDKv2{} +var _ docdb.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver docdb.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: docdb.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params docdb.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.ToBool(params.UseFIPS) diff --git a/internal/service/docdb/service_package_gen.go b/internal/service/docdb/service_package_gen.go index 98300a14913..e28f93978b3 100644 --- a/internal/service/docdb/service_package_gen.go +++ b/internal/service/docdb/service_package_gen.go @@ -97,7 +97,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return docdb.NewFromConfig(cfg, - docdb.WithEndpointResolverV2(newEndpointResolverSDKv2()), + docdb.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 1d09b21957704e098c60074d98a5308540d79dad Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:14 -0400 Subject: [PATCH 818/981] Rename endpoint resolver struct type - docdbelastic. --- .../docdbelastic/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/docdbelastic/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/docdbelastic/service_endpoint_resolver_gen.go b/internal/service/docdbelastic/service_endpoint_resolver_gen.go index 614557442bc..38a7dfa18d4 100644 --- a/internal/service/docdbelastic/service_endpoint_resolver_gen.go +++ b/internal/service/docdbelastic/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ docdbelastic.EndpointResolverV2 = resolverSDKv2{} +var _ docdbelastic.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver docdbelastic.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: docdbelastic.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params docdbelastic.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.ToBool(params.UseFIPS) diff --git a/internal/service/docdbelastic/service_package_gen.go b/internal/service/docdbelastic/service_package_gen.go index c31fd559d15..864f4157222 100644 --- a/internal/service/docdbelastic/service_package_gen.go +++ b/internal/service/docdbelastic/service_package_gen.go @@ -47,7 +47,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return docdbelastic.NewFromConfig(cfg, - docdbelastic.WithEndpointResolverV2(newEndpointResolverSDKv2()), + docdbelastic.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From da14e21158cdf7f31679d8140efd9e4821134fab Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:14 -0400 Subject: [PATCH 819/981] Rename endpoint resolver struct type - drs. --- internal/service/drs/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/drs/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/drs/service_endpoint_resolver_gen.go b/internal/service/drs/service_endpoint_resolver_gen.go index e2cabcd4ccd..894ecaf255e 100644 --- a/internal/service/drs/service_endpoint_resolver_gen.go +++ b/internal/service/drs/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ drs.EndpointResolverV2 = resolverSDKv2{} +var _ drs.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver drs.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: drs.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params drs.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.ToBool(params.UseFIPS) diff --git a/internal/service/drs/service_package_gen.go b/internal/service/drs/service_package_gen.go index 09e3d69cf93..f8a5561b03e 100644 --- a/internal/service/drs/service_package_gen.go +++ b/internal/service/drs/service_package_gen.go @@ -47,7 +47,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return drs.NewFromConfig(cfg, - drs.WithEndpointResolverV2(newEndpointResolverSDKv2()), + drs.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 1c7a8ebac184f73da81866fd9140a7dc317d01c3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:14 -0400 Subject: [PATCH 820/981] Rename endpoint resolver struct type - ds. --- internal/service/ds/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/ds/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/ds/service_endpoint_resolver_gen.go b/internal/service/ds/service_endpoint_resolver_gen.go index 1e05968df74..0c2d51f5a96 100644 --- a/internal/service/ds/service_endpoint_resolver_gen.go +++ b/internal/service/ds/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ directoryservice.EndpointResolverV2 = resolverSDKv2{} +var _ directoryservice.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver directoryservice.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: directoryservice.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params directoryservice.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.ToBool(params.UseFIPS) diff --git a/internal/service/ds/service_package_gen.go b/internal/service/ds/service_package_gen.go index 76efb6bd815..b139c7270f6 100644 --- a/internal/service/ds/service_package_gen.go +++ b/internal/service/ds/service_package_gen.go @@ -90,7 +90,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return directoryservice.NewFromConfig(cfg, - directoryservice.WithEndpointResolverV2(newEndpointResolverSDKv2()), + directoryservice.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From a1a31462f2487632afe30135924bc9f47dc41b45 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:14 -0400 Subject: [PATCH 821/981] Rename endpoint resolver struct type - dynamodb. --- .../service/dynamodb/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/dynamodb/service_package.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/dynamodb/service_endpoint_resolver_gen.go b/internal/service/dynamodb/service_endpoint_resolver_gen.go index 0ff204b8dfe..191011ed05b 100644 --- a/internal/service/dynamodb/service_endpoint_resolver_gen.go +++ b/internal/service/dynamodb/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ dynamodb.EndpointResolverV2 = resolverSDKv2{} +var _ dynamodb.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver dynamodb.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: dynamodb.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params dynamodb.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.ToBool(params.UseFIPS) 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 { From c69a9f0374b81d24ed38e8cfd52bdbb000c399ea Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:14 -0400 Subject: [PATCH 822/981] Rename endpoint resolver struct type - ec2. --- internal/service/ec2/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/ec2/service_package.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/ec2/service_endpoint_resolver_gen.go b/internal/service/ec2/service_endpoint_resolver_gen.go index a156dd1cb61..f4b2a033bd3 100644 --- a/internal/service/ec2/service_endpoint_resolver_gen.go +++ b/internal/service/ec2/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ ec2.EndpointResolverV2 = resolverSDKv2{} +var _ ec2.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver ec2.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: ec2.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params ec2.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.ToBool(params.UseFIPS) diff --git a/internal/service/ec2/service_package.go b/internal/service/ec2/service_package.go index 276aefbf4f2..db0a8b46193 100644 --- a/internal/service/ec2/service_package.go +++ b/internal/service/ec2/service_package.go @@ -19,7 +19,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return ec2.NewFromConfig(cfg, - ec2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + ec2.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), func(o *ec2.Options) { o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(func(err error) aws.Ternary { From 90f3a977cee10a787d05f37c6ee9637254b0a822 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:14 -0400 Subject: [PATCH 823/981] Rename endpoint resolver struct type - ecr. --- internal/service/ecr/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/ecr/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/ecr/service_endpoint_resolver_gen.go b/internal/service/ecr/service_endpoint_resolver_gen.go index 721cc9d5ed6..6972fecf3f7 100644 --- a/internal/service/ecr/service_endpoint_resolver_gen.go +++ b/internal/service/ecr/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ ecr.EndpointResolverV2 = resolverSDKv2{} +var _ ecr.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver ecr.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: ecr.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params ecr.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.ToBool(params.UseFIPS) diff --git a/internal/service/ecr/service_package_gen.go b/internal/service/ecr/service_package_gen.go index 86eec692023..de5939cd70a 100644 --- a/internal/service/ecr/service_package_gen.go +++ b/internal/service/ecr/service_package_gen.go @@ -121,7 +121,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return ecr.NewFromConfig(cfg, - ecr.WithEndpointResolverV2(newEndpointResolverSDKv2()), + ecr.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 2d66f2f577f47ede904a681eb87adbd107b72622 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:14 -0400 Subject: [PATCH 824/981] Rename endpoint resolver struct type - ecrpublic. --- .../service/ecrpublic/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/ecrpublic/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/ecrpublic/service_endpoint_resolver_gen.go b/internal/service/ecrpublic/service_endpoint_resolver_gen.go index 56af30ae549..cd4451fc6e1 100644 --- a/internal/service/ecrpublic/service_endpoint_resolver_gen.go +++ b/internal/service/ecrpublic/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ ecrpublic.EndpointResolverV2 = resolverSDKv2{} +var _ ecrpublic.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver ecrpublic.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: ecrpublic.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params ecrpublic.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.ToBool(params.UseFIPS) diff --git a/internal/service/ecrpublic/service_package_gen.go b/internal/service/ecrpublic/service_package_gen.go index c24cf3b14c7..9ba6c732241 100644 --- a/internal/service/ecrpublic/service_package_gen.go +++ b/internal/service/ecrpublic/service_package_gen.go @@ -57,7 +57,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return ecrpublic.NewFromConfig(cfg, - ecrpublic.WithEndpointResolverV2(newEndpointResolverSDKv2()), + ecrpublic.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 5f575b8c8ae362467f3bbdad02ca6ebbcf46952d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:14 -0400 Subject: [PATCH 825/981] Rename endpoint resolver struct type - ecs. --- internal/service/ecs/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/ecs/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/ecs/service_endpoint_resolver_gen.go b/internal/service/ecs/service_endpoint_resolver_gen.go index f95d5008f38..f880ad4df38 100644 --- a/internal/service/ecs/service_endpoint_resolver_gen.go +++ b/internal/service/ecs/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ ecs.EndpointResolverV2 = resolverSDKv2{} +var _ ecs.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver ecs.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: ecs.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params ecs.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.ToBool(params.UseFIPS) diff --git a/internal/service/ecs/service_package_gen.go b/internal/service/ecs/service_package_gen.go index c7a68efe27c..2f7209cc925 100644 --- a/internal/service/ecs/service_package_gen.go +++ b/internal/service/ecs/service_package_gen.go @@ -123,7 +123,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return ecs.NewFromConfig(cfg, - ecs.WithEndpointResolverV2(newEndpointResolverSDKv2()), + ecs.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 26aaa8c50c1f2e2402e35131114eb1d136e92d88 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:15 -0400 Subject: [PATCH 826/981] Rename endpoint resolver struct type - efs. --- internal/service/efs/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/efs/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/efs/service_endpoint_resolver_gen.go b/internal/service/efs/service_endpoint_resolver_gen.go index 3411cdff25e..b93f94c9ed2 100644 --- a/internal/service/efs/service_endpoint_resolver_gen.go +++ b/internal/service/efs/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ efs.EndpointResolverV2 = resolverSDKv2{} +var _ efs.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver efs.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: efs.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params efs.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.ToBool(params.UseFIPS) diff --git a/internal/service/efs/service_package_gen.go b/internal/service/efs/service_package_gen.go index 0d410144f43..594403f754f 100644 --- a/internal/service/efs/service_package_gen.go +++ b/internal/service/efs/service_package_gen.go @@ -99,7 +99,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return efs.NewFromConfig(cfg, - efs.WithEndpointResolverV2(newEndpointResolverSDKv2()), + efs.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 0bc4c1f32bef5373447e2ddff5d319018dafb9f1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:15 -0400 Subject: [PATCH 827/981] Rename endpoint resolver struct type - eks. --- internal/service/eks/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/eks/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/eks/service_endpoint_resolver_gen.go b/internal/service/eks/service_endpoint_resolver_gen.go index 1b9582996f1..d215dccbe68 100644 --- a/internal/service/eks/service_endpoint_resolver_gen.go +++ b/internal/service/eks/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ eks.EndpointResolverV2 = resolverSDKv2{} +var _ eks.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver eks.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: eks.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params eks.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.ToBool(params.UseFIPS) diff --git a/internal/service/eks/service_package_gen.go b/internal/service/eks/service_package_gen.go index a010ffe1fa2..c2d15e9b7d0 100644 --- a/internal/service/eks/service_package_gen.go +++ b/internal/service/eks/service_package_gen.go @@ -135,7 +135,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return eks.NewFromConfig(cfg, - eks.WithEndpointResolverV2(newEndpointResolverSDKv2()), + eks.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From d5b0b295650c260652d88419122a50bb3aa60856 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:15 -0400 Subject: [PATCH 828/981] Rename endpoint resolver struct type - elasticache. --- .../elasticache/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/elasticache/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/elasticache/service_endpoint_resolver_gen.go b/internal/service/elasticache/service_endpoint_resolver_gen.go index 736d599d0af..0107c53b19f 100644 --- a/internal/service/elasticache/service_endpoint_resolver_gen.go +++ b/internal/service/elasticache/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ elasticache.EndpointResolverV2 = resolverSDKv2{} +var _ elasticache.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver elasticache.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: elasticache.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params elasticache.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.ToBool(params.UseFIPS) diff --git a/internal/service/elasticache/service_package_gen.go b/internal/service/elasticache/service_package_gen.go index a3e919b5c6c..3c02c390dd9 100644 --- a/internal/service/elasticache/service_package_gen.go +++ b/internal/service/elasticache/service_package_gen.go @@ -141,7 +141,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return elasticache.NewFromConfig(cfg, - elasticache.WithEndpointResolverV2(newEndpointResolverSDKv2()), + elasticache.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 398d1d2dde246d49cf59b39fa86a609b9798856a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:15 -0400 Subject: [PATCH 829/981] Rename endpoint resolver struct type - elasticbeanstalk. --- .../elasticbeanstalk/service_endpoint_resolver_gen.go | 10 +++++----- .../service/elasticbeanstalk/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/elasticbeanstalk/service_endpoint_resolver_gen.go b/internal/service/elasticbeanstalk/service_endpoint_resolver_gen.go index 84467819cda..5d2f46016fa 100644 --- a/internal/service/elasticbeanstalk/service_endpoint_resolver_gen.go +++ b/internal/service/elasticbeanstalk/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ elasticbeanstalk.EndpointResolverV2 = resolverSDKv2{} +var _ elasticbeanstalk.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver elasticbeanstalk.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: elasticbeanstalk.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params elasticbeanstalk.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.ToBool(params.UseFIPS) diff --git a/internal/service/elasticbeanstalk/service_package_gen.go b/internal/service/elasticbeanstalk/service_package_gen.go index bf342358d4a..bbcbd50bd26 100644 --- a/internal/service/elasticbeanstalk/service_package_gen.go +++ b/internal/service/elasticbeanstalk/service_package_gen.go @@ -84,7 +84,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return elasticbeanstalk.NewFromConfig(cfg, - elasticbeanstalk.WithEndpointResolverV2(newEndpointResolverSDKv2()), + elasticbeanstalk.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 99e55a583e6f90164efdfb0e469cb3d349f09c01 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:15 -0400 Subject: [PATCH 830/981] Rename endpoint resolver struct type - elasticsearch. --- .../elasticsearch/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/elasticsearch/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/elasticsearch/service_endpoint_resolver_gen.go b/internal/service/elasticsearch/service_endpoint_resolver_gen.go index 3e7cb3420b6..91b9cc230e3 100644 --- a/internal/service/elasticsearch/service_endpoint_resolver_gen.go +++ b/internal/service/elasticsearch/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ elasticsearchservice.EndpointResolverV2 = resolverSDKv2{} +var _ elasticsearchservice.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver elasticsearchservice.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: elasticsearchservice.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params elasticsearchservice.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.ToBool(params.UseFIPS) diff --git a/internal/service/elasticsearch/service_package_gen.go b/internal/service/elasticsearch/service_package_gen.go index 17a9b53828d..1ac618e37bf 100644 --- a/internal/service/elasticsearch/service_package_gen.go +++ b/internal/service/elasticsearch/service_package_gen.go @@ -69,7 +69,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return elasticsearchservice.NewFromConfig(cfg, - elasticsearchservice.WithEndpointResolverV2(newEndpointResolverSDKv2()), + elasticsearchservice.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 8b85d47b9538c6a6dcedab89baa7c402bff25fb5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:15 -0400 Subject: [PATCH 831/981] Rename endpoint resolver struct type - elastictranscoder. --- .../elastictranscoder/service_endpoint_resolver_gen.go | 10 +++++----- .../service/elastictranscoder/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/elastictranscoder/service_endpoint_resolver_gen.go b/internal/service/elastictranscoder/service_endpoint_resolver_gen.go index 4d6a627e351..71db42be00d 100644 --- a/internal/service/elastictranscoder/service_endpoint_resolver_gen.go +++ b/internal/service/elastictranscoder/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ elastictranscoder.EndpointResolverV2 = resolverSDKv2{} +var _ elastictranscoder.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver elastictranscoder.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: elastictranscoder.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params elastictranscoder.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.ToBool(params.UseFIPS) diff --git a/internal/service/elastictranscoder/service_package_gen.go b/internal/service/elastictranscoder/service_package_gen.go index ade705e728f..6eccbc9bbc7 100644 --- a/internal/service/elastictranscoder/service_package_gen.go +++ b/internal/service/elastictranscoder/service_package_gen.go @@ -48,7 +48,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return elastictranscoder.NewFromConfig(cfg, - elastictranscoder.WithEndpointResolverV2(newEndpointResolverSDKv2()), + elastictranscoder.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 3be2a7fca2aed8b273ee1962c748159182eb430d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:15 -0400 Subject: [PATCH 832/981] Rename endpoint resolver struct type - elb. --- internal/service/elb/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/elb/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/elb/service_endpoint_resolver_gen.go b/internal/service/elb/service_endpoint_resolver_gen.go index f69997dd369..4e13fe085f5 100644 --- a/internal/service/elb/service_endpoint_resolver_gen.go +++ b/internal/service/elb/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ elasticloadbalancing.EndpointResolverV2 = resolverSDKv2{} +var _ elasticloadbalancing.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver elasticloadbalancing.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: elasticloadbalancing.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params elasticloadbalancing.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.ToBool(params.UseFIPS) diff --git a/internal/service/elb/service_package_gen.go b/internal/service/elb/service_package_gen.go index 1fdb043b5a1..aef415bff18 100644 --- a/internal/service/elb/service_package_gen.go +++ b/internal/service/elb/service_package_gen.go @@ -104,7 +104,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return elasticloadbalancing.NewFromConfig(cfg, - elasticloadbalancing.WithEndpointResolverV2(newEndpointResolverSDKv2()), + elasticloadbalancing.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 0cf80c339de6629211942316b594331367f46255 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:15 -0400 Subject: [PATCH 833/981] Rename endpoint resolver struct type - elbv2. --- .../service/elbv2/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/elbv2/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/elbv2/service_endpoint_resolver_gen.go b/internal/service/elbv2/service_endpoint_resolver_gen.go index ca4bf24a284..aef72ee0d25 100644 --- a/internal/service/elbv2/service_endpoint_resolver_gen.go +++ b/internal/service/elbv2/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ elasticloadbalancingv2.EndpointResolverV2 = resolverSDKv2{} +var _ elasticloadbalancingv2.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver elasticloadbalancingv2.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: elasticloadbalancingv2.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params elasticloadbalancingv2.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.ToBool(params.UseFIPS) diff --git a/internal/service/elbv2/service_package_gen.go b/internal/service/elbv2/service_package_gen.go index 07e8b0becaf..0f6c79d96d4 100644 --- a/internal/service/elbv2/service_package_gen.go +++ b/internal/service/elbv2/service_package_gen.go @@ -201,7 +201,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return elasticloadbalancingv2.NewFromConfig(cfg, - elasticloadbalancingv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + elasticloadbalancingv2.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 86188bc20c53c327efef73f83c1be84abc846138 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:15 -0400 Subject: [PATCH 834/981] Rename endpoint resolver struct type - emr. --- internal/service/emr/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/emr/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/emr/service_endpoint_resolver_gen.go b/internal/service/emr/service_endpoint_resolver_gen.go index c19ce2f9615..843bfa64b18 100644 --- a/internal/service/emr/service_endpoint_resolver_gen.go +++ b/internal/service/emr/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ emr.EndpointResolverV2 = resolverSDKv2{} +var _ emr.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver emr.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: emr.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params emr.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.ToBool(params.UseFIPS) diff --git a/internal/service/emr/service_package_gen.go b/internal/service/emr/service_package_gen.go index 816eb07a694..d76211b4681 100644 --- a/internal/service/emr/service_package_gen.go +++ b/internal/service/emr/service_package_gen.go @@ -97,7 +97,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return emr.NewFromConfig(cfg, - emr.WithEndpointResolverV2(newEndpointResolverSDKv2()), + emr.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From a0d2ab83a56c7e17545d2987a84e0b0d69f0176c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:15 -0400 Subject: [PATCH 835/981] Rename endpoint resolver struct type - emrcontainers. --- .../emrcontainers/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/emrcontainers/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/emrcontainers/service_endpoint_resolver_gen.go b/internal/service/emrcontainers/service_endpoint_resolver_gen.go index d1f95913261..3e8dbe529d8 100644 --- a/internal/service/emrcontainers/service_endpoint_resolver_gen.go +++ b/internal/service/emrcontainers/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ emrcontainers.EndpointResolverV2 = resolverSDKv2{} +var _ emrcontainers.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver emrcontainers.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: emrcontainers.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params emrcontainers.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.ToBool(params.UseFIPS) diff --git a/internal/service/emrcontainers/service_package_gen.go b/internal/service/emrcontainers/service_package_gen.go index 4350afdcfc9..74f9f8a6691 100644 --- a/internal/service/emrcontainers/service_package_gen.go +++ b/internal/service/emrcontainers/service_package_gen.go @@ -63,7 +63,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return emrcontainers.NewFromConfig(cfg, - emrcontainers.WithEndpointResolverV2(newEndpointResolverSDKv2()), + emrcontainers.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 0a72c7d2709b15e875883b57ee38d0134ed0f73f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:15 -0400 Subject: [PATCH 836/981] Rename endpoint resolver struct type - emrserverless. --- .../emrserverless/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/emrserverless/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/emrserverless/service_endpoint_resolver_gen.go b/internal/service/emrserverless/service_endpoint_resolver_gen.go index e15454f8dcf..b0171333e23 100644 --- a/internal/service/emrserverless/service_endpoint_resolver_gen.go +++ b/internal/service/emrserverless/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ emrserverless.EndpointResolverV2 = resolverSDKv2{} +var _ emrserverless.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver emrserverless.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: emrserverless.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params emrserverless.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.ToBool(params.UseFIPS) diff --git a/internal/service/emrserverless/service_package_gen.go b/internal/service/emrserverless/service_package_gen.go index 439fc935dfa..a62d944cfb8 100644 --- a/internal/service/emrserverless/service_package_gen.go +++ b/internal/service/emrserverless/service_package_gen.go @@ -48,7 +48,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return emrserverless.NewFromConfig(cfg, - emrserverless.WithEndpointResolverV2(newEndpointResolverSDKv2()), + emrserverless.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 059d712713c19bb563ccd6792b5eb8149f1980da Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:15 -0400 Subject: [PATCH 837/981] Rename endpoint resolver struct type - events. --- .../service/events/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/events/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/events/service_endpoint_resolver_gen.go b/internal/service/events/service_endpoint_resolver_gen.go index 2f69a83725b..cc56d8d1edd 100644 --- a/internal/service/events/service_endpoint_resolver_gen.go +++ b/internal/service/events/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ eventbridge.EndpointResolverV2 = resolverSDKv2{} +var _ eventbridge.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver eventbridge.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: eventbridge.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params eventbridge.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.ToBool(params.UseFIPS) diff --git a/internal/service/events/service_package_gen.go b/internal/service/events/service_package_gen.go index b1d0e80f010..bf9da7c0029 100644 --- a/internal/service/events/service_package_gen.go +++ b/internal/service/events/service_package_gen.go @@ -107,7 +107,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return eventbridge.NewFromConfig(cfg, - eventbridge.WithEndpointResolverV2(newEndpointResolverSDKv2()), + eventbridge.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From dbd379fe7432f6451dc2d9910b2605ac4774f8ce Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:16 -0400 Subject: [PATCH 838/981] Rename endpoint resolver struct type - evidently. --- .../service/evidently/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/evidently/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/evidently/service_endpoint_resolver_gen.go b/internal/service/evidently/service_endpoint_resolver_gen.go index 72faf506aab..efe21cf9bf5 100644 --- a/internal/service/evidently/service_endpoint_resolver_gen.go +++ b/internal/service/evidently/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ evidently.EndpointResolverV2 = resolverSDKv2{} +var _ evidently.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver evidently.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: evidently.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params evidently.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.ToBool(params.UseFIPS) diff --git a/internal/service/evidently/service_package_gen.go b/internal/service/evidently/service_package_gen.go index 6f45cb0cd12..c436328af73 100644 --- a/internal/service/evidently/service_package_gen.go +++ b/internal/service/evidently/service_package_gen.go @@ -72,7 +72,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return evidently.NewFromConfig(cfg, - evidently.WithEndpointResolverV2(newEndpointResolverSDKv2()), + evidently.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From d214ef61ef0d3ef4dcef7baeabc97d632ae23955 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:16 -0400 Subject: [PATCH 839/981] Rename endpoint resolver struct type - finspace. --- .../service/finspace/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/finspace/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/finspace/service_endpoint_resolver_gen.go b/internal/service/finspace/service_endpoint_resolver_gen.go index 9c0150abcda..1080bd32b97 100644 --- a/internal/service/finspace/service_endpoint_resolver_gen.go +++ b/internal/service/finspace/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ finspace.EndpointResolverV2 = resolverSDKv2{} +var _ finspace.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver finspace.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: finspace.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params finspace.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.ToBool(params.UseFIPS) diff --git a/internal/service/finspace/service_package_gen.go b/internal/service/finspace/service_package_gen.go index 8e24f071fb7..4f3aed4b9e0 100644 --- a/internal/service/finspace/service_package_gen.go +++ b/internal/service/finspace/service_package_gen.go @@ -96,7 +96,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return finspace.NewFromConfig(cfg, - finspace.WithEndpointResolverV2(newEndpointResolverSDKv2()), + finspace.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From a3f379ab7012062b278bec92e414ec89620afc0c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:16 -0400 Subject: [PATCH 840/981] Rename endpoint resolver struct type - firehose. --- .../service/firehose/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/firehose/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/firehose/service_endpoint_resolver_gen.go b/internal/service/firehose/service_endpoint_resolver_gen.go index 51f29e2df66..87ec0ff2b92 100644 --- a/internal/service/firehose/service_endpoint_resolver_gen.go +++ b/internal/service/firehose/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ firehose.EndpointResolverV2 = resolverSDKv2{} +var _ firehose.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver firehose.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: firehose.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params firehose.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.ToBool(params.UseFIPS) diff --git a/internal/service/firehose/service_package_gen.go b/internal/service/firehose/service_package_gen.go index b72a78a8ba7..3b2521b641c 100644 --- a/internal/service/firehose/service_package_gen.go +++ b/internal/service/firehose/service_package_gen.go @@ -53,7 +53,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return firehose.NewFromConfig(cfg, - firehose.WithEndpointResolverV2(newEndpointResolverSDKv2()), + firehose.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 7df363cec96d34e390946eb00de3b2aabdb1d55b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:16 -0400 Subject: [PATCH 841/981] Rename endpoint resolver struct type - fis. --- internal/service/fis/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/fis/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/fis/service_endpoint_resolver_gen.go b/internal/service/fis/service_endpoint_resolver_gen.go index 198d63863db..c989684206d 100644 --- a/internal/service/fis/service_endpoint_resolver_gen.go +++ b/internal/service/fis/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ fis.EndpointResolverV2 = resolverSDKv2{} +var _ fis.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver fis.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: fis.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params fis.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.ToBool(params.UseFIPS) diff --git a/internal/service/fis/service_package_gen.go b/internal/service/fis/service_package_gen.go index 5efa42dd657..185784846ce 100644 --- a/internal/service/fis/service_package_gen.go +++ b/internal/service/fis/service_package_gen.go @@ -46,7 +46,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return fis.NewFromConfig(cfg, - fis.WithEndpointResolverV2(newEndpointResolverSDKv2()), + fis.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 6c83d6f80588f95263a9b98374182689a30f5c39 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:16 -0400 Subject: [PATCH 842/981] Rename endpoint resolver struct type - fms. --- internal/service/fms/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/fms/service_package.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/fms/service_endpoint_resolver_gen.go b/internal/service/fms/service_endpoint_resolver_gen.go index 6e767f8f840..39ff48b9224 100644 --- a/internal/service/fms/service_endpoint_resolver_gen.go +++ b/internal/service/fms/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ fms.EndpointResolverV2 = resolverSDKv2{} +var _ fms.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver fms.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: fms.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params fms.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.ToBool(params.UseFIPS) 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 { From a69f115e972ef68a1cb7d25ea0d78e2085fee059 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:16 -0400 Subject: [PATCH 843/981] Rename endpoint resolver struct type - fsx. --- internal/service/fsx/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/fsx/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/fsx/service_endpoint_resolver_gen.go b/internal/service/fsx/service_endpoint_resolver_gen.go index 100b8a217b4..338435f922e 100644 --- a/internal/service/fsx/service_endpoint_resolver_gen.go +++ b/internal/service/fsx/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ fsx.EndpointResolverV2 = resolverSDKv2{} +var _ fsx.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver fsx.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: fsx.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params fsx.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.ToBool(params.UseFIPS) diff --git a/internal/service/fsx/service_package_gen.go b/internal/service/fsx/service_package_gen.go index a758a674bc4..f7594041b5f 100644 --- a/internal/service/fsx/service_package_gen.go +++ b/internal/service/fsx/service_package_gen.go @@ -155,7 +155,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return fsx.NewFromConfig(cfg, - fsx.WithEndpointResolverV2(newEndpointResolverSDKv2()), + fsx.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 74d51d5074639e871cd302a927976554d96adf6e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:16 -0400 Subject: [PATCH 844/981] Rename endpoint resolver struct type - gamelift. --- .../service/gamelift/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/gamelift/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/gamelift/service_endpoint_resolver_gen.go b/internal/service/gamelift/service_endpoint_resolver_gen.go index f8576cf8d5e..010d1fb56e9 100644 --- a/internal/service/gamelift/service_endpoint_resolver_gen.go +++ b/internal/service/gamelift/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ gamelift.EndpointResolverV2 = resolverSDKv2{} +var _ gamelift.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver gamelift.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: gamelift.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params gamelift.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.ToBool(params.UseFIPS) diff --git a/internal/service/gamelift/service_package_gen.go b/internal/service/gamelift/service_package_gen.go index e77c5d8751c..98739ca82fd 100644 --- a/internal/service/gamelift/service_package_gen.go +++ b/internal/service/gamelift/service_package_gen.go @@ -88,7 +88,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return gamelift.NewFromConfig(cfg, - gamelift.WithEndpointResolverV2(newEndpointResolverSDKv2()), + gamelift.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 90e37d27ac646ecd35d17c3ae9e49a9b0ed61f3c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:16 -0400 Subject: [PATCH 845/981] Rename endpoint resolver struct type - glacier. --- .../service/glacier/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/glacier/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/glacier/service_endpoint_resolver_gen.go b/internal/service/glacier/service_endpoint_resolver_gen.go index 2752be6c994..6021ec97f2b 100644 --- a/internal/service/glacier/service_endpoint_resolver_gen.go +++ b/internal/service/glacier/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ glacier.EndpointResolverV2 = resolverSDKv2{} +var _ glacier.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver glacier.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: glacier.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params glacier.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.ToBool(params.UseFIPS) diff --git a/internal/service/glacier/service_package_gen.go b/internal/service/glacier/service_package_gen.go index 40b29332311..7584daab873 100644 --- a/internal/service/glacier/service_package_gen.go +++ b/internal/service/glacier/service_package_gen.go @@ -52,7 +52,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return glacier.NewFromConfig(cfg, - glacier.WithEndpointResolverV2(newEndpointResolverSDKv2()), + glacier.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 2ced9c4c3d619b1b9d7e593733a8460c0479fcba Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:16 -0400 Subject: [PATCH 846/981] Rename endpoint resolver struct type - globalaccelerator. --- .../globalaccelerator/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/globalaccelerator/service_package.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/globalaccelerator/service_endpoint_resolver_gen.go b/internal/service/globalaccelerator/service_endpoint_resolver_gen.go index 2a1af0af01d..78b19acb29d 100644 --- a/internal/service/globalaccelerator/service_endpoint_resolver_gen.go +++ b/internal/service/globalaccelerator/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ globalaccelerator.EndpointResolverV2 = resolverSDKv2{} +var _ globalaccelerator.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver globalaccelerator.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: globalaccelerator.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params globalaccelerator.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.ToBool(params.UseFIPS) 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 { From a0a709b4c675e0b74c5eaaded3e41558b13419b7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:16 -0400 Subject: [PATCH 847/981] Rename endpoint resolver struct type - glue. --- internal/service/glue/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/glue/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/glue/service_endpoint_resolver_gen.go b/internal/service/glue/service_endpoint_resolver_gen.go index 3e89b13a919..20203f46d1e 100644 --- a/internal/service/glue/service_endpoint_resolver_gen.go +++ b/internal/service/glue/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ glue.EndpointResolverV2 = resolverSDKv2{} +var _ glue.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver glue.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: glue.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params glue.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.ToBool(params.UseFIPS) diff --git a/internal/service/glue/service_package_gen.go b/internal/service/glue/service_package_gen.go index 82588a730c4..c7a8aac5c3a 100644 --- a/internal/service/glue/service_package_gen.go +++ b/internal/service/glue/service_package_gen.go @@ -187,7 +187,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return glue.NewFromConfig(cfg, - glue.WithEndpointResolverV2(newEndpointResolverSDKv2()), + glue.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 2e9863d6b20040703c780f1fb4a3f6deee2be0ba Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:16 -0400 Subject: [PATCH 848/981] Rename endpoint resolver struct type - grafana. --- .../service/grafana/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/grafana/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/grafana/service_endpoint_resolver_gen.go b/internal/service/grafana/service_endpoint_resolver_gen.go index ac738b925c1..60eb52badad 100644 --- a/internal/service/grafana/service_endpoint_resolver_gen.go +++ b/internal/service/grafana/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ grafana.EndpointResolverV2 = resolverSDKv2{} +var _ grafana.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver grafana.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: grafana.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params grafana.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.ToBool(params.UseFIPS) diff --git a/internal/service/grafana/service_package_gen.go b/internal/service/grafana/service_package_gen.go index abf765acfa0..9a9ac3e8588 100644 --- a/internal/service/grafana/service_package_gen.go +++ b/internal/service/grafana/service_package_gen.go @@ -84,7 +84,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return grafana.NewFromConfig(cfg, - grafana.WithEndpointResolverV2(newEndpointResolverSDKv2()), + grafana.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 6eddff7d6fc79120de1bbad59bfa650fa9b0dbc5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:16 -0400 Subject: [PATCH 849/981] Rename endpoint resolver struct type - greengrass. --- .../greengrass/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/greengrass/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/greengrass/service_endpoint_resolver_gen.go b/internal/service/greengrass/service_endpoint_resolver_gen.go index 46a78f1ec93..0f2ecaba459 100644 --- a/internal/service/greengrass/service_endpoint_resolver_gen.go +++ b/internal/service/greengrass/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ greengrass.EndpointResolverV2 = resolverSDKv2{} +var _ greengrass.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver greengrass.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: greengrass.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params greengrass.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.ToBool(params.UseFIPS) diff --git a/internal/service/greengrass/service_package_gen.go b/internal/service/greengrass/service_package_gen.go index 67e0e4335a0..d411264eae4 100644 --- a/internal/service/greengrass/service_package_gen.go +++ b/internal/service/greengrass/service_package_gen.go @@ -39,7 +39,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return greengrass.NewFromConfig(cfg, - greengrass.WithEndpointResolverV2(newEndpointResolverSDKv2()), + greengrass.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 3004789816ce1380c4aaa7fd94159e32675f1ae3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:16 -0400 Subject: [PATCH 850/981] Rename endpoint resolver struct type - groundstation. --- .../groundstation/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/groundstation/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/groundstation/service_endpoint_resolver_gen.go b/internal/service/groundstation/service_endpoint_resolver_gen.go index 8f81dc955fa..c4f9330cf6a 100644 --- a/internal/service/groundstation/service_endpoint_resolver_gen.go +++ b/internal/service/groundstation/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ groundstation.EndpointResolverV2 = resolverSDKv2{} +var _ groundstation.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver groundstation.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: groundstation.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params groundstation.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.ToBool(params.UseFIPS) diff --git a/internal/service/groundstation/service_package_gen.go b/internal/service/groundstation/service_package_gen.go index 5ffb7db0904..a447ab43a80 100644 --- a/internal/service/groundstation/service_package_gen.go +++ b/internal/service/groundstation/service_package_gen.go @@ -39,7 +39,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return groundstation.NewFromConfig(cfg, - groundstation.WithEndpointResolverV2(newEndpointResolverSDKv2()), + groundstation.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From f148dd59ae94195018d64ed86109478ec1f56879 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:17 -0400 Subject: [PATCH 851/981] Rename endpoint resolver struct type - guardduty. --- .../service/guardduty/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/guardduty/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/guardduty/service_endpoint_resolver_gen.go b/internal/service/guardduty/service_endpoint_resolver_gen.go index 931e917be3a..bdd75b5dcfd 100644 --- a/internal/service/guardduty/service_endpoint_resolver_gen.go +++ b/internal/service/guardduty/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ guardduty.EndpointResolverV2 = resolverSDKv2{} +var _ guardduty.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver guardduty.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: guardduty.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params guardduty.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.ToBool(params.UseFIPS) diff --git a/internal/service/guardduty/service_package_gen.go b/internal/service/guardduty/service_package_gen.go index d6d7345c62b..992fbe7e715 100644 --- a/internal/service/guardduty/service_package_gen.go +++ b/internal/service/guardduty/service_package_gen.go @@ -122,7 +122,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return guardduty.NewFromConfig(cfg, - guardduty.WithEndpointResolverV2(newEndpointResolverSDKv2()), + guardduty.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From be66484bf14f4704dc5b6b9b43221965ab99a94c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:17 -0400 Subject: [PATCH 852/981] Rename endpoint resolver struct type - healthlake. --- .../healthlake/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/healthlake/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/healthlake/service_endpoint_resolver_gen.go b/internal/service/healthlake/service_endpoint_resolver_gen.go index d96b8b80d30..a7335e5de93 100644 --- a/internal/service/healthlake/service_endpoint_resolver_gen.go +++ b/internal/service/healthlake/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ healthlake.EndpointResolverV2 = resolverSDKv2{} +var _ healthlake.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver healthlake.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: healthlake.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params healthlake.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.ToBool(params.UseFIPS) diff --git a/internal/service/healthlake/service_package_gen.go b/internal/service/healthlake/service_package_gen.go index e3369bc12d8..ca7bedd0be2 100644 --- a/internal/service/healthlake/service_package_gen.go +++ b/internal/service/healthlake/service_package_gen.go @@ -39,7 +39,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return healthlake.NewFromConfig(cfg, - healthlake.WithEndpointResolverV2(newEndpointResolverSDKv2()), + healthlake.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From a653b99a25c4a751646a1bb1877b2dd1b6bde86d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:17 -0400 Subject: [PATCH 853/981] Rename endpoint resolver struct type - iam. --- internal/service/iam/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/iam/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/iam/service_endpoint_resolver_gen.go b/internal/service/iam/service_endpoint_resolver_gen.go index d9b319b2762..6f76401c5fd 100644 --- a/internal/service/iam/service_endpoint_resolver_gen.go +++ b/internal/service/iam/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ iam.EndpointResolverV2 = resolverSDKv2{} +var _ iam.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver iam.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: iam.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params iam.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.ToBool(params.UseFIPS) diff --git a/internal/service/iam/service_package_gen.go b/internal/service/iam/service_package_gen.go index 775947898cc..8029167973b 100644 --- a/internal/service/iam/service_package_gen.go +++ b/internal/service/iam/service_package_gen.go @@ -326,7 +326,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return iam.NewFromConfig(cfg, - iam.WithEndpointResolverV2(newEndpointResolverSDKv2()), + iam.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 3d0bb45bc2dc3238c47250788367acf78d6b316b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:17 -0400 Subject: [PATCH 854/981] Rename endpoint resolver struct type - identitystore. --- .../identitystore/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/identitystore/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/identitystore/service_endpoint_resolver_gen.go b/internal/service/identitystore/service_endpoint_resolver_gen.go index 71ad5643314..6571c9d8f6e 100644 --- a/internal/service/identitystore/service_endpoint_resolver_gen.go +++ b/internal/service/identitystore/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ identitystore.EndpointResolverV2 = resolverSDKv2{} +var _ identitystore.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver identitystore.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: identitystore.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params identitystore.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.ToBool(params.UseFIPS) diff --git a/internal/service/identitystore/service_package_gen.go b/internal/service/identitystore/service_package_gen.go index e70f27f555e..ee26d351b48 100644 --- a/internal/service/identitystore/service_package_gen.go +++ b/internal/service/identitystore/service_package_gen.go @@ -71,7 +71,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return identitystore.NewFromConfig(cfg, - identitystore.WithEndpointResolverV2(newEndpointResolverSDKv2()), + identitystore.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From d63f9e159ecc6b746d308fb0aa0cc4755656bf4f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:17 -0400 Subject: [PATCH 855/981] Rename endpoint resolver struct type - imagebuilder. --- .../imagebuilder/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/imagebuilder/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/imagebuilder/service_endpoint_resolver_gen.go b/internal/service/imagebuilder/service_endpoint_resolver_gen.go index 98d7d0372fe..cbc53be0e4d 100644 --- a/internal/service/imagebuilder/service_endpoint_resolver_gen.go +++ b/internal/service/imagebuilder/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ imagebuilder.EndpointResolverV2 = resolverSDKv2{} +var _ imagebuilder.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver imagebuilder.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: imagebuilder.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params imagebuilder.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.ToBool(params.UseFIPS) diff --git a/internal/service/imagebuilder/service_package_gen.go b/internal/service/imagebuilder/service_package_gen.go index 97a36f7148e..b0ff4aa328a 100644 --- a/internal/service/imagebuilder/service_package_gen.go +++ b/internal/service/imagebuilder/service_package_gen.go @@ -185,7 +185,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return imagebuilder.NewFromConfig(cfg, - imagebuilder.WithEndpointResolverV2(newEndpointResolverSDKv2()), + imagebuilder.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From e173da8978c52fb7969cbbe381734430d1cfc8a5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:17 -0400 Subject: [PATCH 856/981] Rename endpoint resolver struct type - inspector. --- .../service/inspector/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/inspector/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/inspector/service_endpoint_resolver_gen.go b/internal/service/inspector/service_endpoint_resolver_gen.go index 184869a50bd..b896bf2eb74 100644 --- a/internal/service/inspector/service_endpoint_resolver_gen.go +++ b/internal/service/inspector/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ inspector.EndpointResolverV2 = resolverSDKv2{} +var _ inspector.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver inspector.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: inspector.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params inspector.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.ToBool(params.UseFIPS) diff --git a/internal/service/inspector/service_package_gen.go b/internal/service/inspector/service_package_gen.go index 1a4046281a1..671b40c0d30 100644 --- a/internal/service/inspector/service_package_gen.go +++ b/internal/service/inspector/service_package_gen.go @@ -61,7 +61,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return inspector.NewFromConfig(cfg, - inspector.WithEndpointResolverV2(newEndpointResolverSDKv2()), + inspector.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 8e3a32a329645117add609d492172d833e178409 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:17 -0400 Subject: [PATCH 857/981] Rename endpoint resolver struct type - inspector2. --- .../inspector2/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/inspector2/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/inspector2/service_endpoint_resolver_gen.go b/internal/service/inspector2/service_endpoint_resolver_gen.go index 2e74495ae36..1a00552e67e 100644 --- a/internal/service/inspector2/service_endpoint_resolver_gen.go +++ b/internal/service/inspector2/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ inspector2.EndpointResolverV2 = resolverSDKv2{} +var _ inspector2.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver inspector2.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: inspector2.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params inspector2.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.ToBool(params.UseFIPS) diff --git a/internal/service/inspector2/service_package_gen.go b/internal/service/inspector2/service_package_gen.go index ceccaa07bc2..6b141faf3e2 100644 --- a/internal/service/inspector2/service_package_gen.go +++ b/internal/service/inspector2/service_package_gen.go @@ -59,7 +59,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return inspector2.NewFromConfig(cfg, - inspector2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + inspector2.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From b8acf3302589d60d7ae6683df089f23ad3a43234 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:17 -0400 Subject: [PATCH 858/981] Rename endpoint resolver struct type - internetmonitor. --- .../internetmonitor/service_endpoint_resolver_gen.go | 10 +++++----- .../service/internetmonitor/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/internetmonitor/service_endpoint_resolver_gen.go b/internal/service/internetmonitor/service_endpoint_resolver_gen.go index d74ce017d6b..e31c6e0a78e 100644 --- a/internal/service/internetmonitor/service_endpoint_resolver_gen.go +++ b/internal/service/internetmonitor/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ internetmonitor.EndpointResolverV2 = resolverSDKv2{} +var _ internetmonitor.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver internetmonitor.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: internetmonitor.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params internetmonitor.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.ToBool(params.UseFIPS) diff --git a/internal/service/internetmonitor/service_package_gen.go b/internal/service/internetmonitor/service_package_gen.go index 0f8e4e01a04..1bc73f058a6 100644 --- a/internal/service/internetmonitor/service_package_gen.go +++ b/internal/service/internetmonitor/service_package_gen.go @@ -48,7 +48,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return internetmonitor.NewFromConfig(cfg, - internetmonitor.WithEndpointResolverV2(newEndpointResolverSDKv2()), + internetmonitor.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 4df61464a92723a23e725f6a4734dcd72f2b5657 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:17 -0400 Subject: [PATCH 859/981] Rename endpoint resolver struct type - iot. --- internal/service/iot/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/iot/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/iot/service_endpoint_resolver_gen.go b/internal/service/iot/service_endpoint_resolver_gen.go index 3c98e6d4b83..040cd2f3d94 100644 --- a/internal/service/iot/service_endpoint_resolver_gen.go +++ b/internal/service/iot/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ iot.EndpointResolverV2 = resolverSDKv2{} +var _ iot.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver iot.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: iot.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params iot.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.ToBool(params.UseFIPS) diff --git a/internal/service/iot/service_package_gen.go b/internal/service/iot/service_package_gen.go index e6a229f2bfb..084d3824c68 100644 --- a/internal/service/iot/service_package_gen.go +++ b/internal/service/iot/service_package_gen.go @@ -175,7 +175,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return iot.NewFromConfig(cfg, - iot.WithEndpointResolverV2(newEndpointResolverSDKv2()), + iot.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From e7e183156e729b9c5a9437423e62719b8ffaf065 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:17 -0400 Subject: [PATCH 860/981] Rename endpoint resolver struct type - iotanalytics. --- .../iotanalytics/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/iotanalytics/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/iotanalytics/service_endpoint_resolver_gen.go b/internal/service/iotanalytics/service_endpoint_resolver_gen.go index 6bb06e22351..653c69fc053 100644 --- a/internal/service/iotanalytics/service_endpoint_resolver_gen.go +++ b/internal/service/iotanalytics/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ iotanalytics.EndpointResolverV2 = resolverSDKv2{} +var _ iotanalytics.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver iotanalytics.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: iotanalytics.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params iotanalytics.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.ToBool(params.UseFIPS) diff --git a/internal/service/iotanalytics/service_package_gen.go b/internal/service/iotanalytics/service_package_gen.go index d5313c2478f..4d6dfb4686a 100644 --- a/internal/service/iotanalytics/service_package_gen.go +++ b/internal/service/iotanalytics/service_package_gen.go @@ -39,7 +39,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return iotanalytics.NewFromConfig(cfg, - iotanalytics.WithEndpointResolverV2(newEndpointResolverSDKv2()), + iotanalytics.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 831133ca15d893ea9fa7ef6ad7638e15fbb951b1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:17 -0400 Subject: [PATCH 861/981] Rename endpoint resolver struct type - iotevents. --- .../service/iotevents/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/iotevents/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/iotevents/service_endpoint_resolver_gen.go b/internal/service/iotevents/service_endpoint_resolver_gen.go index f008d009d69..a1369af22bc 100644 --- a/internal/service/iotevents/service_endpoint_resolver_gen.go +++ b/internal/service/iotevents/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ iotevents.EndpointResolverV2 = resolverSDKv2{} +var _ iotevents.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver iotevents.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: iotevents.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params iotevents.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.ToBool(params.UseFIPS) diff --git a/internal/service/iotevents/service_package_gen.go b/internal/service/iotevents/service_package_gen.go index 9a35dd13a3d..a12afe56fdc 100644 --- a/internal/service/iotevents/service_package_gen.go +++ b/internal/service/iotevents/service_package_gen.go @@ -39,7 +39,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return iotevents.NewFromConfig(cfg, - iotevents.WithEndpointResolverV2(newEndpointResolverSDKv2()), + iotevents.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 9fdafb328f7a176badbfa5076cd5cf87e3324544 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:17 -0400 Subject: [PATCH 862/981] Rename endpoint resolver struct type - ivs. --- internal/service/ivs/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/ivs/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/ivs/service_endpoint_resolver_gen.go b/internal/service/ivs/service_endpoint_resolver_gen.go index 125d547c969..c6ee0852761 100644 --- a/internal/service/ivs/service_endpoint_resolver_gen.go +++ b/internal/service/ivs/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ ivs.EndpointResolverV2 = resolverSDKv2{} +var _ ivs.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver ivs.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: ivs.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params ivs.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.ToBool(params.UseFIPS) diff --git a/internal/service/ivs/service_package_gen.go b/internal/service/ivs/service_package_gen.go index c40896a63b0..df1227c0c81 100644 --- a/internal/service/ivs/service_package_gen.go +++ b/internal/service/ivs/service_package_gen.go @@ -69,7 +69,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return ivs.NewFromConfig(cfg, - ivs.WithEndpointResolverV2(newEndpointResolverSDKv2()), + ivs.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 8f1f96874221d3b08111a6ecd959283efa2a49a1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:17 -0400 Subject: [PATCH 863/981] Rename endpoint resolver struct type - ivschat. --- .../service/ivschat/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/ivschat/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/ivschat/service_endpoint_resolver_gen.go b/internal/service/ivschat/service_endpoint_resolver_gen.go index 7c667e6f493..8717de5d415 100644 --- a/internal/service/ivschat/service_endpoint_resolver_gen.go +++ b/internal/service/ivschat/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ ivschat.EndpointResolverV2 = resolverSDKv2{} +var _ ivschat.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver ivschat.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: ivschat.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params ivschat.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.ToBool(params.UseFIPS) diff --git a/internal/service/ivschat/service_package_gen.go b/internal/service/ivschat/service_package_gen.go index 12f55a67baf..bc6059815c7 100644 --- a/internal/service/ivschat/service_package_gen.go +++ b/internal/service/ivschat/service_package_gen.go @@ -56,7 +56,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return ivschat.NewFromConfig(cfg, - ivschat.WithEndpointResolverV2(newEndpointResolverSDKv2()), + ivschat.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From d48046beaf2b15770b2c8bb9141329a46ff11e8f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:18 -0400 Subject: [PATCH 864/981] Rename endpoint resolver struct type - kafka. --- .../service/kafka/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/kafka/service_package.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/kafka/service_endpoint_resolver_gen.go b/internal/service/kafka/service_endpoint_resolver_gen.go index cbdb088921a..f630adba87d 100644 --- a/internal/service/kafka/service_endpoint_resolver_gen.go +++ b/internal/service/kafka/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ kafka.EndpointResolverV2 = resolverSDKv2{} +var _ kafka.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver kafka.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: kafka.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params kafka.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.ToBool(params.UseFIPS) 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 { From 15ace5930be41f95917ad37d55f5b196af6cf6e7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:18 -0400 Subject: [PATCH 865/981] Rename endpoint resolver struct type - kafkaconnect. --- .../kafkaconnect/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/kafkaconnect/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/kafkaconnect/service_endpoint_resolver_gen.go b/internal/service/kafkaconnect/service_endpoint_resolver_gen.go index 4c3a55cc1ae..14ac41d0f2a 100644 --- a/internal/service/kafkaconnect/service_endpoint_resolver_gen.go +++ b/internal/service/kafkaconnect/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ kafkaconnect.EndpointResolverV2 = resolverSDKv2{} +var _ kafkaconnect.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver kafkaconnect.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: kafkaconnect.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params kafkaconnect.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.ToBool(params.UseFIPS) diff --git a/internal/service/kafkaconnect/service_package_gen.go b/internal/service/kafkaconnect/service_package_gen.go index a6ac2ab5c2a..e41685761c9 100644 --- a/internal/service/kafkaconnect/service_package_gen.go +++ b/internal/service/kafkaconnect/service_package_gen.go @@ -89,7 +89,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return kafkaconnect.NewFromConfig(cfg, - kafkaconnect.WithEndpointResolverV2(newEndpointResolverSDKv2()), + kafkaconnect.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 20f3e814e30a3821e5a12d202f5eae4e57e20279 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:18 -0400 Subject: [PATCH 866/981] Rename endpoint resolver struct type - kendra. --- .../service/kendra/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/kendra/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/kendra/service_endpoint_resolver_gen.go b/internal/service/kendra/service_endpoint_resolver_gen.go index af1e00451d1..2afb9523ce7 100644 --- a/internal/service/kendra/service_endpoint_resolver_gen.go +++ b/internal/service/kendra/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ kendra.EndpointResolverV2 = resolverSDKv2{} +var _ kendra.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver kendra.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: kendra.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params kendra.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.ToBool(params.UseFIPS) diff --git a/internal/service/kendra/service_package_gen.go b/internal/service/kendra/service_package_gen.go index a2f33803bd9..3559d491a19 100644 --- a/internal/service/kendra/service_package_gen.go +++ b/internal/service/kendra/service_package_gen.go @@ -105,7 +105,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return kendra.NewFromConfig(cfg, - kendra.WithEndpointResolverV2(newEndpointResolverSDKv2()), + kendra.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From c961aa6f12f11c8d3d96f530cd758200ccdea501 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:18 -0400 Subject: [PATCH 867/981] Rename endpoint resolver struct type - keyspaces. --- .../service/keyspaces/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/keyspaces/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/keyspaces/service_endpoint_resolver_gen.go b/internal/service/keyspaces/service_endpoint_resolver_gen.go index 35c03fa6f46..f577c639186 100644 --- a/internal/service/keyspaces/service_endpoint_resolver_gen.go +++ b/internal/service/keyspaces/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ keyspaces.EndpointResolverV2 = resolverSDKv2{} +var _ keyspaces.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver keyspaces.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: keyspaces.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params keyspaces.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.ToBool(params.UseFIPS) diff --git a/internal/service/keyspaces/service_package_gen.go b/internal/service/keyspaces/service_package_gen.go index 5a6517c14b0..eb98f23f4c1 100644 --- a/internal/service/keyspaces/service_package_gen.go +++ b/internal/service/keyspaces/service_package_gen.go @@ -56,7 +56,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return keyspaces.NewFromConfig(cfg, - keyspaces.WithEndpointResolverV2(newEndpointResolverSDKv2()), + keyspaces.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 731a4678e31fc55727058d3feda98c63f402f64f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:18 -0400 Subject: [PATCH 868/981] Rename endpoint resolver struct type - kinesis. --- .../service/kinesis/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/kinesis/service_package.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/kinesis/service_endpoint_resolver_gen.go b/internal/service/kinesis/service_endpoint_resolver_gen.go index f444c700fa3..3edcc3caae7 100644 --- a/internal/service/kinesis/service_endpoint_resolver_gen.go +++ b/internal/service/kinesis/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ kinesis.EndpointResolverV2 = resolverSDKv2{} +var _ kinesis.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver kinesis.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: kinesis.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params kinesis.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.ToBool(params.UseFIPS) 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 { From 920b75fac6278a1caab187b2ea23cc9d927d462f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:18 -0400 Subject: [PATCH 869/981] Rename endpoint resolver struct type - kinesisanalytics. --- .../kinesisanalytics/service_endpoint_resolver_gen.go | 10 +++++----- .../service/kinesisanalytics/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/kinesisanalytics/service_endpoint_resolver_gen.go b/internal/service/kinesisanalytics/service_endpoint_resolver_gen.go index ceb870c6611..3c7aab734f5 100644 --- a/internal/service/kinesisanalytics/service_endpoint_resolver_gen.go +++ b/internal/service/kinesisanalytics/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ kinesisanalytics.EndpointResolverV2 = resolverSDKv2{} +var _ kinesisanalytics.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver kinesisanalytics.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: kinesisanalytics.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params kinesisanalytics.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.ToBool(params.UseFIPS) diff --git a/internal/service/kinesisanalytics/service_package_gen.go b/internal/service/kinesisanalytics/service_package_gen.go index 6ccafa2ba37..9731a0eee46 100644 --- a/internal/service/kinesisanalytics/service_package_gen.go +++ b/internal/service/kinesisanalytics/service_package_gen.go @@ -48,7 +48,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return kinesisanalytics.NewFromConfig(cfg, - kinesisanalytics.WithEndpointResolverV2(newEndpointResolverSDKv2()), + kinesisanalytics.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From ce1b05cb53920de63aaa33eba3f7ad7375ccd10b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:18 -0400 Subject: [PATCH 870/981] Rename endpoint resolver struct type - kinesisanalyticsv2. --- .../service_endpoint_resolver_gen.go | 10 +++++----- .../service/kinesisanalyticsv2/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/kinesisanalyticsv2/service_endpoint_resolver_gen.go b/internal/service/kinesisanalyticsv2/service_endpoint_resolver_gen.go index 8d8fdcaa361..0aa1230e6c2 100644 --- a/internal/service/kinesisanalyticsv2/service_endpoint_resolver_gen.go +++ b/internal/service/kinesisanalyticsv2/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ kinesisanalyticsv2.EndpointResolverV2 = resolverSDKv2{} +var _ kinesisanalyticsv2.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver kinesisanalyticsv2.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: kinesisanalyticsv2.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params kinesisanalyticsv2.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.ToBool(params.UseFIPS) diff --git a/internal/service/kinesisanalyticsv2/service_package_gen.go b/internal/service/kinesisanalyticsv2/service_package_gen.go index 95246f06133..0d3737522a8 100644 --- a/internal/service/kinesisanalyticsv2/service_package_gen.go +++ b/internal/service/kinesisanalyticsv2/service_package_gen.go @@ -53,7 +53,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return kinesisanalyticsv2.NewFromConfig(cfg, - kinesisanalyticsv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + kinesisanalyticsv2.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 6295200a5ad6629d6f04ce041a337ccb00b5c486 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:18 -0400 Subject: [PATCH 871/981] Rename endpoint resolver struct type - kinesisvideo. --- .../kinesisvideo/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/kinesisvideo/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/kinesisvideo/service_endpoint_resolver_gen.go b/internal/service/kinesisvideo/service_endpoint_resolver_gen.go index 15f1ff68267..4f75f7349b1 100644 --- a/internal/service/kinesisvideo/service_endpoint_resolver_gen.go +++ b/internal/service/kinesisvideo/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ kinesisvideo.EndpointResolverV2 = resolverSDKv2{} +var _ kinesisvideo.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver kinesisvideo.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: kinesisvideo.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params kinesisvideo.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.ToBool(params.UseFIPS) diff --git a/internal/service/kinesisvideo/service_package_gen.go b/internal/service/kinesisvideo/service_package_gen.go index efd5e4d6af4..a5357b65e40 100644 --- a/internal/service/kinesisvideo/service_package_gen.go +++ b/internal/service/kinesisvideo/service_package_gen.go @@ -48,7 +48,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return kinesisvideo.NewFromConfig(cfg, - kinesisvideo.WithEndpointResolverV2(newEndpointResolverSDKv2()), + kinesisvideo.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From efc43d80e67b788978ff6169fc8f791c41a1b198 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:18 -0400 Subject: [PATCH 872/981] Rename endpoint resolver struct type - kms. --- internal/service/kms/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/kms/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/kms/service_endpoint_resolver_gen.go b/internal/service/kms/service_endpoint_resolver_gen.go index 72bb2141ec7..08c41e961bf 100644 --- a/internal/service/kms/service_endpoint_resolver_gen.go +++ b/internal/service/kms/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ kms.EndpointResolverV2 = resolverSDKv2{} +var _ kms.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver kms.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: kms.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params kms.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.ToBool(params.UseFIPS) diff --git a/internal/service/kms/service_package_gen.go b/internal/service/kms/service_package_gen.go index ed12f1af980..26bd968780e 100644 --- a/internal/service/kms/service_package_gen.go +++ b/internal/service/kms/service_package_gen.go @@ -133,7 +133,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return kms.NewFromConfig(cfg, - kms.WithEndpointResolverV2(newEndpointResolverSDKv2()), + kms.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From f6cb8a529b139cbf720c1db422c40257ba22620b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:18 -0400 Subject: [PATCH 873/981] Rename endpoint resolver struct type - lakeformation. --- .../lakeformation/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/lakeformation/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/lakeformation/service_endpoint_resolver_gen.go b/internal/service/lakeformation/service_endpoint_resolver_gen.go index 695f1a6337e..2aa2369a6f2 100644 --- a/internal/service/lakeformation/service_endpoint_resolver_gen.go +++ b/internal/service/lakeformation/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ lakeformation.EndpointResolverV2 = resolverSDKv2{} +var _ lakeformation.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver lakeformation.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: lakeformation.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params lakeformation.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.ToBool(params.UseFIPS) diff --git a/internal/service/lakeformation/service_package_gen.go b/internal/service/lakeformation/service_package_gen.go index f8ee87026a1..0c5ff86de1c 100644 --- a/internal/service/lakeformation/service_package_gen.go +++ b/internal/service/lakeformation/service_package_gen.go @@ -83,7 +83,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return lakeformation.NewFromConfig(cfg, - lakeformation.WithEndpointResolverV2(newEndpointResolverSDKv2()), + lakeformation.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From e9fa4b02db96f0a32f81d7e06285672ca9f6e997 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:18 -0400 Subject: [PATCH 874/981] Rename endpoint resolver struct type - lambda. --- .../service/lambda/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/lambda/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/lambda/service_endpoint_resolver_gen.go b/internal/service/lambda/service_endpoint_resolver_gen.go index 27acfc7f3fa..352d37b7029 100644 --- a/internal/service/lambda/service_endpoint_resolver_gen.go +++ b/internal/service/lambda/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ lambda.EndpointResolverV2 = resolverSDKv2{} +var _ lambda.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver lambda.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: lambda.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params lambda.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.ToBool(params.UseFIPS) diff --git a/internal/service/lambda/service_package_gen.go b/internal/service/lambda/service_package_gen.go index da1af7c36b7..b787967d5a9 100644 --- a/internal/service/lambda/service_package_gen.go +++ b/internal/service/lambda/service_package_gen.go @@ -149,7 +149,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return lambda.NewFromConfig(cfg, - lambda.WithEndpointResolverV2(newEndpointResolverSDKv2()), + lambda.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 3b6d5a72fe4b2665e7c3b8da019ae3f68faa89d6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:18 -0400 Subject: [PATCH 875/981] Rename endpoint resolver struct type - launchwizard. --- .../launchwizard/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/launchwizard/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/launchwizard/service_endpoint_resolver_gen.go b/internal/service/launchwizard/service_endpoint_resolver_gen.go index 0fb66dc0f00..7433df508a4 100644 --- a/internal/service/launchwizard/service_endpoint_resolver_gen.go +++ b/internal/service/launchwizard/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ launchwizard.EndpointResolverV2 = resolverSDKv2{} +var _ launchwizard.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver launchwizard.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: launchwizard.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params launchwizard.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.ToBool(params.UseFIPS) diff --git a/internal/service/launchwizard/service_package_gen.go b/internal/service/launchwizard/service_package_gen.go index 5b1c48b5b66..effd7fdd15d 100644 --- a/internal/service/launchwizard/service_package_gen.go +++ b/internal/service/launchwizard/service_package_gen.go @@ -39,7 +39,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return launchwizard.NewFromConfig(cfg, - launchwizard.WithEndpointResolverV2(newEndpointResolverSDKv2()), + launchwizard.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From f7e8ada45528d0b97100f9b322c72dd2c7341011 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:19 -0400 Subject: [PATCH 876/981] Rename endpoint resolver struct type - lexmodels. --- .../service/lexmodels/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/lexmodels/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/lexmodels/service_endpoint_resolver_gen.go b/internal/service/lexmodels/service_endpoint_resolver_gen.go index 6cd8b3744a7..8dcff3f27bf 100644 --- a/internal/service/lexmodels/service_endpoint_resolver_gen.go +++ b/internal/service/lexmodels/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ lexmodelbuildingservice.EndpointResolverV2 = resolverSDKv2{} +var _ lexmodelbuildingservice.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver lexmodelbuildingservice.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: lexmodelbuildingservice.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params lexmodelbuildingservice.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.ToBool(params.UseFIPS) diff --git a/internal/service/lexmodels/service_package_gen.go b/internal/service/lexmodels/service_package_gen.go index 3cf737c304b..1af8a7bbbef 100644 --- a/internal/service/lexmodels/service_package_gen.go +++ b/internal/service/lexmodels/service_package_gen.go @@ -80,7 +80,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return lexmodelbuildingservice.NewFromConfig(cfg, - lexmodelbuildingservice.WithEndpointResolverV2(newEndpointResolverSDKv2()), + lexmodelbuildingservice.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From c5f04458f9694fc6ea6f58e8f969e5b6bbc5266f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:19 -0400 Subject: [PATCH 877/981] Rename endpoint resolver struct type - lexv2models. --- .../lexv2models/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/lexv2models/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/lexv2models/service_endpoint_resolver_gen.go b/internal/service/lexv2models/service_endpoint_resolver_gen.go index 07a2b9d447a..eea952506e2 100644 --- a/internal/service/lexv2models/service_endpoint_resolver_gen.go +++ b/internal/service/lexv2models/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ lexmodelsv2.EndpointResolverV2 = resolverSDKv2{} +var _ lexmodelsv2.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver lexmodelsv2.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: lexmodelsv2.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params lexmodelsv2.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.ToBool(params.UseFIPS) diff --git a/internal/service/lexv2models/service_package_gen.go b/internal/service/lexv2models/service_package_gen.go index edb203712c9..b4cd15d1335 100644 --- a/internal/service/lexv2models/service_package_gen.go +++ b/internal/service/lexv2models/service_package_gen.go @@ -67,7 +67,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return lexmodelsv2.NewFromConfig(cfg, - lexmodelsv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + lexmodelsv2.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 44b290ff2a871072f950fa29a1a0bb31fa86c36a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:19 -0400 Subject: [PATCH 878/981] Rename endpoint resolver struct type - licensemanager. --- .../licensemanager/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/licensemanager/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/licensemanager/service_endpoint_resolver_gen.go b/internal/service/licensemanager/service_endpoint_resolver_gen.go index 2789abf7cca..c13288d804b 100644 --- a/internal/service/licensemanager/service_endpoint_resolver_gen.go +++ b/internal/service/licensemanager/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ licensemanager.EndpointResolverV2 = resolverSDKv2{} +var _ licensemanager.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver licensemanager.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: licensemanager.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params licensemanager.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.ToBool(params.UseFIPS) diff --git a/internal/service/licensemanager/service_package_gen.go b/internal/service/licensemanager/service_package_gen.go index d94e45fe847..374ad15ba9e 100644 --- a/internal/service/licensemanager/service_package_gen.go +++ b/internal/service/licensemanager/service_package_gen.go @@ -79,7 +79,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return licensemanager.NewFromConfig(cfg, - licensemanager.WithEndpointResolverV2(newEndpointResolverSDKv2()), + licensemanager.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From bf4c928e17836ddde54d7e3e4697c00a01415e63 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:19 -0400 Subject: [PATCH 879/981] Rename endpoint resolver struct type - lightsail. --- .../service/lightsail/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/lightsail/service_package.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/lightsail/service_endpoint_resolver_gen.go b/internal/service/lightsail/service_endpoint_resolver_gen.go index 895f99d4ba1..5833c03017c 100644 --- a/internal/service/lightsail/service_endpoint_resolver_gen.go +++ b/internal/service/lightsail/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ lightsail.EndpointResolverV2 = resolverSDKv2{} +var _ lightsail.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver lightsail.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: lightsail.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params lightsail.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.ToBool(params.UseFIPS) 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 { From ebe1f52308a01ce3a7aa37f038bc83bbfa81c545 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:19 -0400 Subject: [PATCH 880/981] Rename endpoint resolver struct type - location. --- .../service/location/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/location/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/location/service_endpoint_resolver_gen.go b/internal/service/location/service_endpoint_resolver_gen.go index b593592e5e4..31d7dcde0a2 100644 --- a/internal/service/location/service_endpoint_resolver_gen.go +++ b/internal/service/location/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ location.EndpointResolverV2 = resolverSDKv2{} +var _ location.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver location.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: location.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params location.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.ToBool(params.UseFIPS) diff --git a/internal/service/location/service_package_gen.go b/internal/service/location/service_package_gen.go index 2fd553a4eb6..3c89b4d220b 100644 --- a/internal/service/location/service_package_gen.go +++ b/internal/service/location/service_package_gen.go @@ -113,7 +113,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return location.NewFromConfig(cfg, - location.WithEndpointResolverV2(newEndpointResolverSDKv2()), + location.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 86dcb7de88b355c1f2f95028a21846887a0d9992 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:19 -0400 Subject: [PATCH 881/981] Rename endpoint resolver struct type - logs. --- internal/service/logs/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/logs/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/logs/service_endpoint_resolver_gen.go b/internal/service/logs/service_endpoint_resolver_gen.go index ed6e6b68453..b43e3fd31a1 100644 --- a/internal/service/logs/service_endpoint_resolver_gen.go +++ b/internal/service/logs/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ cloudwatchlogs.EndpointResolverV2 = resolverSDKv2{} +var _ cloudwatchlogs.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver cloudwatchlogs.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: cloudwatchlogs.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params cloudwatchlogs.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.ToBool(params.UseFIPS) diff --git a/internal/service/logs/service_package_gen.go b/internal/service/logs/service_package_gen.go index 7622f5ead23..43150af5c10 100644 --- a/internal/service/logs/service_package_gen.go +++ b/internal/service/logs/service_package_gen.go @@ -106,7 +106,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return cloudwatchlogs.NewFromConfig(cfg, - cloudwatchlogs.WithEndpointResolverV2(newEndpointResolverSDKv2()), + cloudwatchlogs.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 023eced9a07018cfe372e03306390a6df8718462 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:19 -0400 Subject: [PATCH 882/981] Rename endpoint resolver struct type - lookoutmetrics. --- .../lookoutmetrics/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/lookoutmetrics/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/lookoutmetrics/service_endpoint_resolver_gen.go b/internal/service/lookoutmetrics/service_endpoint_resolver_gen.go index ce781cdd80a..319cc604738 100644 --- a/internal/service/lookoutmetrics/service_endpoint_resolver_gen.go +++ b/internal/service/lookoutmetrics/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ lookoutmetrics.EndpointResolverV2 = resolverSDKv2{} +var _ lookoutmetrics.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver lookoutmetrics.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: lookoutmetrics.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params lookoutmetrics.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.ToBool(params.UseFIPS) diff --git a/internal/service/lookoutmetrics/service_package_gen.go b/internal/service/lookoutmetrics/service_package_gen.go index 78af29f9e81..49b4fa10670 100644 --- a/internal/service/lookoutmetrics/service_package_gen.go +++ b/internal/service/lookoutmetrics/service_package_gen.go @@ -39,7 +39,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return lookoutmetrics.NewFromConfig(cfg, - lookoutmetrics.WithEndpointResolverV2(newEndpointResolverSDKv2()), + lookoutmetrics.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From f0feb7bf8206596ac93780b12584f1be19cb8fd7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:19 -0400 Subject: [PATCH 883/981] Rename endpoint resolver struct type - m2. --- internal/service/m2/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/m2/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/m2/service_endpoint_resolver_gen.go b/internal/service/m2/service_endpoint_resolver_gen.go index 0355265a953..3a44bcf74eb 100644 --- a/internal/service/m2/service_endpoint_resolver_gen.go +++ b/internal/service/m2/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ m2.EndpointResolverV2 = resolverSDKv2{} +var _ m2.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver m2.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: m2.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params m2.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.ToBool(params.UseFIPS) diff --git a/internal/service/m2/service_package_gen.go b/internal/service/m2/service_package_gen.go index d0706978247..22b74491e94 100644 --- a/internal/service/m2/service_package_gen.go +++ b/internal/service/m2/service_package_gen.go @@ -58,7 +58,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return m2.NewFromConfig(cfg, - m2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + m2.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 5292e9c5f87cd62f4b838aea3bb3c8b7c03874a2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:19 -0400 Subject: [PATCH 884/981] Rename endpoint resolver struct type - macie2. --- .../service/macie2/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/macie2/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/macie2/service_endpoint_resolver_gen.go b/internal/service/macie2/service_endpoint_resolver_gen.go index c67dd8385be..97d6b81b0ae 100644 --- a/internal/service/macie2/service_endpoint_resolver_gen.go +++ b/internal/service/macie2/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ macie2.EndpointResolverV2 = resolverSDKv2{} +var _ macie2.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver macie2.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: macie2.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params macie2.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.ToBool(params.UseFIPS) diff --git a/internal/service/macie2/service_package_gen.go b/internal/service/macie2/service_package_gen.go index a6b63452091..58ce8469a97 100644 --- a/internal/service/macie2/service_package_gen.go +++ b/internal/service/macie2/service_package_gen.go @@ -84,7 +84,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return macie2.NewFromConfig(cfg, - macie2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + macie2.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 24c953acc5ce636e266c3edfb3f7d354623cd0c8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:19 -0400 Subject: [PATCH 885/981] Rename endpoint resolver struct type - mediaconnect. --- .../mediaconnect/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/mediaconnect/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/mediaconnect/service_endpoint_resolver_gen.go b/internal/service/mediaconnect/service_endpoint_resolver_gen.go index 644f7b24a89..f508a9fc988 100644 --- a/internal/service/mediaconnect/service_endpoint_resolver_gen.go +++ b/internal/service/mediaconnect/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ mediaconnect.EndpointResolverV2 = resolverSDKv2{} +var _ mediaconnect.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver mediaconnect.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: mediaconnect.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params mediaconnect.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.ToBool(params.UseFIPS) diff --git a/internal/service/mediaconnect/service_package_gen.go b/internal/service/mediaconnect/service_package_gen.go index 21fc7c015c6..42b4872b7a6 100644 --- a/internal/service/mediaconnect/service_package_gen.go +++ b/internal/service/mediaconnect/service_package_gen.go @@ -39,7 +39,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return mediaconnect.NewFromConfig(cfg, - mediaconnect.WithEndpointResolverV2(newEndpointResolverSDKv2()), + mediaconnect.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From eacb007455f0e14fcc9e400e7e2bbc0722ea8a6d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:19 -0400 Subject: [PATCH 886/981] Rename endpoint resolver struct type - mediaconvert. --- .../mediaconvert/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/mediaconvert/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/mediaconvert/service_endpoint_resolver_gen.go b/internal/service/mediaconvert/service_endpoint_resolver_gen.go index ba68e09e3ff..b01467a80c7 100644 --- a/internal/service/mediaconvert/service_endpoint_resolver_gen.go +++ b/internal/service/mediaconvert/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ mediaconvert.EndpointResolverV2 = resolverSDKv2{} +var _ mediaconvert.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver mediaconvert.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: mediaconvert.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params mediaconvert.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.ToBool(params.UseFIPS) diff --git a/internal/service/mediaconvert/service_package_gen.go b/internal/service/mediaconvert/service_package_gen.go index b39ee266146..3d4e8a1c513 100644 --- a/internal/service/mediaconvert/service_package_gen.go +++ b/internal/service/mediaconvert/service_package_gen.go @@ -57,7 +57,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return mediaconvert.NewFromConfig(cfg, - mediaconvert.WithEndpointResolverV2(newEndpointResolverSDKv2()), + mediaconvert.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 0a8d9015aa1596ae02acae9ab26d265dff66f78f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:19 -0400 Subject: [PATCH 887/981] Rename endpoint resolver struct type - medialive. --- .../service/medialive/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/medialive/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/medialive/service_endpoint_resolver_gen.go b/internal/service/medialive/service_endpoint_resolver_gen.go index 60c97ed1f54..1f726ce79b1 100644 --- a/internal/service/medialive/service_endpoint_resolver_gen.go +++ b/internal/service/medialive/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ medialive.EndpointResolverV2 = resolverSDKv2{} +var _ medialive.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver medialive.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: medialive.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params medialive.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.ToBool(params.UseFIPS) diff --git a/internal/service/medialive/service_package_gen.go b/internal/service/medialive/service_package_gen.go index b0ce50bd5a3..45d8298e8b3 100644 --- a/internal/service/medialive/service_package_gen.go +++ b/internal/service/medialive/service_package_gen.go @@ -81,7 +81,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return medialive.NewFromConfig(cfg, - medialive.WithEndpointResolverV2(newEndpointResolverSDKv2()), + medialive.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From a3d521c93fa74ebc3fed8cab39ca901bb5c606b8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:19 -0400 Subject: [PATCH 888/981] Rename endpoint resolver struct type - mediapackage. --- .../mediapackage/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/mediapackage/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/mediapackage/service_endpoint_resolver_gen.go b/internal/service/mediapackage/service_endpoint_resolver_gen.go index c08575f2cfa..83b86be3724 100644 --- a/internal/service/mediapackage/service_endpoint_resolver_gen.go +++ b/internal/service/mediapackage/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ mediapackage.EndpointResolverV2 = resolverSDKv2{} +var _ mediapackage.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver mediapackage.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: mediapackage.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params mediapackage.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.ToBool(params.UseFIPS) diff --git a/internal/service/mediapackage/service_package_gen.go b/internal/service/mediapackage/service_package_gen.go index f57fada917a..99dac3fed08 100644 --- a/internal/service/mediapackage/service_package_gen.go +++ b/internal/service/mediapackage/service_package_gen.go @@ -48,7 +48,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return mediapackage.NewFromConfig(cfg, - mediapackage.WithEndpointResolverV2(newEndpointResolverSDKv2()), + mediapackage.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 98acb0311aa7c4e65b1fd64f878366ea988d0a86 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:20 -0400 Subject: [PATCH 889/981] Rename endpoint resolver struct type - mediapackagev2. --- .../mediapackagev2/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/mediapackagev2/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/mediapackagev2/service_endpoint_resolver_gen.go b/internal/service/mediapackagev2/service_endpoint_resolver_gen.go index fed8c80fa63..86fcda578f6 100644 --- a/internal/service/mediapackagev2/service_endpoint_resolver_gen.go +++ b/internal/service/mediapackagev2/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ mediapackagev2.EndpointResolverV2 = resolverSDKv2{} +var _ mediapackagev2.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver mediapackagev2.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: mediapackagev2.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params mediapackagev2.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.ToBool(params.UseFIPS) diff --git a/internal/service/mediapackagev2/service_package_gen.go b/internal/service/mediapackagev2/service_package_gen.go index e5c603e3c1d..edfb4b32cd2 100644 --- a/internal/service/mediapackagev2/service_package_gen.go +++ b/internal/service/mediapackagev2/service_package_gen.go @@ -39,7 +39,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return mediapackagev2.NewFromConfig(cfg, - mediapackagev2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + mediapackagev2.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 1db06d4d44e34a0385fe9cb0816e20c79f6dc298 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:20 -0400 Subject: [PATCH 890/981] Rename endpoint resolver struct type - mediastore. --- .../mediastore/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/mediastore/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/mediastore/service_endpoint_resolver_gen.go b/internal/service/mediastore/service_endpoint_resolver_gen.go index 14238c0b3b4..c7da8fbbf1a 100644 --- a/internal/service/mediastore/service_endpoint_resolver_gen.go +++ b/internal/service/mediastore/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ mediastore.EndpointResolverV2 = resolverSDKv2{} +var _ mediastore.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver mediastore.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: mediastore.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params mediastore.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.ToBool(params.UseFIPS) diff --git a/internal/service/mediastore/service_package_gen.go b/internal/service/mediastore/service_package_gen.go index ab6d6c1cb82..1749214297b 100644 --- a/internal/service/mediastore/service_package_gen.go +++ b/internal/service/mediastore/service_package_gen.go @@ -52,7 +52,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return mediastore.NewFromConfig(cfg, - mediastore.WithEndpointResolverV2(newEndpointResolverSDKv2()), + mediastore.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 8c4bf67c4aed470fbb10112d15dc5183c519ad68 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:20 -0400 Subject: [PATCH 891/981] Rename endpoint resolver struct type - memorydb. --- .../service/memorydb/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/memorydb/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/memorydb/service_endpoint_resolver_gen.go b/internal/service/memorydb/service_endpoint_resolver_gen.go index dbf17f83386..e8965ab66a7 100644 --- a/internal/service/memorydb/service_endpoint_resolver_gen.go +++ b/internal/service/memorydb/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ memorydb.EndpointResolverV2 = resolverSDKv2{} +var _ memorydb.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver memorydb.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: memorydb.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params memorydb.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.ToBool(params.UseFIPS) diff --git a/internal/service/memorydb/service_package_gen.go b/internal/service/memorydb/service_package_gen.go index e11cf5a5e9c..6792524af95 100644 --- a/internal/service/memorydb/service_package_gen.go +++ b/internal/service/memorydb/service_package_gen.go @@ -119,7 +119,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return memorydb.NewFromConfig(cfg, - memorydb.WithEndpointResolverV2(newEndpointResolverSDKv2()), + memorydb.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From ea971f7e6b67f66d879001a5b81be5083a09e805 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:20 -0400 Subject: [PATCH 892/981] Rename endpoint resolver struct type - mq. --- internal/service/mq/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/mq/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/mq/service_endpoint_resolver_gen.go b/internal/service/mq/service_endpoint_resolver_gen.go index 28f89a1f491..6eae088697b 100644 --- a/internal/service/mq/service_endpoint_resolver_gen.go +++ b/internal/service/mq/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ mq.EndpointResolverV2 = resolverSDKv2{} +var _ mq.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver mq.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: mq.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params mq.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.ToBool(params.UseFIPS) diff --git a/internal/service/mq/service_package_gen.go b/internal/service/mq/service_package_gen.go index 5b927816273..b39f6eb3ae8 100644 --- a/internal/service/mq/service_package_gen.go +++ b/internal/service/mq/service_package_gen.go @@ -72,7 +72,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return mq.NewFromConfig(cfg, - mq.WithEndpointResolverV2(newEndpointResolverSDKv2()), + mq.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 143397d6ce73e6038ca6fce5457c4f67f05a8b78 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:20 -0400 Subject: [PATCH 893/981] Rename endpoint resolver struct type - mwaa. --- internal/service/mwaa/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/mwaa/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/mwaa/service_endpoint_resolver_gen.go b/internal/service/mwaa/service_endpoint_resolver_gen.go index 63a913bd433..9887fbba8a9 100644 --- a/internal/service/mwaa/service_endpoint_resolver_gen.go +++ b/internal/service/mwaa/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ mwaa.EndpointResolverV2 = resolverSDKv2{} +var _ mwaa.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver mwaa.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: mwaa.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params mwaa.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.ToBool(params.UseFIPS) diff --git a/internal/service/mwaa/service_package_gen.go b/internal/service/mwaa/service_package_gen.go index 4a069fbec9c..e6005f1c3d9 100644 --- a/internal/service/mwaa/service_package_gen.go +++ b/internal/service/mwaa/service_package_gen.go @@ -48,7 +48,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return mwaa.NewFromConfig(cfg, - mwaa.WithEndpointResolverV2(newEndpointResolverSDKv2()), + mwaa.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 972521f74a57fa51c141d42e2ecfdb204b54199d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:20 -0400 Subject: [PATCH 894/981] Rename endpoint resolver struct type - neptune. --- .../service/neptune/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/neptune/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/neptune/service_endpoint_resolver_gen.go b/internal/service/neptune/service_endpoint_resolver_gen.go index 613c500bb5d..90cd111da22 100644 --- a/internal/service/neptune/service_endpoint_resolver_gen.go +++ b/internal/service/neptune/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ neptune.EndpointResolverV2 = resolverSDKv2{} +var _ neptune.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver neptune.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: neptune.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params neptune.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.ToBool(params.UseFIPS) diff --git a/internal/service/neptune/service_package_gen.go b/internal/service/neptune/service_package_gen.go index 9b59b53c1f0..3f852a6a90a 100644 --- a/internal/service/neptune/service_package_gen.go +++ b/internal/service/neptune/service_package_gen.go @@ -117,7 +117,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return neptune.NewFromConfig(cfg, - neptune.WithEndpointResolverV2(newEndpointResolverSDKv2()), + neptune.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From f33948e2de737d026d3e4b7fc5b7472462873ba3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:20 -0400 Subject: [PATCH 895/981] Rename endpoint resolver struct type - neptunegraph. --- .../neptunegraph/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/neptunegraph/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/neptunegraph/service_endpoint_resolver_gen.go b/internal/service/neptunegraph/service_endpoint_resolver_gen.go index aa3d698afa9..40f969b1d45 100644 --- a/internal/service/neptunegraph/service_endpoint_resolver_gen.go +++ b/internal/service/neptunegraph/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ neptunegraph.EndpointResolverV2 = resolverSDKv2{} +var _ neptunegraph.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver neptunegraph.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: neptunegraph.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params neptunegraph.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.ToBool(params.UseFIPS) diff --git a/internal/service/neptunegraph/service_package_gen.go b/internal/service/neptunegraph/service_package_gen.go index 09d80bb6728..a2f7e33bff9 100644 --- a/internal/service/neptunegraph/service_package_gen.go +++ b/internal/service/neptunegraph/service_package_gen.go @@ -39,7 +39,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return neptunegraph.NewFromConfig(cfg, - neptunegraph.WithEndpointResolverV2(newEndpointResolverSDKv2()), + neptunegraph.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 7a8c520cdbe882be875eadc5bfd7d537aff2b95f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:20 -0400 Subject: [PATCH 896/981] Rename endpoint resolver struct type - networkfirewall. --- .../networkfirewall/service_endpoint_resolver_gen.go | 10 +++++----- .../service/networkfirewall/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/networkfirewall/service_endpoint_resolver_gen.go b/internal/service/networkfirewall/service_endpoint_resolver_gen.go index eeaad79e005..5d762fe871f 100644 --- a/internal/service/networkfirewall/service_endpoint_resolver_gen.go +++ b/internal/service/networkfirewall/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ networkfirewall.EndpointResolverV2 = resolverSDKv2{} +var _ networkfirewall.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver networkfirewall.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: networkfirewall.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params networkfirewall.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.ToBool(params.UseFIPS) diff --git a/internal/service/networkfirewall/service_package_gen.go b/internal/service/networkfirewall/service_package_gen.go index 31ae17d3744..7b74ba0a883 100644 --- a/internal/service/networkfirewall/service_package_gen.go +++ b/internal/service/networkfirewall/service_package_gen.go @@ -100,7 +100,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return networkfirewall.NewFromConfig(cfg, - networkfirewall.WithEndpointResolverV2(newEndpointResolverSDKv2()), + networkfirewall.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 5652975e9526e941ca80f0f23f44c89ce039dab5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:20 -0400 Subject: [PATCH 897/981] Rename endpoint resolver struct type - networkmanager. --- .../networkmanager/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/networkmanager/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/networkmanager/service_endpoint_resolver_gen.go b/internal/service/networkmanager/service_endpoint_resolver_gen.go index fb17fd55f87..38e56133f66 100644 --- a/internal/service/networkmanager/service_endpoint_resolver_gen.go +++ b/internal/service/networkmanager/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ networkmanager.EndpointResolverV2 = resolverSDKv2{} +var _ networkmanager.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver networkmanager.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: networkmanager.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params networkmanager.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.ToBool(params.UseFIPS) diff --git a/internal/service/networkmanager/service_package_gen.go b/internal/service/networkmanager/service_package_gen.go index 8e41b3c6c4a..3e491b77c3c 100644 --- a/internal/service/networkmanager/service_package_gen.go +++ b/internal/service/networkmanager/service_package_gen.go @@ -222,7 +222,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return networkmanager.NewFromConfig(cfg, - networkmanager.WithEndpointResolverV2(newEndpointResolverSDKv2()), + networkmanager.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 90e4085c496ffe4c2e1d982931d391bab36b1f0d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:20 -0400 Subject: [PATCH 898/981] Rename endpoint resolver struct type - networkmonitor. --- .../networkmonitor/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/networkmonitor/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/networkmonitor/service_endpoint_resolver_gen.go b/internal/service/networkmonitor/service_endpoint_resolver_gen.go index a716fb216f2..a77f41113b6 100644 --- a/internal/service/networkmonitor/service_endpoint_resolver_gen.go +++ b/internal/service/networkmonitor/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ networkmonitor.EndpointResolverV2 = resolverSDKv2{} +var _ networkmonitor.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver networkmonitor.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: networkmonitor.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params networkmonitor.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.ToBool(params.UseFIPS) diff --git a/internal/service/networkmonitor/service_package_gen.go b/internal/service/networkmonitor/service_package_gen.go index f650d8f34a6..77505ac4bb0 100644 --- a/internal/service/networkmonitor/service_package_gen.go +++ b/internal/service/networkmonitor/service_package_gen.go @@ -54,7 +54,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return networkmonitor.NewFromConfig(cfg, - networkmonitor.WithEndpointResolverV2(newEndpointResolverSDKv2()), + networkmonitor.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 52be8a58cd04f9198a0d2432612db48d6a5d68e1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:20 -0400 Subject: [PATCH 899/981] Rename endpoint resolver struct type - oam. --- internal/service/oam/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/oam/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/oam/service_endpoint_resolver_gen.go b/internal/service/oam/service_endpoint_resolver_gen.go index 5b4501d9b76..52e81cc9d0e 100644 --- a/internal/service/oam/service_endpoint_resolver_gen.go +++ b/internal/service/oam/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ oam.EndpointResolverV2 = resolverSDKv2{} +var _ oam.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver oam.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: oam.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params oam.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.ToBool(params.UseFIPS) diff --git a/internal/service/oam/service_package_gen.go b/internal/service/oam/service_package_gen.go index 1f5d8e28909..cdd3043bcbe 100644 --- a/internal/service/oam/service_package_gen.go +++ b/internal/service/oam/service_package_gen.go @@ -77,7 +77,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return oam.NewFromConfig(cfg, - oam.WithEndpointResolverV2(newEndpointResolverSDKv2()), + oam.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 101216da483887c85bf3797cf4b13ecf235cb827 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:21 -0400 Subject: [PATCH 900/981] Rename endpoint resolver struct type - opensearch. --- .../opensearch/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/opensearch/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/opensearch/service_endpoint_resolver_gen.go b/internal/service/opensearch/service_endpoint_resolver_gen.go index e3e9bce153d..7c7b779105f 100644 --- a/internal/service/opensearch/service_endpoint_resolver_gen.go +++ b/internal/service/opensearch/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ opensearch.EndpointResolverV2 = resolverSDKv2{} +var _ opensearch.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver opensearch.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: opensearch.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params opensearch.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.ToBool(params.UseFIPS) diff --git a/internal/service/opensearch/service_package_gen.go b/internal/service/opensearch/service_package_gen.go index df57003e269..75382dd7c84 100644 --- a/internal/service/opensearch/service_package_gen.go +++ b/internal/service/opensearch/service_package_gen.go @@ -89,7 +89,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return opensearch.NewFromConfig(cfg, - opensearch.WithEndpointResolverV2(newEndpointResolverSDKv2()), + opensearch.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 762b5f94ab5176bc05ff204e12d0b7ad18bc1947 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:21 -0400 Subject: [PATCH 901/981] Rename endpoint resolver struct type - opensearchserverless. --- .../service_endpoint_resolver_gen.go | 10 +++++----- .../opensearchserverless/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/opensearchserverless/service_endpoint_resolver_gen.go b/internal/service/opensearchserverless/service_endpoint_resolver_gen.go index cbf23cc8754..51a4ec07e87 100644 --- a/internal/service/opensearchserverless/service_endpoint_resolver_gen.go +++ b/internal/service/opensearchserverless/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ opensearchserverless.EndpointResolverV2 = resolverSDKv2{} +var _ opensearchserverless.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver opensearchserverless.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: opensearchserverless.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params opensearchserverless.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.ToBool(params.UseFIPS) diff --git a/internal/service/opensearchserverless/service_package_gen.go b/internal/service/opensearchserverless/service_package_gen.go index fd30f861298..29817943b2e 100644 --- a/internal/service/opensearchserverless/service_package_gen.go +++ b/internal/service/opensearchserverless/service_package_gen.go @@ -95,7 +95,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return opensearchserverless.NewFromConfig(cfg, - opensearchserverless.WithEndpointResolverV2(newEndpointResolverSDKv2()), + opensearchserverless.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From b8f563a4cf5ed9c039870720d533d97dcbb6949f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:21 -0400 Subject: [PATCH 902/981] Rename endpoint resolver struct type - opsworks. --- .../service/opsworks/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/opsworks/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/opsworks/service_endpoint_resolver_gen.go b/internal/service/opsworks/service_endpoint_resolver_gen.go index aeaa72aac0f..e0536d91e8f 100644 --- a/internal/service/opsworks/service_endpoint_resolver_gen.go +++ b/internal/service/opsworks/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ opsworks.EndpointResolverV2 = resolverSDKv2{} +var _ opsworks.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver opsworks.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: opsworks.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params opsworks.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.ToBool(params.UseFIPS) diff --git a/internal/service/opsworks/service_package_gen.go b/internal/service/opsworks/service_package_gen.go index 502bd0de6c7..9402a5db4ff 100644 --- a/internal/service/opsworks/service_package_gen.go +++ b/internal/service/opsworks/service_package_gen.go @@ -159,7 +159,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return opsworks.NewFromConfig(cfg, - opsworks.WithEndpointResolverV2(newEndpointResolverSDKv2()), + opsworks.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 32ec895e28c3e95d6fe30189298bde786093d7d1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:21 -0400 Subject: [PATCH 903/981] Rename endpoint resolver struct type - organizations. --- .../organizations/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/organizations/service_package.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/organizations/service_endpoint_resolver_gen.go b/internal/service/organizations/service_endpoint_resolver_gen.go index e9778ef823c..6878ed62c17 100644 --- a/internal/service/organizations/service_endpoint_resolver_gen.go +++ b/internal/service/organizations/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ organizations.EndpointResolverV2 = resolverSDKv2{} +var _ organizations.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver organizations.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: organizations.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params organizations.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.ToBool(params.UseFIPS) 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 { From 1a47e3892799dbace63b85a54d6f799369168ff7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:21 -0400 Subject: [PATCH 904/981] Rename endpoint resolver struct type - osis. --- internal/service/osis/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/osis/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/osis/service_endpoint_resolver_gen.go b/internal/service/osis/service_endpoint_resolver_gen.go index 7b51e1c1d44..6d27b8a1905 100644 --- a/internal/service/osis/service_endpoint_resolver_gen.go +++ b/internal/service/osis/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ osis.EndpointResolverV2 = resolverSDKv2{} +var _ osis.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver osis.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: osis.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params osis.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.ToBool(params.UseFIPS) diff --git a/internal/service/osis/service_package_gen.go b/internal/service/osis/service_package_gen.go index 8fdaa11b33c..a254af32061 100644 --- a/internal/service/osis/service_package_gen.go +++ b/internal/service/osis/service_package_gen.go @@ -47,7 +47,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return osis.NewFromConfig(cfg, - osis.WithEndpointResolverV2(newEndpointResolverSDKv2()), + osis.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From ad71cf0a099e4a9e269901cbd3d21d46a356fc6e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:21 -0400 Subject: [PATCH 905/981] Rename endpoint resolver struct type - outposts. --- .../service/outposts/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/outposts/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/outposts/service_endpoint_resolver_gen.go b/internal/service/outposts/service_endpoint_resolver_gen.go index 6d0aa8172c3..0279c09937a 100644 --- a/internal/service/outposts/service_endpoint_resolver_gen.go +++ b/internal/service/outposts/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ outposts.EndpointResolverV2 = resolverSDKv2{} +var _ outposts.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver outposts.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: outposts.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params outposts.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.ToBool(params.UseFIPS) diff --git a/internal/service/outposts/service_package_gen.go b/internal/service/outposts/service_package_gen.go index 2af4a304a6b..c5a527a6044 100644 --- a/internal/service/outposts/service_package_gen.go +++ b/internal/service/outposts/service_package_gen.go @@ -80,7 +80,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return outposts.NewFromConfig(cfg, - outposts.WithEndpointResolverV2(newEndpointResolverSDKv2()), + outposts.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From a9c110e7309b5a960ce4644b7a6faad60cf3b9a0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:21 -0400 Subject: [PATCH 906/981] Rename endpoint resolver struct type - paymentcryptography. --- .../service_endpoint_resolver_gen.go | 10 +++++----- .../service/paymentcryptography/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/paymentcryptography/service_endpoint_resolver_gen.go b/internal/service/paymentcryptography/service_endpoint_resolver_gen.go index 2d844d5bab6..b1c0d194684 100644 --- a/internal/service/paymentcryptography/service_endpoint_resolver_gen.go +++ b/internal/service/paymentcryptography/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ paymentcryptography.EndpointResolverV2 = resolverSDKv2{} +var _ paymentcryptography.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver paymentcryptography.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: paymentcryptography.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params paymentcryptography.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.ToBool(params.UseFIPS) diff --git a/internal/service/paymentcryptography/service_package_gen.go b/internal/service/paymentcryptography/service_package_gen.go index dd7c150630b..dcd333da567 100644 --- a/internal/service/paymentcryptography/service_package_gen.go +++ b/internal/service/paymentcryptography/service_package_gen.go @@ -51,7 +51,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return paymentcryptography.NewFromConfig(cfg, - paymentcryptography.WithEndpointResolverV2(newEndpointResolverSDKv2()), + paymentcryptography.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From a691fbc0187d9e640aa60c69dc73dbb25da22824 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:21 -0400 Subject: [PATCH 907/981] Rename endpoint resolver struct type - pcaconnectorad. --- .../pcaconnectorad/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/pcaconnectorad/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/pcaconnectorad/service_endpoint_resolver_gen.go b/internal/service/pcaconnectorad/service_endpoint_resolver_gen.go index defd06e6851..8b4aed19b52 100644 --- a/internal/service/pcaconnectorad/service_endpoint_resolver_gen.go +++ b/internal/service/pcaconnectorad/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ pcaconnectorad.EndpointResolverV2 = resolverSDKv2{} +var _ pcaconnectorad.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver pcaconnectorad.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: pcaconnectorad.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params pcaconnectorad.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.ToBool(params.UseFIPS) diff --git a/internal/service/pcaconnectorad/service_package_gen.go b/internal/service/pcaconnectorad/service_package_gen.go index 26f4de54df1..10aad76b3cf 100644 --- a/internal/service/pcaconnectorad/service_package_gen.go +++ b/internal/service/pcaconnectorad/service_package_gen.go @@ -39,7 +39,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return pcaconnectorad.NewFromConfig(cfg, - pcaconnectorad.WithEndpointResolverV2(newEndpointResolverSDKv2()), + pcaconnectorad.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 68cf5a6377c5edb4922d74324bc1d574f21dd639 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:21 -0400 Subject: [PATCH 908/981] Rename endpoint resolver struct type - pcs. --- internal/service/pcs/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/pcs/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/pcs/service_endpoint_resolver_gen.go b/internal/service/pcs/service_endpoint_resolver_gen.go index b806d65e28f..b217a4cd1dd 100644 --- a/internal/service/pcs/service_endpoint_resolver_gen.go +++ b/internal/service/pcs/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ pcs.EndpointResolverV2 = resolverSDKv2{} +var _ pcs.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver pcs.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: pcs.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params pcs.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.ToBool(params.UseFIPS) diff --git a/internal/service/pcs/service_package_gen.go b/internal/service/pcs/service_package_gen.go index 6f216126c65..855afc184fa 100644 --- a/internal/service/pcs/service_package_gen.go +++ b/internal/service/pcs/service_package_gen.go @@ -39,7 +39,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return pcs.NewFromConfig(cfg, - pcs.WithEndpointResolverV2(newEndpointResolverSDKv2()), + pcs.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 8e32d44fd8ff161e814552086d841c7cffa9dc27 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:21 -0400 Subject: [PATCH 909/981] Rename endpoint resolver struct type - pinpoint. --- .../service/pinpoint/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/pinpoint/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/pinpoint/service_endpoint_resolver_gen.go b/internal/service/pinpoint/service_endpoint_resolver_gen.go index c085133fd65..9c9b5833adf 100644 --- a/internal/service/pinpoint/service_endpoint_resolver_gen.go +++ b/internal/service/pinpoint/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ pinpoint.EndpointResolverV2 = resolverSDKv2{} +var _ pinpoint.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver pinpoint.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: pinpoint.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params pinpoint.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.ToBool(params.UseFIPS) diff --git a/internal/service/pinpoint/service_package_gen.go b/internal/service/pinpoint/service_package_gen.go index b20cf9a1336..99915cbda9c 100644 --- a/internal/service/pinpoint/service_package_gen.go +++ b/internal/service/pinpoint/service_package_gen.go @@ -106,7 +106,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return pinpoint.NewFromConfig(cfg, - pinpoint.WithEndpointResolverV2(newEndpointResolverSDKv2()), + pinpoint.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 031a7ec8496fa62835dcea727c78925b7bf90bac Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:21 -0400 Subject: [PATCH 910/981] Rename endpoint resolver struct type - pinpointsmsvoicev2. --- .../service_endpoint_resolver_gen.go | 10 +++++----- .../service/pinpointsmsvoicev2/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/pinpointsmsvoicev2/service_endpoint_resolver_gen.go b/internal/service/pinpointsmsvoicev2/service_endpoint_resolver_gen.go index 3b45f4953e9..09ba3a9f190 100644 --- a/internal/service/pinpointsmsvoicev2/service_endpoint_resolver_gen.go +++ b/internal/service/pinpointsmsvoicev2/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ pinpointsmsvoicev2.EndpointResolverV2 = resolverSDKv2{} +var _ pinpointsmsvoicev2.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver pinpointsmsvoicev2.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: pinpointsmsvoicev2.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params pinpointsmsvoicev2.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.ToBool(params.UseFIPS) diff --git a/internal/service/pinpointsmsvoicev2/service_package_gen.go b/internal/service/pinpointsmsvoicev2/service_package_gen.go index fb8885cbb49..fb69f9d27cb 100644 --- a/internal/service/pinpointsmsvoicev2/service_package_gen.go +++ b/internal/service/pinpointsmsvoicev2/service_package_gen.go @@ -61,7 +61,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return pinpointsmsvoicev2.NewFromConfig(cfg, - pinpointsmsvoicev2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + pinpointsmsvoicev2.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 2e4d030b44c9a9432d8ac3805c69eed85096303d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:21 -0400 Subject: [PATCH 911/981] Rename endpoint resolver struct type - pipes. --- .../service/pipes/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/pipes/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/pipes/service_endpoint_resolver_gen.go b/internal/service/pipes/service_endpoint_resolver_gen.go index 2ae92669278..647f1c82107 100644 --- a/internal/service/pipes/service_endpoint_resolver_gen.go +++ b/internal/service/pipes/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ pipes.EndpointResolverV2 = resolverSDKv2{} +var _ pipes.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver pipes.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: pipes.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params pipes.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.ToBool(params.UseFIPS) diff --git a/internal/service/pipes/service_package_gen.go b/internal/service/pipes/service_package_gen.go index fbabd490f27..bc923f3ea00 100644 --- a/internal/service/pipes/service_package_gen.go +++ b/internal/service/pipes/service_package_gen.go @@ -48,7 +48,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return pipes.NewFromConfig(cfg, - pipes.WithEndpointResolverV2(newEndpointResolverSDKv2()), + pipes.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 9c43f0648aa75eeda36d4da0ebac3578cbada766 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:21 -0400 Subject: [PATCH 912/981] Rename endpoint resolver struct type - polly. --- .../service/polly/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/polly/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/polly/service_endpoint_resolver_gen.go b/internal/service/polly/service_endpoint_resolver_gen.go index 97c6d65f647..7f8d50ac4e6 100644 --- a/internal/service/polly/service_endpoint_resolver_gen.go +++ b/internal/service/polly/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ polly.EndpointResolverV2 = resolverSDKv2{} +var _ polly.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver polly.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: polly.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params polly.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.ToBool(params.UseFIPS) diff --git a/internal/service/polly/service_package_gen.go b/internal/service/polly/service_package_gen.go index 2d5948cce86..5d3a389d5c7 100644 --- a/internal/service/polly/service_package_gen.go +++ b/internal/service/polly/service_package_gen.go @@ -44,7 +44,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return polly.NewFromConfig(cfg, - polly.WithEndpointResolverV2(newEndpointResolverSDKv2()), + polly.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 3d0bbf0a2dc687e67be42a0dad7c05b4db4ecca8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:22 -0400 Subject: [PATCH 913/981] Rename endpoint resolver struct type - pricing. --- .../service/pricing/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/pricing/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/pricing/service_endpoint_resolver_gen.go b/internal/service/pricing/service_endpoint_resolver_gen.go index 841f73cc725..7d927d33cfd 100644 --- a/internal/service/pricing/service_endpoint_resolver_gen.go +++ b/internal/service/pricing/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ pricing.EndpointResolverV2 = resolverSDKv2{} +var _ pricing.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver pricing.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: pricing.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params pricing.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.ToBool(params.UseFIPS) diff --git a/internal/service/pricing/service_package_gen.go b/internal/service/pricing/service_package_gen.go index 13d4c319155..cbf421164aa 100644 --- a/internal/service/pricing/service_package_gen.go +++ b/internal/service/pricing/service_package_gen.go @@ -44,7 +44,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return pricing.NewFromConfig(cfg, - pricing.WithEndpointResolverV2(newEndpointResolverSDKv2()), + pricing.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From f51e382910ebcba6a5ef82b5d9270dd78675ecb2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:22 -0400 Subject: [PATCH 914/981] Rename endpoint resolver struct type - qbusiness. --- .../service/qbusiness/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/qbusiness/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/qbusiness/service_endpoint_resolver_gen.go b/internal/service/qbusiness/service_endpoint_resolver_gen.go index e028f0cd7ce..e3a9fd19d32 100644 --- a/internal/service/qbusiness/service_endpoint_resolver_gen.go +++ b/internal/service/qbusiness/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ qbusiness.EndpointResolverV2 = resolverSDKv2{} +var _ qbusiness.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver qbusiness.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: qbusiness.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params qbusiness.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.ToBool(params.UseFIPS) diff --git a/internal/service/qbusiness/service_package_gen.go b/internal/service/qbusiness/service_package_gen.go index 627335d22e5..1d5b393a76e 100644 --- a/internal/service/qbusiness/service_package_gen.go +++ b/internal/service/qbusiness/service_package_gen.go @@ -39,7 +39,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return qbusiness.NewFromConfig(cfg, - qbusiness.WithEndpointResolverV2(newEndpointResolverSDKv2()), + qbusiness.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 5220b2b26fc36c16b9f0a76d4e08228d3c66fab1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:22 -0400 Subject: [PATCH 915/981] Rename endpoint resolver struct type - qldb. --- internal/service/qldb/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/qldb/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/qldb/service_endpoint_resolver_gen.go b/internal/service/qldb/service_endpoint_resolver_gen.go index c7f8d0e58c7..9d59080dfff 100644 --- a/internal/service/qldb/service_endpoint_resolver_gen.go +++ b/internal/service/qldb/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ qldb.EndpointResolverV2 = resolverSDKv2{} +var _ qldb.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver qldb.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: qldb.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params qldb.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.ToBool(params.UseFIPS) diff --git a/internal/service/qldb/service_package_gen.go b/internal/service/qldb/service_package_gen.go index 2dc93132433..a0b8abaa6b3 100644 --- a/internal/service/qldb/service_package_gen.go +++ b/internal/service/qldb/service_package_gen.go @@ -61,7 +61,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return qldb.NewFromConfig(cfg, - qldb.WithEndpointResolverV2(newEndpointResolverSDKv2()), + qldb.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From ea60d7cff4c523b018e7b4880a8173ee8c2faaa9 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:22 -0400 Subject: [PATCH 916/981] Rename endpoint resolver struct type - quicksight. --- .../quicksight/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/quicksight/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/quicksight/service_endpoint_resolver_gen.go b/internal/service/quicksight/service_endpoint_resolver_gen.go index e689374e696..3c6a46e0980 100644 --- a/internal/service/quicksight/service_endpoint_resolver_gen.go +++ b/internal/service/quicksight/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ quicksight.EndpointResolverV2 = resolverSDKv2{} +var _ quicksight.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver quicksight.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: quicksight.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params quicksight.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.ToBool(params.UseFIPS) diff --git a/internal/service/quicksight/service_package_gen.go b/internal/service/quicksight/service_package_gen.go index 3b5e7f70234..7215f4ace01 100644 --- a/internal/service/quicksight/service_package_gen.go +++ b/internal/service/quicksight/service_package_gen.go @@ -180,7 +180,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return quicksight.NewFromConfig(cfg, - quicksight.WithEndpointResolverV2(newEndpointResolverSDKv2()), + quicksight.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 08d8a7d71fd869a2c92db050a0c06ac6724b5977 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:22 -0400 Subject: [PATCH 917/981] Rename endpoint resolver struct type - ram. --- internal/service/ram/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/ram/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/ram/service_endpoint_resolver_gen.go b/internal/service/ram/service_endpoint_resolver_gen.go index e0472da1974..959f8113a33 100644 --- a/internal/service/ram/service_endpoint_resolver_gen.go +++ b/internal/service/ram/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ ram.EndpointResolverV2 = resolverSDKv2{} +var _ ram.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver ram.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: ram.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params ram.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.ToBool(params.UseFIPS) diff --git a/internal/service/ram/service_package_gen.go b/internal/service/ram/service_package_gen.go index ec62acc499f..4de1f69112e 100644 --- a/internal/service/ram/service_package_gen.go +++ b/internal/service/ram/service_package_gen.go @@ -75,7 +75,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return ram.NewFromConfig(cfg, - ram.WithEndpointResolverV2(newEndpointResolverSDKv2()), + ram.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From b13777b010c05f2f7d151c66bb3be3b107b84223 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:22 -0400 Subject: [PATCH 918/981] Rename endpoint resolver struct type - rbin. --- internal/service/rbin/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/rbin/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/rbin/service_endpoint_resolver_gen.go b/internal/service/rbin/service_endpoint_resolver_gen.go index 7f13cc1c34e..813297889ba 100644 --- a/internal/service/rbin/service_endpoint_resolver_gen.go +++ b/internal/service/rbin/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ rbin.EndpointResolverV2 = resolverSDKv2{} +var _ rbin.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver rbin.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: rbin.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params rbin.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.ToBool(params.UseFIPS) diff --git a/internal/service/rbin/service_package_gen.go b/internal/service/rbin/service_package_gen.go index c11fa2bc839..d4c98cc421b 100644 --- a/internal/service/rbin/service_package_gen.go +++ b/internal/service/rbin/service_package_gen.go @@ -48,7 +48,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return rbin.NewFromConfig(cfg, - rbin.WithEndpointResolverV2(newEndpointResolverSDKv2()), + rbin.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From fa346dc086f4845e8c2134c594eecad419871046 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:22 -0400 Subject: [PATCH 919/981] Rename endpoint resolver struct type - rds. --- internal/service/rds/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/rds/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/rds/service_endpoint_resolver_gen.go b/internal/service/rds/service_endpoint_resolver_gen.go index 6485c366c7b..486582c554c 100644 --- a/internal/service/rds/service_endpoint_resolver_gen.go +++ b/internal/service/rds/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ rds.EndpointResolverV2 = resolverSDKv2{} +var _ rds.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver rds.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: rds.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params rds.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.ToBool(params.UseFIPS) diff --git a/internal/service/rds/service_package_gen.go b/internal/service/rds/service_package_gen.go index afd713313ec..1a0ebab893f 100644 --- a/internal/service/rds/service_package_gen.go +++ b/internal/service/rds/service_package_gen.go @@ -299,7 +299,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return rds.NewFromConfig(cfg, - rds.WithEndpointResolverV2(newEndpointResolverSDKv2()), + rds.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From eb12c98dbfb81a30f4c8d9ddd2f0dc83c76bd4f0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:22 -0400 Subject: [PATCH 920/981] Rename endpoint resolver struct type - redshift. --- .../service/redshift/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/redshift/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/redshift/service_endpoint_resolver_gen.go b/internal/service/redshift/service_endpoint_resolver_gen.go index 159fbbd918e..e58256a5194 100644 --- a/internal/service/redshift/service_endpoint_resolver_gen.go +++ b/internal/service/redshift/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ redshift.EndpointResolverV2 = resolverSDKv2{} +var _ redshift.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver redshift.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: redshift.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params redshift.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.ToBool(params.UseFIPS) diff --git a/internal/service/redshift/service_package_gen.go b/internal/service/redshift/service_package_gen.go index ceffb88492e..eaf48a85d0f 100644 --- a/internal/service/redshift/service_package_gen.go +++ b/internal/service/redshift/service_package_gen.go @@ -214,7 +214,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return redshift.NewFromConfig(cfg, - redshift.WithEndpointResolverV2(newEndpointResolverSDKv2()), + redshift.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 93f8f667d3c6d8ed290b8d439da682608bbfe123 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:22 -0400 Subject: [PATCH 921/981] Rename endpoint resolver struct type - redshiftdata. --- .../redshiftdata/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/redshiftdata/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/redshiftdata/service_endpoint_resolver_gen.go b/internal/service/redshiftdata/service_endpoint_resolver_gen.go index 573f6754cab..aa9ae936fc3 100644 --- a/internal/service/redshiftdata/service_endpoint_resolver_gen.go +++ b/internal/service/redshiftdata/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ redshiftdata.EndpointResolverV2 = resolverSDKv2{} +var _ redshiftdata.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver redshiftdata.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: redshiftdata.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params redshiftdata.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.ToBool(params.UseFIPS) diff --git a/internal/service/redshiftdata/service_package_gen.go b/internal/service/redshiftdata/service_package_gen.go index 60594f99d32..a3924b7affa 100644 --- a/internal/service/redshiftdata/service_package_gen.go +++ b/internal/service/redshiftdata/service_package_gen.go @@ -44,7 +44,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return redshiftdata.NewFromConfig(cfg, - redshiftdata.WithEndpointResolverV2(newEndpointResolverSDKv2()), + redshiftdata.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From c542117db8cd9f0400e944c2d291b3855b314e7f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:22 -0400 Subject: [PATCH 922/981] Rename endpoint resolver struct type - redshiftserverless. --- .../service_endpoint_resolver_gen.go | 10 +++++----- .../service/redshiftserverless/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/redshiftserverless/service_endpoint_resolver_gen.go b/internal/service/redshiftserverless/service_endpoint_resolver_gen.go index 13cd0a440c1..cf7bfb53201 100644 --- a/internal/service/redshiftserverless/service_endpoint_resolver_gen.go +++ b/internal/service/redshiftserverless/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ redshiftserverless.EndpointResolverV2 = resolverSDKv2{} +var _ redshiftserverless.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver redshiftserverless.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: redshiftserverless.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params redshiftserverless.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.ToBool(params.UseFIPS) diff --git a/internal/service/redshiftserverless/service_package_gen.go b/internal/service/redshiftserverless/service_package_gen.go index e8c2b4a7daa..d2ddac41150 100644 --- a/internal/service/redshiftserverless/service_package_gen.go +++ b/internal/service/redshiftserverless/service_package_gen.go @@ -97,7 +97,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return redshiftserverless.NewFromConfig(cfg, - redshiftserverless.WithEndpointResolverV2(newEndpointResolverSDKv2()), + redshiftserverless.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From d85677389a3e64215b67430c622687a3170523d5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:22 -0400 Subject: [PATCH 923/981] Rename endpoint resolver struct type - rekognition. --- .../rekognition/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/rekognition/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/rekognition/service_endpoint_resolver_gen.go b/internal/service/rekognition/service_endpoint_resolver_gen.go index 3323bc89699..aaaef06461e 100644 --- a/internal/service/rekognition/service_endpoint_resolver_gen.go +++ b/internal/service/rekognition/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ rekognition.EndpointResolverV2 = resolverSDKv2{} +var _ rekognition.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver rekognition.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: rekognition.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params rekognition.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.ToBool(params.UseFIPS) diff --git a/internal/service/rekognition/service_package_gen.go b/internal/service/rekognition/service_package_gen.go index 3debda79066..c41ca1a544a 100644 --- a/internal/service/rekognition/service_package_gen.go +++ b/internal/service/rekognition/service_package_gen.go @@ -58,7 +58,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return rekognition.NewFromConfig(cfg, - rekognition.WithEndpointResolverV2(newEndpointResolverSDKv2()), + rekognition.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From f759971a6b0132b4986a25a9bd45cee3107b33e5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:22 -0400 Subject: [PATCH 924/981] Rename endpoint resolver struct type - resiliencehub. --- .../resiliencehub/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/resiliencehub/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/resiliencehub/service_endpoint_resolver_gen.go b/internal/service/resiliencehub/service_endpoint_resolver_gen.go index 8a234b70e00..65ff86dc765 100644 --- a/internal/service/resiliencehub/service_endpoint_resolver_gen.go +++ b/internal/service/resiliencehub/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ resiliencehub.EndpointResolverV2 = resolverSDKv2{} +var _ resiliencehub.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver resiliencehub.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: resiliencehub.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params resiliencehub.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.ToBool(params.UseFIPS) diff --git a/internal/service/resiliencehub/service_package_gen.go b/internal/service/resiliencehub/service_package_gen.go index 0cb6cafa723..d551d2e14c1 100644 --- a/internal/service/resiliencehub/service_package_gen.go +++ b/internal/service/resiliencehub/service_package_gen.go @@ -47,7 +47,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return resiliencehub.NewFromConfig(cfg, - resiliencehub.WithEndpointResolverV2(newEndpointResolverSDKv2()), + resiliencehub.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 7ca55bdfc99afa240d5e521c10932fa37d25c5e7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:22 -0400 Subject: [PATCH 925/981] Rename endpoint resolver struct type - resourceexplorer2. --- .../resourceexplorer2/service_endpoint_resolver_gen.go | 10 +++++----- .../service/resourceexplorer2/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/resourceexplorer2/service_endpoint_resolver_gen.go b/internal/service/resourceexplorer2/service_endpoint_resolver_gen.go index f348471eb9a..ef6e3413679 100644 --- a/internal/service/resourceexplorer2/service_endpoint_resolver_gen.go +++ b/internal/service/resourceexplorer2/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ resourceexplorer2.EndpointResolverV2 = resolverSDKv2{} +var _ resourceexplorer2.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver resourceexplorer2.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: resourceexplorer2.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params resourceexplorer2.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.ToBool(params.UseFIPS) diff --git a/internal/service/resourceexplorer2/service_package_gen.go b/internal/service/resourceexplorer2/service_package_gen.go index 6b0554b18bd..94974560e57 100644 --- a/internal/service/resourceexplorer2/service_package_gen.go +++ b/internal/service/resourceexplorer2/service_package_gen.go @@ -59,7 +59,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return resourceexplorer2.NewFromConfig(cfg, - resourceexplorer2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + resourceexplorer2.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From f8a493e54b79acf9d47d368e629e13c79177fbc4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:23 -0400 Subject: [PATCH 926/981] Rename endpoint resolver struct type - resourcegroups. --- .../resourcegroups/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/resourcegroups/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/resourcegroups/service_endpoint_resolver_gen.go b/internal/service/resourcegroups/service_endpoint_resolver_gen.go index 98b7d05e7af..f9caa3d5400 100644 --- a/internal/service/resourcegroups/service_endpoint_resolver_gen.go +++ b/internal/service/resourcegroups/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ resourcegroups.EndpointResolverV2 = resolverSDKv2{} +var _ resourcegroups.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver resourcegroups.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: resourcegroups.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params resourcegroups.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.ToBool(params.UseFIPS) diff --git a/internal/service/resourcegroups/service_package_gen.go b/internal/service/resourcegroups/service_package_gen.go index 01199bbdb35..192987d19b6 100644 --- a/internal/service/resourcegroups/service_package_gen.go +++ b/internal/service/resourcegroups/service_package_gen.go @@ -53,7 +53,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return resourcegroups.NewFromConfig(cfg, - resourcegroups.WithEndpointResolverV2(newEndpointResolverSDKv2()), + resourcegroups.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From f7b1480883f784841686b42728d3ce5370aff850 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:23 -0400 Subject: [PATCH 927/981] Rename endpoint resolver struct type - resourcegroupstaggingapi. --- .../service_endpoint_resolver_gen.go | 10 +++++----- .../resourcegroupstaggingapi/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/resourcegroupstaggingapi/service_endpoint_resolver_gen.go b/internal/service/resourcegroupstaggingapi/service_endpoint_resolver_gen.go index 114253dcdce..9cdfcb5d725 100644 --- a/internal/service/resourcegroupstaggingapi/service_endpoint_resolver_gen.go +++ b/internal/service/resourcegroupstaggingapi/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ resourcegroupstaggingapi.EndpointResolverV2 = resolverSDKv2{} +var _ resourcegroupstaggingapi.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver resourcegroupstaggingapi.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: resourcegroupstaggingapi.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params resourcegroupstaggingapi.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.ToBool(params.UseFIPS) diff --git a/internal/service/resourcegroupstaggingapi/service_package_gen.go b/internal/service/resourcegroupstaggingapi/service_package_gen.go index 162e7fdab5b..f8f2999f31f 100644 --- a/internal/service/resourcegroupstaggingapi/service_package_gen.go +++ b/internal/service/resourcegroupstaggingapi/service_package_gen.go @@ -44,7 +44,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return resourcegroupstaggingapi.NewFromConfig(cfg, - resourcegroupstaggingapi.WithEndpointResolverV2(newEndpointResolverSDKv2()), + resourcegroupstaggingapi.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From bbd82134d1634ac065c805c106128c701c967931 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:23 -0400 Subject: [PATCH 928/981] Rename endpoint resolver struct type - rolesanywhere. --- .../rolesanywhere/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/rolesanywhere/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/rolesanywhere/service_endpoint_resolver_gen.go b/internal/service/rolesanywhere/service_endpoint_resolver_gen.go index 29097ed1c8d..d9a4c06680a 100644 --- a/internal/service/rolesanywhere/service_endpoint_resolver_gen.go +++ b/internal/service/rolesanywhere/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ rolesanywhere.EndpointResolverV2 = resolverSDKv2{} +var _ rolesanywhere.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver rolesanywhere.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: rolesanywhere.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params rolesanywhere.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.ToBool(params.UseFIPS) diff --git a/internal/service/rolesanywhere/service_package_gen.go b/internal/service/rolesanywhere/service_package_gen.go index 6f8e53ba59f..27eb797f843 100644 --- a/internal/service/rolesanywhere/service_package_gen.go +++ b/internal/service/rolesanywhere/service_package_gen.go @@ -56,7 +56,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return rolesanywhere.NewFromConfig(cfg, - rolesanywhere.WithEndpointResolverV2(newEndpointResolverSDKv2()), + rolesanywhere.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 36722d35e4921b85790305e7c028f844b56a4f20 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:23 -0400 Subject: [PATCH 929/981] Rename endpoint resolver struct type - route53. --- .../service/route53/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/route53/service_package.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/route53/service_endpoint_resolver_gen.go b/internal/service/route53/service_endpoint_resolver_gen.go index fde454849af..b0f533b789d 100644 --- a/internal/service/route53/service_endpoint_resolver_gen.go +++ b/internal/service/route53/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ route53.EndpointResolverV2 = resolverSDKv2{} +var _ route53.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver route53.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: route53.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params route53.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.ToBool(params.UseFIPS) 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 From 0625156e10cc349a078bb1692c1f9cb4de84d34f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:23 -0400 Subject: [PATCH 930/981] Rename endpoint resolver struct type - route53domains. --- .../route53domains/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/route53domains/service_package.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/route53domains/service_endpoint_resolver_gen.go b/internal/service/route53domains/service_endpoint_resolver_gen.go index a132593f78c..ab817541091 100644 --- a/internal/service/route53domains/service_endpoint_resolver_gen.go +++ b/internal/service/route53domains/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ route53domains.EndpointResolverV2 = resolverSDKv2{} +var _ route53domains.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver route53domains.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: route53domains.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params route53domains.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.ToBool(params.UseFIPS) 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 { From 24fbad21239cc167c95a6267366e636398feb679 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:23 -0400 Subject: [PATCH 931/981] Rename endpoint resolver struct type - route53profiles. --- .../route53profiles/service_endpoint_resolver_gen.go | 10 +++++----- .../service/route53profiles/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/route53profiles/service_endpoint_resolver_gen.go b/internal/service/route53profiles/service_endpoint_resolver_gen.go index 2a3e570b39f..47b741a4826 100644 --- a/internal/service/route53profiles/service_endpoint_resolver_gen.go +++ b/internal/service/route53profiles/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ route53profiles.EndpointResolverV2 = resolverSDKv2{} +var _ route53profiles.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver route53profiles.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: route53profiles.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params route53profiles.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.ToBool(params.UseFIPS) diff --git a/internal/service/route53profiles/service_package_gen.go b/internal/service/route53profiles/service_package_gen.go index 9ca261cde2c..1eb644948a0 100644 --- a/internal/service/route53profiles/service_package_gen.go +++ b/internal/service/route53profiles/service_package_gen.go @@ -63,7 +63,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return route53profiles.NewFromConfig(cfg, - route53profiles.WithEndpointResolverV2(newEndpointResolverSDKv2()), + route53profiles.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 6e5f6b96fc4e3795a28059d1b297087d58e5e3c8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:23 -0400 Subject: [PATCH 932/981] Rename endpoint resolver struct type - route53recoverycontrolconfig. --- .../service_endpoint_resolver_gen.go | 10 +++++----- .../route53recoverycontrolconfig/service_package.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/route53recoverycontrolconfig/service_endpoint_resolver_gen.go b/internal/service/route53recoverycontrolconfig/service_endpoint_resolver_gen.go index 8305b7e8eaf..e2ba03523c0 100644 --- a/internal/service/route53recoverycontrolconfig/service_endpoint_resolver_gen.go +++ b/internal/service/route53recoverycontrolconfig/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ route53recoverycontrolconfig.EndpointResolverV2 = resolverSDKv2{} +var _ route53recoverycontrolconfig.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver route53recoverycontrolconfig.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: route53recoverycontrolconfig.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params route53recoverycontrolconfig.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.ToBool(params.UseFIPS) 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 From 20b0b6fef220fc1a0a2b2aed51cc2f0b26f4b5cc Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:23 -0400 Subject: [PATCH 933/981] Rename endpoint resolver struct type - route53recoveryreadiness. --- .../service_endpoint_resolver_gen.go | 10 +++++----- .../route53recoveryreadiness/service_package.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/route53recoveryreadiness/service_endpoint_resolver_gen.go b/internal/service/route53recoveryreadiness/service_endpoint_resolver_gen.go index 9a1b0dbe38c..81057239e99 100644 --- a/internal/service/route53recoveryreadiness/service_endpoint_resolver_gen.go +++ b/internal/service/route53recoveryreadiness/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ route53recoveryreadiness.EndpointResolverV2 = resolverSDKv2{} +var _ route53recoveryreadiness.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver route53recoveryreadiness.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: route53recoveryreadiness.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params route53recoveryreadiness.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.ToBool(params.UseFIPS) 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 From 6d3dc15aa1133df7b4a1b51eab3fd5d992b69d77 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:23 -0400 Subject: [PATCH 934/981] Rename endpoint resolver struct type - route53resolver. --- .../route53resolver/service_endpoint_resolver_gen.go | 10 +++++----- .../service/route53resolver/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/route53resolver/service_endpoint_resolver_gen.go b/internal/service/route53resolver/service_endpoint_resolver_gen.go index 3cd7b6f69d2..7164590704a 100644 --- a/internal/service/route53resolver/service_endpoint_resolver_gen.go +++ b/internal/service/route53resolver/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ route53resolver.EndpointResolverV2 = resolverSDKv2{} +var _ route53resolver.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver route53resolver.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: route53resolver.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params route53resolver.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.ToBool(params.UseFIPS) diff --git a/internal/service/route53resolver/service_package_gen.go b/internal/service/route53resolver/service_package_gen.go index b9e94bacfd6..f6ea7987fbe 100644 --- a/internal/service/route53resolver/service_package_gen.go +++ b/internal/service/route53resolver/service_package_gen.go @@ -164,7 +164,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return route53resolver.NewFromConfig(cfg, - route53resolver.WithEndpointResolverV2(newEndpointResolverSDKv2()), + route53resolver.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From e95a55abc13b3d789cb30bbb846989e947f5a6bc Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:23 -0400 Subject: [PATCH 935/981] Rename endpoint resolver struct type - rum. --- internal/service/rum/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/rum/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/rum/service_endpoint_resolver_gen.go b/internal/service/rum/service_endpoint_resolver_gen.go index 6ade933c4d3..6c385f7c4a3 100644 --- a/internal/service/rum/service_endpoint_resolver_gen.go +++ b/internal/service/rum/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ rum.EndpointResolverV2 = resolverSDKv2{} +var _ rum.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver rum.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: rum.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params rum.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.ToBool(params.UseFIPS) diff --git a/internal/service/rum/service_package_gen.go b/internal/service/rum/service_package_gen.go index eb01d6a7bbe..7a3e2decd9b 100644 --- a/internal/service/rum/service_package_gen.go +++ b/internal/service/rum/service_package_gen.go @@ -53,7 +53,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return rum.NewFromConfig(cfg, - rum.WithEndpointResolverV2(newEndpointResolverSDKv2()), + rum.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From b636976cc88741d1d3e64c564fa9a10a81fcca53 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:23 -0400 Subject: [PATCH 936/981] Rename endpoint resolver struct type - s3. --- internal/service/s3/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/s3/service_package.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/s3/service_endpoint_resolver_gen.go b/internal/service/s3/service_endpoint_resolver_gen.go index 5bca003df6f..09052d858cf 100644 --- a/internal/service/s3/service_endpoint_resolver_gen.go +++ b/internal/service/s3/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ s3.EndpointResolverV2 = resolverSDKv2{} +var _ s3.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver s3.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: s3.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params s3.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.ToBool(params.UseFIPS) 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" { From 079d3236c23426a73f940259f83a8faa5c16815d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:23 -0400 Subject: [PATCH 937/981] Rename endpoint resolver struct type - s3control. --- .../service/s3control/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/s3control/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/s3control/service_endpoint_resolver_gen.go b/internal/service/s3control/service_endpoint_resolver_gen.go index 0c7d4cd2437..29593cd2fde 100644 --- a/internal/service/s3control/service_endpoint_resolver_gen.go +++ b/internal/service/s3control/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ s3control.EndpointResolverV2 = resolverSDKv2{} +var _ s3control.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver s3control.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: s3control.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params s3control.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.ToBool(params.UseFIPS) diff --git a/internal/service/s3control/service_package_gen.go b/internal/service/s3control/service_package_gen.go index 4e63e8b317a..eced01274e6 100644 --- a/internal/service/s3control/service_package_gen.go +++ b/internal/service/s3control/service_package_gen.go @@ -119,7 +119,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return s3control.NewFromConfig(cfg, - s3control.WithEndpointResolverV2(newEndpointResolverSDKv2()), + s3control.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From deb5c0e635be424f6cb240285aa61daeecb08986 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:24 -0400 Subject: [PATCH 938/981] Rename endpoint resolver struct type - s3outposts. --- .../s3outposts/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/s3outposts/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/s3outposts/service_endpoint_resolver_gen.go b/internal/service/s3outposts/service_endpoint_resolver_gen.go index 97189439388..f457b581e30 100644 --- a/internal/service/s3outposts/service_endpoint_resolver_gen.go +++ b/internal/service/s3outposts/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ s3outposts.EndpointResolverV2 = resolverSDKv2{} +var _ s3outposts.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver s3outposts.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: s3outposts.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params s3outposts.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.ToBool(params.UseFIPS) diff --git a/internal/service/s3outposts/service_package_gen.go b/internal/service/s3outposts/service_package_gen.go index a11d86579d0..c4536217967 100644 --- a/internal/service/s3outposts/service_package_gen.go +++ b/internal/service/s3outposts/service_package_gen.go @@ -45,7 +45,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return s3outposts.NewFromConfig(cfg, - s3outposts.WithEndpointResolverV2(newEndpointResolverSDKv2()), + s3outposts.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From b7fe401d87e2ad206c57dadb6a4ee1d29d1df9ad Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:24 -0400 Subject: [PATCH 939/981] Rename endpoint resolver struct type - sagemaker. --- .../service/sagemaker/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/sagemaker/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/sagemaker/service_endpoint_resolver_gen.go b/internal/service/sagemaker/service_endpoint_resolver_gen.go index f49d8016546..59805710c05 100644 --- a/internal/service/sagemaker/service_endpoint_resolver_gen.go +++ b/internal/service/sagemaker/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ sagemaker.EndpointResolverV2 = resolverSDKv2{} +var _ sagemaker.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver sagemaker.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: sagemaker.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params sagemaker.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.ToBool(params.UseFIPS) diff --git a/internal/service/sagemaker/service_package_gen.go b/internal/service/sagemaker/service_package_gen.go index f7239325c1d..e7fbad7398c 100644 --- a/internal/service/sagemaker/service_package_gen.go +++ b/internal/service/sagemaker/service_package_gen.go @@ -268,7 +268,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return sagemaker.NewFromConfig(cfg, - sagemaker.WithEndpointResolverV2(newEndpointResolverSDKv2()), + sagemaker.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 619a7ebe3e0ef6541f3c2f5209f6b66c882882c3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:24 -0400 Subject: [PATCH 940/981] Rename endpoint resolver struct type - scheduler. --- .../service/scheduler/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/scheduler/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/scheduler/service_endpoint_resolver_gen.go b/internal/service/scheduler/service_endpoint_resolver_gen.go index 0f51958bc9e..17dae075033 100644 --- a/internal/service/scheduler/service_endpoint_resolver_gen.go +++ b/internal/service/scheduler/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ scheduler.EndpointResolverV2 = resolverSDKv2{} +var _ scheduler.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver scheduler.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: scheduler.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params scheduler.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.ToBool(params.UseFIPS) diff --git a/internal/service/scheduler/service_package_gen.go b/internal/service/scheduler/service_package_gen.go index 7fcbbca2608..4bfb82c79c5 100644 --- a/internal/service/scheduler/service_package_gen.go +++ b/internal/service/scheduler/service_package_gen.go @@ -52,7 +52,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return scheduler.NewFromConfig(cfg, - scheduler.WithEndpointResolverV2(newEndpointResolverSDKv2()), + scheduler.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From af971928e729c39a9e0240171c92d63fbbe2d938 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:24 -0400 Subject: [PATCH 941/981] Rename endpoint resolver struct type - schemas. --- .../service/schemas/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/schemas/service_package.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/schemas/service_endpoint_resolver_gen.go b/internal/service/schemas/service_endpoint_resolver_gen.go index a36aea1e08d..7168432f8af 100644 --- a/internal/service/schemas/service_endpoint_resolver_gen.go +++ b/internal/service/schemas/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ schemas.EndpointResolverV2 = resolverSDKv2{} +var _ schemas.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver schemas.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: schemas.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params schemas.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.ToBool(params.UseFIPS) 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 { From 7bc34b9c51d40dc65139458ed0ab01fac2a6aaec Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:24 -0400 Subject: [PATCH 942/981] Rename endpoint resolver struct type - secretsmanager. --- .../secretsmanager/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/secretsmanager/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/secretsmanager/service_endpoint_resolver_gen.go b/internal/service/secretsmanager/service_endpoint_resolver_gen.go index c44d981da13..41ea6fde8b0 100644 --- a/internal/service/secretsmanager/service_endpoint_resolver_gen.go +++ b/internal/service/secretsmanager/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ secretsmanager.EndpointResolverV2 = resolverSDKv2{} +var _ secretsmanager.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver secretsmanager.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: secretsmanager.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params secretsmanager.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.ToBool(params.UseFIPS) diff --git a/internal/service/secretsmanager/service_package_gen.go b/internal/service/secretsmanager/service_package_gen.go index 12b370bdc9e..1527362abd3 100644 --- a/internal/service/secretsmanager/service_package_gen.go +++ b/internal/service/secretsmanager/service_package_gen.go @@ -97,7 +97,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return secretsmanager.NewFromConfig(cfg, - secretsmanager.WithEndpointResolverV2(newEndpointResolverSDKv2()), + secretsmanager.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 01be5f45bf13b638a10970fdfc655b824b6bfe1f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:24 -0400 Subject: [PATCH 943/981] Rename endpoint resolver struct type - securityhub. --- .../securityhub/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/securityhub/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/securityhub/service_endpoint_resolver_gen.go b/internal/service/securityhub/service_endpoint_resolver_gen.go index 26467c5ba3e..0df275daeb9 100644 --- a/internal/service/securityhub/service_endpoint_resolver_gen.go +++ b/internal/service/securityhub/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ securityhub.EndpointResolverV2 = resolverSDKv2{} +var _ securityhub.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver securityhub.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: securityhub.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params securityhub.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.ToBool(params.UseFIPS) diff --git a/internal/service/securityhub/service_package_gen.go b/internal/service/securityhub/service_package_gen.go index 7b4c7cea9c0..34b6c8ba799 100644 --- a/internal/service/securityhub/service_package_gen.go +++ b/internal/service/securityhub/service_package_gen.go @@ -122,7 +122,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return securityhub.NewFromConfig(cfg, - securityhub.WithEndpointResolverV2(newEndpointResolverSDKv2()), + securityhub.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From ec8a4e1ae3493363145d2953fd7bf5c6804201f4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:24 -0400 Subject: [PATCH 944/981] Rename endpoint resolver struct type - securitylake. --- .../securitylake/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/securitylake/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/securitylake/service_endpoint_resolver_gen.go b/internal/service/securitylake/service_endpoint_resolver_gen.go index 2ec07382daf..778dbe06460 100644 --- a/internal/service/securitylake/service_endpoint_resolver_gen.go +++ b/internal/service/securitylake/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ securitylake.EndpointResolverV2 = resolverSDKv2{} +var _ securitylake.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver securitylake.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: securitylake.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params securitylake.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.ToBool(params.UseFIPS) diff --git a/internal/service/securitylake/service_package_gen.go b/internal/service/securitylake/service_package_gen.go index 8fc031b54b7..7fd10deca17 100644 --- a/internal/service/securitylake/service_package_gen.go +++ b/internal/service/securitylake/service_package_gen.go @@ -66,7 +66,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return securitylake.NewFromConfig(cfg, - securitylake.WithEndpointResolverV2(newEndpointResolverSDKv2()), + securitylake.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From c2a6de9d763c3e017753ec23634849f8e406d9e2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:24 -0400 Subject: [PATCH 945/981] Rename endpoint resolver struct type - serverlessrepo. --- .../serverlessrepo/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/serverlessrepo/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/serverlessrepo/service_endpoint_resolver_gen.go b/internal/service/serverlessrepo/service_endpoint_resolver_gen.go index 79c0f39ddda..1425a6a4ad4 100644 --- a/internal/service/serverlessrepo/service_endpoint_resolver_gen.go +++ b/internal/service/serverlessrepo/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ serverlessapplicationrepository.EndpointResolverV2 = resolverSDKv2{} +var _ serverlessapplicationrepository.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver serverlessapplicationrepository.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: serverlessapplicationrepository.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params serverlessapplicationrepository.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.ToBool(params.UseFIPS) diff --git a/internal/service/serverlessrepo/service_package_gen.go b/internal/service/serverlessrepo/service_package_gen.go index 46b3e577484..801aef886f2 100644 --- a/internal/service/serverlessrepo/service_package_gen.go +++ b/internal/service/serverlessrepo/service_package_gen.go @@ -51,7 +51,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return serverlessapplicationrepository.NewFromConfig(cfg, - serverlessapplicationrepository.WithEndpointResolverV2(newEndpointResolverSDKv2()), + serverlessapplicationrepository.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From e583d7f3bb182c1421a35814bb5a825c2062eb6f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:24 -0400 Subject: [PATCH 946/981] Rename endpoint resolver struct type - servicecatalog. --- .../servicecatalog/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/servicecatalog/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/servicecatalog/service_endpoint_resolver_gen.go b/internal/service/servicecatalog/service_endpoint_resolver_gen.go index c4b7e2ac0bf..2bb71adfe74 100644 --- a/internal/service/servicecatalog/service_endpoint_resolver_gen.go +++ b/internal/service/servicecatalog/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ servicecatalog.EndpointResolverV2 = resolverSDKv2{} +var _ servicecatalog.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver servicecatalog.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: servicecatalog.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params servicecatalog.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.ToBool(params.UseFIPS) diff --git a/internal/service/servicecatalog/service_package_gen.go b/internal/service/servicecatalog/service_package_gen.go index b361f826bb4..e887a5ada39 100644 --- a/internal/service/servicecatalog/service_package_gen.go +++ b/internal/service/servicecatalog/service_package_gen.go @@ -141,7 +141,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return servicecatalog.NewFromConfig(cfg, - servicecatalog.WithEndpointResolverV2(newEndpointResolverSDKv2()), + servicecatalog.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From c4977356010e9f197c6eb7bf794a33b44fdc2f64 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:24 -0400 Subject: [PATCH 947/981] Rename endpoint resolver struct type - servicecatalogappregistry. --- .../service_endpoint_resolver_gen.go | 10 +++++----- .../servicecatalogappregistry/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/servicecatalogappregistry/service_endpoint_resolver_gen.go b/internal/service/servicecatalogappregistry/service_endpoint_resolver_gen.go index 612819e19d0..f83021f4124 100644 --- a/internal/service/servicecatalogappregistry/service_endpoint_resolver_gen.go +++ b/internal/service/servicecatalogappregistry/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ servicecatalogappregistry.EndpointResolverV2 = resolverSDKv2{} +var _ servicecatalogappregistry.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver servicecatalogappregistry.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: servicecatalogappregistry.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params servicecatalogappregistry.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.ToBool(params.UseFIPS) diff --git a/internal/service/servicecatalogappregistry/service_package_gen.go b/internal/service/servicecatalogappregistry/service_package_gen.go index cc1ff3baf38..e51b33828b6 100644 --- a/internal/service/servicecatalogappregistry/service_package_gen.go +++ b/internal/service/servicecatalogappregistry/service_package_gen.go @@ -49,7 +49,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return servicecatalogappregistry.NewFromConfig(cfg, - servicecatalogappregistry.WithEndpointResolverV2(newEndpointResolverSDKv2()), + servicecatalogappregistry.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 37711669dfd4d5947affc81e5aef3fb208d43b5e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:24 -0400 Subject: [PATCH 948/981] Rename endpoint resolver struct type - servicediscovery. --- .../servicediscovery/service_endpoint_resolver_gen.go | 10 +++++----- .../service/servicediscovery/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/servicediscovery/service_endpoint_resolver_gen.go b/internal/service/servicediscovery/service_endpoint_resolver_gen.go index 952e20e7110..fd594064d49 100644 --- a/internal/service/servicediscovery/service_endpoint_resolver_gen.go +++ b/internal/service/servicediscovery/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ servicediscovery.EndpointResolverV2 = resolverSDKv2{} +var _ servicediscovery.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver servicediscovery.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: servicediscovery.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params servicediscovery.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.ToBool(params.UseFIPS) diff --git a/internal/service/servicediscovery/service_package_gen.go b/internal/service/servicediscovery/service_package_gen.go index b893323514b..15fdc896cf3 100644 --- a/internal/service/servicediscovery/service_package_gen.go +++ b/internal/service/servicediscovery/service_package_gen.go @@ -93,7 +93,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return servicediscovery.NewFromConfig(cfg, - servicediscovery.WithEndpointResolverV2(newEndpointResolverSDKv2()), + servicediscovery.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From ba71a532071b3d4fae16c9c268fa6b5c14b6b454 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:24 -0400 Subject: [PATCH 949/981] Rename endpoint resolver struct type - servicequotas. --- .../servicequotas/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/servicequotas/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/servicequotas/service_endpoint_resolver_gen.go b/internal/service/servicequotas/service_endpoint_resolver_gen.go index 80847044d60..c8782ad4935 100644 --- a/internal/service/servicequotas/service_endpoint_resolver_gen.go +++ b/internal/service/servicequotas/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ servicequotas.EndpointResolverV2 = resolverSDKv2{} +var _ servicequotas.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver servicequotas.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: servicequotas.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params servicequotas.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.ToBool(params.UseFIPS) diff --git a/internal/service/servicequotas/service_package_gen.go b/internal/service/servicequotas/service_package_gen.go index 3dd5393215c..21176eaab84 100644 --- a/internal/service/servicequotas/service_package_gen.go +++ b/internal/service/servicequotas/service_package_gen.go @@ -67,7 +67,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return servicequotas.NewFromConfig(cfg, - servicequotas.WithEndpointResolverV2(newEndpointResolverSDKv2()), + servicequotas.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 6c38a51d0285a8d242168f4ef887632acc5dd91a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:24 -0400 Subject: [PATCH 950/981] Rename endpoint resolver struct type - ses. --- internal/service/ses/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/ses/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/ses/service_endpoint_resolver_gen.go b/internal/service/ses/service_endpoint_resolver_gen.go index 6693c1c206b..18d0abf603b 100644 --- a/internal/service/ses/service_endpoint_resolver_gen.go +++ b/internal/service/ses/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ ses.EndpointResolverV2 = resolverSDKv2{} +var _ ses.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver ses.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: ses.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params ses.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.ToBool(params.UseFIPS) diff --git a/internal/service/ses/service_package_gen.go b/internal/service/ses/service_package_gen.go index 3db70418bb8..6f94aa11f3e 100644 --- a/internal/service/ses/service_package_gen.go +++ b/internal/service/ses/service_package_gen.go @@ -126,7 +126,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return ses.NewFromConfig(cfg, - ses.WithEndpointResolverV2(newEndpointResolverSDKv2()), + ses.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 86bf20e0cb59949aff0150719045444c06d0b1f0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:25 -0400 Subject: [PATCH 951/981] Rename endpoint resolver struct type - sesv2. --- .../service/sesv2/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/sesv2/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/sesv2/service_endpoint_resolver_gen.go b/internal/service/sesv2/service_endpoint_resolver_gen.go index b8920b3687a..7bb572de143 100644 --- a/internal/service/sesv2/service_endpoint_resolver_gen.go +++ b/internal/service/sesv2/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ sesv2.EndpointResolverV2 = resolverSDKv2{} +var _ sesv2.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver sesv2.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: sesv2.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params sesv2.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.ToBool(params.UseFIPS) diff --git a/internal/service/sesv2/service_package_gen.go b/internal/service/sesv2/service_package_gen.go index dea3f0951df..055a446a204 100644 --- a/internal/service/sesv2/service_package_gen.go +++ b/internal/service/sesv2/service_package_gen.go @@ -137,7 +137,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return sesv2.NewFromConfig(cfg, - sesv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + sesv2.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 3b5ea31fa0650548e09703395d849bf6535d36e0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:25 -0400 Subject: [PATCH 952/981] Rename endpoint resolver struct type - sfn. --- internal/service/sfn/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/sfn/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/sfn/service_endpoint_resolver_gen.go b/internal/service/sfn/service_endpoint_resolver_gen.go index 5f940dbca6d..8a46a815fab 100644 --- a/internal/service/sfn/service_endpoint_resolver_gen.go +++ b/internal/service/sfn/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ sfn.EndpointResolverV2 = resolverSDKv2{} +var _ sfn.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver sfn.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: sfn.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params sfn.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.ToBool(params.UseFIPS) diff --git a/internal/service/sfn/service_package_gen.go b/internal/service/sfn/service_package_gen.go index ba30e06c857..c213f0bfd59 100644 --- a/internal/service/sfn/service_package_gen.go +++ b/internal/service/sfn/service_package_gen.go @@ -82,7 +82,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return sfn.NewFromConfig(cfg, - sfn.WithEndpointResolverV2(newEndpointResolverSDKv2()), + sfn.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 4b8aac0f943353b8ab46ad023b5a72f5c6fbc62e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:25 -0400 Subject: [PATCH 953/981] Rename endpoint resolver struct type - shield. --- .../service/shield/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/shield/service_package.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/shield/service_endpoint_resolver_gen.go b/internal/service/shield/service_endpoint_resolver_gen.go index 03a663af139..23d84b65d32 100644 --- a/internal/service/shield/service_endpoint_resolver_gen.go +++ b/internal/service/shield/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ shield.EndpointResolverV2 = resolverSDKv2{} +var _ shield.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver shield.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: shield.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params shield.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.ToBool(params.UseFIPS) 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. From e336d9fcffac246e44a696d8545f17cf8536624d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:25 -0400 Subject: [PATCH 954/981] Rename endpoint resolver struct type - signer. --- .../service/signer/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/signer/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/signer/service_endpoint_resolver_gen.go b/internal/service/signer/service_endpoint_resolver_gen.go index e9defc0023b..4456d20a21b 100644 --- a/internal/service/signer/service_endpoint_resolver_gen.go +++ b/internal/service/signer/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ signer.EndpointResolverV2 = resolverSDKv2{} +var _ signer.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver signer.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: signer.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params signer.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.ToBool(params.UseFIPS) diff --git a/internal/service/signer/service_package_gen.go b/internal/service/signer/service_package_gen.go index 724011bafb8..1cd88d5fdfe 100644 --- a/internal/service/signer/service_package_gen.go +++ b/internal/service/signer/service_package_gen.go @@ -65,7 +65,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return signer.NewFromConfig(cfg, - signer.WithEndpointResolverV2(newEndpointResolverSDKv2()), + signer.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From d67529fae24c9cbfd52936b9e758a13d8ae91fd0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:25 -0400 Subject: [PATCH 955/981] Rename endpoint resolver struct type - sns. --- internal/service/sns/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/sns/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/sns/service_endpoint_resolver_gen.go b/internal/service/sns/service_endpoint_resolver_gen.go index c90ad98438b..6fb32a73767 100644 --- a/internal/service/sns/service_endpoint_resolver_gen.go +++ b/internal/service/sns/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ sns.EndpointResolverV2 = resolverSDKv2{} +var _ sns.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver sns.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: sns.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params sns.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.ToBool(params.UseFIPS) diff --git a/internal/service/sns/service_package_gen.go b/internal/service/sns/service_package_gen.go index 5bf81b366f8..8e714e972d1 100644 --- a/internal/service/sns/service_package_gen.go +++ b/internal/service/sns/service_package_gen.go @@ -76,7 +76,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return sns.NewFromConfig(cfg, - sns.WithEndpointResolverV2(newEndpointResolverSDKv2()), + sns.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From db0bd45636ba123509e07736e4edc6b0320a9579 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:25 -0400 Subject: [PATCH 956/981] Rename endpoint resolver struct type - sqs. --- internal/service/sqs/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/sqs/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/sqs/service_endpoint_resolver_gen.go b/internal/service/sqs/service_endpoint_resolver_gen.go index 1312b0b89ef..7f2413f026c 100644 --- a/internal/service/sqs/service_endpoint_resolver_gen.go +++ b/internal/service/sqs/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ sqs.EndpointResolverV2 = resolverSDKv2{} +var _ sqs.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver sqs.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: sqs.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params sqs.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.ToBool(params.UseFIPS) diff --git a/internal/service/sqs/service_package_gen.go b/internal/service/sqs/service_package_gen.go index 2f2f444ba51..21b1d217ee0 100644 --- a/internal/service/sqs/service_package_gen.go +++ b/internal/service/sqs/service_package_gen.go @@ -72,7 +72,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return sqs.NewFromConfig(cfg, - sqs.WithEndpointResolverV2(newEndpointResolverSDKv2()), + sqs.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From f120905705567ed645d18db850ebfa10ee965e08 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:25 -0400 Subject: [PATCH 957/981] Rename endpoint resolver struct type - ssm. --- internal/service/ssm/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/ssm/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/ssm/service_endpoint_resolver_gen.go b/internal/service/ssm/service_endpoint_resolver_gen.go index 297a9053f0e..3c998074a29 100644 --- a/internal/service/ssm/service_endpoint_resolver_gen.go +++ b/internal/service/ssm/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ ssm.EndpointResolverV2 = resolverSDKv2{} +var _ ssm.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver ssm.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: ssm.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params ssm.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.ToBool(params.UseFIPS) diff --git a/internal/service/ssm/service_package_gen.go b/internal/service/ssm/service_package_gen.go index 96fdf2bf4c3..275f94edf23 100644 --- a/internal/service/ssm/service_package_gen.go +++ b/internal/service/ssm/service_package_gen.go @@ -157,7 +157,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return ssm.NewFromConfig(cfg, - ssm.WithEndpointResolverV2(newEndpointResolverSDKv2()), + ssm.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 27b34e3e40b6bec5c9a815df8327cee5ede94d64 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:25 -0400 Subject: [PATCH 958/981] Rename endpoint resolver struct type - ssmcontacts. --- .../ssmcontacts/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/ssmcontacts/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/ssmcontacts/service_endpoint_resolver_gen.go b/internal/service/ssmcontacts/service_endpoint_resolver_gen.go index 5de3f9e29d6..42d4dd09520 100644 --- a/internal/service/ssmcontacts/service_endpoint_resolver_gen.go +++ b/internal/service/ssmcontacts/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ ssmcontacts.EndpointResolverV2 = resolverSDKv2{} +var _ ssmcontacts.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver ssmcontacts.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: ssmcontacts.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params ssmcontacts.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.ToBool(params.UseFIPS) diff --git a/internal/service/ssmcontacts/service_package_gen.go b/internal/service/ssmcontacts/service_package_gen.go index aceb69d6bcb..3cb483807b0 100644 --- a/internal/service/ssmcontacts/service_package_gen.go +++ b/internal/service/ssmcontacts/service_package_gen.go @@ -84,7 +84,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return ssmcontacts.NewFromConfig(cfg, - ssmcontacts.WithEndpointResolverV2(newEndpointResolverSDKv2()), + ssmcontacts.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 6853d5fc599991fdaef941855f73b99223e61359 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:25 -0400 Subject: [PATCH 959/981] Rename endpoint resolver struct type - ssmincidents. --- .../ssmincidents/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/ssmincidents/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/ssmincidents/service_endpoint_resolver_gen.go b/internal/service/ssmincidents/service_endpoint_resolver_gen.go index a2f41a3998d..7569f5b26b3 100644 --- a/internal/service/ssmincidents/service_endpoint_resolver_gen.go +++ b/internal/service/ssmincidents/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ ssmincidents.EndpointResolverV2 = resolverSDKv2{} +var _ ssmincidents.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver ssmincidents.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: ssmincidents.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params ssmincidents.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.ToBool(params.UseFIPS) diff --git a/internal/service/ssmincidents/service_package_gen.go b/internal/service/ssmincidents/service_package_gen.go index e492f704517..837ead63079 100644 --- a/internal/service/ssmincidents/service_package_gen.go +++ b/internal/service/ssmincidents/service_package_gen.go @@ -65,7 +65,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return ssmincidents.NewFromConfig(cfg, - ssmincidents.WithEndpointResolverV2(newEndpointResolverSDKv2()), + ssmincidents.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 93b16c2b989ed6fc4dc4e00423096a8214157b15 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:25 -0400 Subject: [PATCH 960/981] Rename endpoint resolver struct type - ssmquicksetup. --- .../ssmquicksetup/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/ssmquicksetup/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/ssmquicksetup/service_endpoint_resolver_gen.go b/internal/service/ssmquicksetup/service_endpoint_resolver_gen.go index ee4794ff6c9..c2830fd2dff 100644 --- a/internal/service/ssmquicksetup/service_endpoint_resolver_gen.go +++ b/internal/service/ssmquicksetup/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ ssmquicksetup.EndpointResolverV2 = resolverSDKv2{} +var _ ssmquicksetup.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver ssmquicksetup.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: ssmquicksetup.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params ssmquicksetup.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.ToBool(params.UseFIPS) diff --git a/internal/service/ssmquicksetup/service_package_gen.go b/internal/service/ssmquicksetup/service_package_gen.go index eeb9b55cb1a..9180511d137 100644 --- a/internal/service/ssmquicksetup/service_package_gen.go +++ b/internal/service/ssmquicksetup/service_package_gen.go @@ -39,7 +39,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return ssmquicksetup.NewFromConfig(cfg, - ssmquicksetup.WithEndpointResolverV2(newEndpointResolverSDKv2()), + ssmquicksetup.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 007122f06fbd40180a69bb5dd58467ebeb2b6ffa Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:25 -0400 Subject: [PATCH 961/981] Rename endpoint resolver struct type - ssmsap. --- .../service/ssmsap/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/ssmsap/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/ssmsap/service_endpoint_resolver_gen.go b/internal/service/ssmsap/service_endpoint_resolver_gen.go index 613b7ceece4..bb2cb6c76f4 100644 --- a/internal/service/ssmsap/service_endpoint_resolver_gen.go +++ b/internal/service/ssmsap/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ ssmsap.EndpointResolverV2 = resolverSDKv2{} +var _ ssmsap.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver ssmsap.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: ssmsap.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params ssmsap.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.ToBool(params.UseFIPS) diff --git a/internal/service/ssmsap/service_package_gen.go b/internal/service/ssmsap/service_package_gen.go index d14b2b714ab..b69538d93d4 100644 --- a/internal/service/ssmsap/service_package_gen.go +++ b/internal/service/ssmsap/service_package_gen.go @@ -39,7 +39,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return ssmsap.NewFromConfig(cfg, - ssmsap.WithEndpointResolverV2(newEndpointResolverSDKv2()), + ssmsap.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 71410f98494f56c24c0be9772e07d143d9d403cb Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:26 -0400 Subject: [PATCH 962/981] Rename endpoint resolver struct type - sso. --- internal/service/sso/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/sso/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/sso/service_endpoint_resolver_gen.go b/internal/service/sso/service_endpoint_resolver_gen.go index b6e21ded4cb..95ed5d597c3 100644 --- a/internal/service/sso/service_endpoint_resolver_gen.go +++ b/internal/service/sso/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ sso.EndpointResolverV2 = resolverSDKv2{} +var _ sso.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver sso.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: sso.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params sso.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.ToBool(params.UseFIPS) diff --git a/internal/service/sso/service_package_gen.go b/internal/service/sso/service_package_gen.go index b61aa8ebcdc..6361d438169 100644 --- a/internal/service/sso/service_package_gen.go +++ b/internal/service/sso/service_package_gen.go @@ -39,7 +39,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return sso.NewFromConfig(cfg, - sso.WithEndpointResolverV2(newEndpointResolverSDKv2()), + sso.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 727abd1ea8eec171c72861ce6bcbd04ced92965b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:26 -0400 Subject: [PATCH 963/981] Rename endpoint resolver struct type - ssoadmin. --- .../service/ssoadmin/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/ssoadmin/service_package.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/ssoadmin/service_endpoint_resolver_gen.go b/internal/service/ssoadmin/service_endpoint_resolver_gen.go index 85b646dd3e1..b05be0b0520 100644 --- a/internal/service/ssoadmin/service_endpoint_resolver_gen.go +++ b/internal/service/ssoadmin/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ ssoadmin.EndpointResolverV2 = resolverSDKv2{} +var _ ssoadmin.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver ssoadmin.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: ssoadmin.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params ssoadmin.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.ToBool(params.UseFIPS) 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 { From 7789096d210495f1a2b3e409bb5425fdc7c18eee Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:26 -0400 Subject: [PATCH 964/981] Rename endpoint resolver struct type - storagegateway. --- .../storagegateway/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/storagegateway/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/storagegateway/service_endpoint_resolver_gen.go b/internal/service/storagegateway/service_endpoint_resolver_gen.go index 2138b7d498a..53a0721391a 100644 --- a/internal/service/storagegateway/service_endpoint_resolver_gen.go +++ b/internal/service/storagegateway/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ storagegateway.EndpointResolverV2 = resolverSDKv2{} +var _ storagegateway.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver storagegateway.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: storagegateway.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params storagegateway.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.ToBool(params.UseFIPS) diff --git a/internal/service/storagegateway/service_package_gen.go b/internal/service/storagegateway/service_package_gen.go index d6a321112f0..1245fcc18ee 100644 --- a/internal/service/storagegateway/service_package_gen.go +++ b/internal/service/storagegateway/service_package_gen.go @@ -117,7 +117,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return storagegateway.NewFromConfig(cfg, - storagegateway.WithEndpointResolverV2(newEndpointResolverSDKv2()), + storagegateway.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 78ad3ba64b44ae24452e3537f6eff726fae6ef92 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:26 -0400 Subject: [PATCH 965/981] Rename endpoint resolver struct type - sts. --- internal/service/sts/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/sts/service_package.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/sts/service_endpoint_resolver_gen.go b/internal/service/sts/service_endpoint_resolver_gen.go index 971b01b6325..a004a0d5457 100644 --- a/internal/service/sts/service_endpoint_resolver_gen.go +++ b/internal/service/sts/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ sts.EndpointResolverV2 = resolverSDKv2{} +var _ sts.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver sts.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: sts.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params sts.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.ToBool(params.UseFIPS) 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 != "" { From dddda81a32e0515610388e3f8e37d6b236f8fb68 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:26 -0400 Subject: [PATCH 966/981] Rename endpoint resolver struct type - swf. --- internal/service/swf/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/swf/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/swf/service_endpoint_resolver_gen.go b/internal/service/swf/service_endpoint_resolver_gen.go index 57538c2990a..42f649d27d2 100644 --- a/internal/service/swf/service_endpoint_resolver_gen.go +++ b/internal/service/swf/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ swf.EndpointResolverV2 = resolverSDKv2{} +var _ swf.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver swf.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: swf.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params swf.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.ToBool(params.UseFIPS) diff --git a/internal/service/swf/service_package_gen.go b/internal/service/swf/service_package_gen.go index b9074973fde..4e40b247c1c 100644 --- a/internal/service/swf/service_package_gen.go +++ b/internal/service/swf/service_package_gen.go @@ -48,7 +48,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return swf.NewFromConfig(cfg, - swf.WithEndpointResolverV2(newEndpointResolverSDKv2()), + swf.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From cf92aa451fac957ee72580234b672c7697666414 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:26 -0400 Subject: [PATCH 967/981] Rename endpoint resolver struct type - synthetics. --- .../synthetics/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/synthetics/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/synthetics/service_endpoint_resolver_gen.go b/internal/service/synthetics/service_endpoint_resolver_gen.go index a34909806f1..c9f76544d5c 100644 --- a/internal/service/synthetics/service_endpoint_resolver_gen.go +++ b/internal/service/synthetics/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ synthetics.EndpointResolverV2 = resolverSDKv2{} +var _ synthetics.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver synthetics.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: synthetics.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params synthetics.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.ToBool(params.UseFIPS) diff --git a/internal/service/synthetics/service_package_gen.go b/internal/service/synthetics/service_package_gen.go index 0bef3fda811..29bcb75c8ce 100644 --- a/internal/service/synthetics/service_package_gen.go +++ b/internal/service/synthetics/service_package_gen.go @@ -70,7 +70,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return synthetics.NewFromConfig(cfg, - synthetics.WithEndpointResolverV2(newEndpointResolverSDKv2()), + synthetics.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 658dd16940a8b6f4c9228f04ac158df7b37bd02a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:26 -0400 Subject: [PATCH 968/981] Rename endpoint resolver struct type - timestreaminfluxdb. --- .../service_endpoint_resolver_gen.go | 10 +++++----- .../service/timestreaminfluxdb/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/timestreaminfluxdb/service_endpoint_resolver_gen.go b/internal/service/timestreaminfluxdb/service_endpoint_resolver_gen.go index a6a741b4bb9..6e6d8616c87 100644 --- a/internal/service/timestreaminfluxdb/service_endpoint_resolver_gen.go +++ b/internal/service/timestreaminfluxdb/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ timestreaminfluxdb.EndpointResolverV2 = resolverSDKv2{} +var _ timestreaminfluxdb.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver timestreaminfluxdb.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: timestreaminfluxdb.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params timestreaminfluxdb.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.ToBool(params.UseFIPS) diff --git a/internal/service/timestreaminfluxdb/service_package_gen.go b/internal/service/timestreaminfluxdb/service_package_gen.go index 876713bd5ed..a2e1ba818bb 100644 --- a/internal/service/timestreaminfluxdb/service_package_gen.go +++ b/internal/service/timestreaminfluxdb/service_package_gen.go @@ -47,7 +47,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return timestreaminfluxdb.NewFromConfig(cfg, - timestreaminfluxdb.WithEndpointResolverV2(newEndpointResolverSDKv2()), + timestreaminfluxdb.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 63544e97e02effbb9953ace1b20d90de59086e23 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:26 -0400 Subject: [PATCH 969/981] Rename endpoint resolver struct type - timestreamwrite. --- .../timestreamwrite/service_endpoint_resolver_gen.go | 10 +++++----- .../service/timestreamwrite/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/timestreamwrite/service_endpoint_resolver_gen.go b/internal/service/timestreamwrite/service_endpoint_resolver_gen.go index 218b5e9af7a..60605316f15 100644 --- a/internal/service/timestreamwrite/service_endpoint_resolver_gen.go +++ b/internal/service/timestreamwrite/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ timestreamwrite.EndpointResolverV2 = resolverSDKv2{} +var _ timestreamwrite.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver timestreamwrite.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: timestreamwrite.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params timestreamwrite.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.ToBool(params.UseFIPS) diff --git a/internal/service/timestreamwrite/service_package_gen.go b/internal/service/timestreamwrite/service_package_gen.go index 4c4b7ebf21a..62fee889e3d 100644 --- a/internal/service/timestreamwrite/service_package_gen.go +++ b/internal/service/timestreamwrite/service_package_gen.go @@ -65,7 +65,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return timestreamwrite.NewFromConfig(cfg, - timestreamwrite.WithEndpointResolverV2(newEndpointResolverSDKv2()), + timestreamwrite.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 94fbe0a7a31f38eb6e2882a092725754706e6fb6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:26 -0400 Subject: [PATCH 970/981] Rename endpoint resolver struct type - transcribe. --- .../transcribe/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/transcribe/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/transcribe/service_endpoint_resolver_gen.go b/internal/service/transcribe/service_endpoint_resolver_gen.go index d56ce6216f2..408d3986098 100644 --- a/internal/service/transcribe/service_endpoint_resolver_gen.go +++ b/internal/service/transcribe/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ transcribe.EndpointResolverV2 = resolverSDKv2{} +var _ transcribe.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver transcribe.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: transcribe.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params transcribe.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.ToBool(params.UseFIPS) diff --git a/internal/service/transcribe/service_package_gen.go b/internal/service/transcribe/service_package_gen.go index d76b6bc3e7d..6f3365477bc 100644 --- a/internal/service/transcribe/service_package_gen.go +++ b/internal/service/transcribe/service_package_gen.go @@ -72,7 +72,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return transcribe.NewFromConfig(cfg, - transcribe.WithEndpointResolverV2(newEndpointResolverSDKv2()), + transcribe.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 408ec6024856a0f23b8993ab7fe2c06f6114964f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:26 -0400 Subject: [PATCH 971/981] Rename endpoint resolver struct type - transfer. --- .../service/transfer/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/transfer/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/transfer/service_endpoint_resolver_gen.go b/internal/service/transfer/service_endpoint_resolver_gen.go index 333e77b0503..751de739bf9 100644 --- a/internal/service/transfer/service_endpoint_resolver_gen.go +++ b/internal/service/transfer/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ transfer.EndpointResolverV2 = resolverSDKv2{} +var _ transfer.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver transfer.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: transfer.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params transfer.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.ToBool(params.UseFIPS) diff --git a/internal/service/transfer/service_package_gen.go b/internal/service/transfer/service_package_gen.go index 78f01a01439..9b0bf6b2ef4 100644 --- a/internal/service/transfer/service_package_gen.go +++ b/internal/service/transfer/service_package_gen.go @@ -125,7 +125,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return transfer.NewFromConfig(cfg, - transfer.WithEndpointResolverV2(newEndpointResolverSDKv2()), + transfer.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From b2503d63a285092f796a3aa7970c284e7733ea07 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:26 -0400 Subject: [PATCH 972/981] Rename endpoint resolver struct type - verifiedpermissions. --- .../service_endpoint_resolver_gen.go | 10 +++++----- .../service/verifiedpermissions/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/verifiedpermissions/service_endpoint_resolver_gen.go b/internal/service/verifiedpermissions/service_endpoint_resolver_gen.go index b8bb5f4cc80..db962ad42bf 100644 --- a/internal/service/verifiedpermissions/service_endpoint_resolver_gen.go +++ b/internal/service/verifiedpermissions/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ verifiedpermissions.EndpointResolverV2 = resolverSDKv2{} +var _ verifiedpermissions.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver verifiedpermissions.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: verifiedpermissions.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params verifiedpermissions.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.ToBool(params.UseFIPS) diff --git a/internal/service/verifiedpermissions/service_package_gen.go b/internal/service/verifiedpermissions/service_package_gen.go index 8d27a6ecd4d..ce18b04e163 100644 --- a/internal/service/verifiedpermissions/service_package_gen.go +++ b/internal/service/verifiedpermissions/service_package_gen.go @@ -65,7 +65,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return verifiedpermissions.NewFromConfig(cfg, - verifiedpermissions.WithEndpointResolverV2(newEndpointResolverSDKv2()), + verifiedpermissions.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 7171eabe31c1e7d81cb1766ffb51a7968641beab Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:26 -0400 Subject: [PATCH 973/981] Rename endpoint resolver struct type - vpclattice. --- .../vpclattice/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/vpclattice/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/vpclattice/service_endpoint_resolver_gen.go b/internal/service/vpclattice/service_endpoint_resolver_gen.go index 78fc2f62d45..72d43fd3808 100644 --- a/internal/service/vpclattice/service_endpoint_resolver_gen.go +++ b/internal/service/vpclattice/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ vpclattice.EndpointResolverV2 = resolverSDKv2{} +var _ vpclattice.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver vpclattice.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: vpclattice.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params vpclattice.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.ToBool(params.UseFIPS) diff --git a/internal/service/vpclattice/service_package_gen.go b/internal/service/vpclattice/service_package_gen.go index beb976f18fe..c4de48eacc2 100644 --- a/internal/service/vpclattice/service_package_gen.go +++ b/internal/service/vpclattice/service_package_gen.go @@ -144,7 +144,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return vpclattice.NewFromConfig(cfg, - vpclattice.WithEndpointResolverV2(newEndpointResolverSDKv2()), + vpclattice.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From e810a86ce7fa0cc4c70f20675db321bfa0a74892 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:27 -0400 Subject: [PATCH 974/981] Rename endpoint resolver struct type - waf. --- internal/service/waf/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/waf/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/waf/service_endpoint_resolver_gen.go b/internal/service/waf/service_endpoint_resolver_gen.go index 2e589d7b719..7250bd6d46e 100644 --- a/internal/service/waf/service_endpoint_resolver_gen.go +++ b/internal/service/waf/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ waf.EndpointResolverV2 = resolverSDKv2{} +var _ waf.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver waf.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: waf.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params waf.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.ToBool(params.UseFIPS) diff --git a/internal/service/waf/service_package_gen.go b/internal/service/waf/service_package_gen.go index 0621c391f99..b5108a075f3 100644 --- a/internal/service/waf/service_package_gen.go +++ b/internal/service/waf/service_package_gen.go @@ -138,7 +138,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return waf.NewFromConfig(cfg, - waf.WithEndpointResolverV2(newEndpointResolverSDKv2()), + waf.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 9006ab801396dcc13101866019d29004775fa8d2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:27 -0400 Subject: [PATCH 975/981] Rename endpoint resolver struct type - wafregional. --- .../wafregional/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/wafregional/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/wafregional/service_endpoint_resolver_gen.go b/internal/service/wafregional/service_endpoint_resolver_gen.go index f3f52ceba53..1baaa5ef61c 100644 --- a/internal/service/wafregional/service_endpoint_resolver_gen.go +++ b/internal/service/wafregional/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ wafregional.EndpointResolverV2 = resolverSDKv2{} +var _ wafregional.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver wafregional.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: wafregional.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params wafregional.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.ToBool(params.UseFIPS) diff --git a/internal/service/wafregional/service_package_gen.go b/internal/service/wafregional/service_package_gen.go index 0263a91e794..19294adb8a6 100644 --- a/internal/service/wafregional/service_package_gen.go +++ b/internal/service/wafregional/service_package_gen.go @@ -143,7 +143,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return wafregional.NewFromConfig(cfg, - wafregional.WithEndpointResolverV2(newEndpointResolverSDKv2()), + wafregional.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From bf60f56d5766da0c742d17df81e4c16fae0a983d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:27 -0400 Subject: [PATCH 976/981] Rename endpoint resolver struct type - wafv2. --- .../service/wafv2/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/wafv2/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/wafv2/service_endpoint_resolver_gen.go b/internal/service/wafv2/service_endpoint_resolver_gen.go index 6d73ed3262c..bfaf551e2ca 100644 --- a/internal/service/wafv2/service_endpoint_resolver_gen.go +++ b/internal/service/wafv2/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ wafv2.EndpointResolverV2 = resolverSDKv2{} +var _ wafv2.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver wafv2.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: wafv2.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params wafv2.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.ToBool(params.UseFIPS) diff --git a/internal/service/wafv2/service_package_gen.go b/internal/service/wafv2/service_package_gen.go index 0d31e636c35..faaf5c12588 100644 --- a/internal/service/wafv2/service_package_gen.go +++ b/internal/service/wafv2/service_package_gen.go @@ -103,7 +103,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return wafv2.NewFromConfig(cfg, - wafv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), + wafv2.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 28e44a70d55213fe1ac42f842fb490ab3b464237 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:27 -0400 Subject: [PATCH 977/981] Rename endpoint resolver struct type - wellarchitected. --- .../wellarchitected/service_endpoint_resolver_gen.go | 10 +++++----- .../service/wellarchitected/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/wellarchitected/service_endpoint_resolver_gen.go b/internal/service/wellarchitected/service_endpoint_resolver_gen.go index 359bfdd22dd..37d1771b72a 100644 --- a/internal/service/wellarchitected/service_endpoint_resolver_gen.go +++ b/internal/service/wellarchitected/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ wellarchitected.EndpointResolverV2 = resolverSDKv2{} +var _ wellarchitected.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver wellarchitected.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: wellarchitected.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params wellarchitected.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.ToBool(params.UseFIPS) diff --git a/internal/service/wellarchitected/service_package_gen.go b/internal/service/wellarchitected/service_package_gen.go index caf4ca06972..33322af0ec6 100644 --- a/internal/service/wellarchitected/service_package_gen.go +++ b/internal/service/wellarchitected/service_package_gen.go @@ -39,7 +39,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return wellarchitected.NewFromConfig(cfg, - wellarchitected.WithEndpointResolverV2(newEndpointResolverSDKv2()), + wellarchitected.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From acc465638a866e9a97da193feedb17a6d6443876 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:27 -0400 Subject: [PATCH 978/981] Rename endpoint resolver struct type - worklink. --- .../service/worklink/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/worklink/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/worklink/service_endpoint_resolver_gen.go b/internal/service/worklink/service_endpoint_resolver_gen.go index a6af671fe7e..e35d7e1d6c4 100644 --- a/internal/service/worklink/service_endpoint_resolver_gen.go +++ b/internal/service/worklink/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ worklink.EndpointResolverV2 = resolverSDKv2{} +var _ worklink.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver worklink.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: worklink.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params worklink.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.ToBool(params.UseFIPS) diff --git a/internal/service/worklink/service_package_gen.go b/internal/service/worklink/service_package_gen.go index a8464c40e4f..48eb543cb67 100644 --- a/internal/service/worklink/service_package_gen.go +++ b/internal/service/worklink/service_package_gen.go @@ -50,7 +50,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return worklink.NewFromConfig(cfg, - worklink.WithEndpointResolverV2(newEndpointResolverSDKv2()), + worklink.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 2e5d649c3e847305f3403c90568c56408a8fa081 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:27 -0400 Subject: [PATCH 979/981] Rename endpoint resolver struct type - workspaces. --- .../workspaces/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/workspaces/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/workspaces/service_endpoint_resolver_gen.go b/internal/service/workspaces/service_endpoint_resolver_gen.go index 1994fc864c7..f490c10c28e 100644 --- a/internal/service/workspaces/service_endpoint_resolver_gen.go +++ b/internal/service/workspaces/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ workspaces.EndpointResolverV2 = resolverSDKv2{} +var _ workspaces.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver workspaces.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: workspaces.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params workspaces.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.ToBool(params.UseFIPS) diff --git a/internal/service/workspaces/service_package_gen.go b/internal/service/workspaces/service_package_gen.go index 247694d5d9a..0b436e16392 100644 --- a/internal/service/workspaces/service_package_gen.go +++ b/internal/service/workspaces/service_package_gen.go @@ -99,7 +99,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return workspaces.NewFromConfig(cfg, - workspaces.WithEndpointResolverV2(newEndpointResolverSDKv2()), + workspaces.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From 74a1273f6828677cba3e3ecdbe1ed55aa8400145 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:27 -0400 Subject: [PATCH 980/981] Rename endpoint resolver struct type - workspacesweb. --- .../workspacesweb/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/workspacesweb/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/workspacesweb/service_endpoint_resolver_gen.go b/internal/service/workspacesweb/service_endpoint_resolver_gen.go index 87d7b6f8afd..cdb424937fc 100644 --- a/internal/service/workspacesweb/service_endpoint_resolver_gen.go +++ b/internal/service/workspacesweb/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ workspacesweb.EndpointResolverV2 = resolverSDKv2{} +var _ workspacesweb.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver workspacesweb.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: workspacesweb.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params workspacesweb.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.ToBool(params.UseFIPS) diff --git a/internal/service/workspacesweb/service_package_gen.go b/internal/service/workspacesweb/service_package_gen.go index e0d60d38376..c0172574841 100644 --- a/internal/service/workspacesweb/service_package_gen.go +++ b/internal/service/workspacesweb/service_package_gen.go @@ -39,7 +39,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return workspacesweb.NewFromConfig(cfg, - workspacesweb.WithEndpointResolverV2(newEndpointResolverSDKv2()), + workspacesweb.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil } From f43950309394fdd17caf51fa5f0cdbda2e38850e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 23 Oct 2024 11:18:27 -0400 Subject: [PATCH 981/981] Rename endpoint resolver struct type - xray. --- internal/service/xray/service_endpoint_resolver_gen.go | 10 +++++----- internal/service/xray/service_package_gen.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/xray/service_endpoint_resolver_gen.go b/internal/service/xray/service_endpoint_resolver_gen.go index b196afe9383..5af164b38b6 100644 --- a/internal/service/xray/service_endpoint_resolver_gen.go +++ b/internal/service/xray/service_endpoint_resolver_gen.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" ) -var _ xray.EndpointResolverV2 = resolverSDKv2{} +var _ xray.EndpointResolverV2 = resolverV2{} -type resolverSDKv2 struct { +type resolverV2 struct { defaultResolver xray.EndpointResolverV2 } -func newEndpointResolverSDKv2() resolverSDKv2 { - return resolverSDKv2{ +func newEndpointResolverV2() resolverV2 { + return resolverV2{ defaultResolver: xray.NewDefaultEndpointResolverV2(), } } -func (r resolverSDKv2) ResolveEndpoint(ctx context.Context, params xray.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.ToBool(params.UseFIPS) diff --git a/internal/service/xray/service_package_gen.go b/internal/service/xray/service_package_gen.go index 380a168ddbb..cd8d7c85439 100644 --- a/internal/service/xray/service_package_gen.go +++ b/internal/service/xray/service_package_gen.go @@ -60,7 +60,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return xray.NewFromConfig(cfg, - xray.WithEndpointResolverV2(newEndpointResolverSDKv2()), + xray.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), ), nil }