diff --git a/.changelog/954dde1360ef407d8ecb138e35fd6534.json b/.changelog/954dde1360ef407d8ecb138e35fd6534.json new file mode 100644 index 00000000000..14cc9747286 --- /dev/null +++ b/.changelog/954dde1360ef407d8ecb138e35fd6534.json @@ -0,0 +1,8 @@ +{ + "id": "954dde13-60ef-407d-8ecb-138e35fd6534", + "type": "feature", + "description": "Add support for specifying `EndpointResolverWithOptions` on `LoadOptions`, and associated `WithEndpointResolverWithOptions`.", + "modules": [ + "config" + ] +} diff --git a/.changelog/f0080c1f15ae43c5a697801297110714.json b/.changelog/f0080c1f15ae43c5a697801297110714.json new file mode 100644 index 00000000000..ce58ca2f8aa --- /dev/null +++ b/.changelog/f0080c1f15ae43c5a697801297110714.json @@ -0,0 +1,309 @@ +{ + "id": "f0080c1f-15ae-43c5-a697-801297110714", + "type": "bugfix", + "collapse": true, + "description": "Fixes a bug that prevented aws.EndpointResolverWithOptions from being used by the service client.", + "modules": [ + "internal/protocoltest/awsrestjson", + "internal/protocoltest/ec2query", + "internal/protocoltest/jsonrpc", + "internal/protocoltest/jsonrpc10", + "internal/protocoltest/query", + "internal/protocoltest/restxml", + "internal/protocoltest/restxmlwithnamespace", + "service/accessanalyzer", + "service/account", + "service/acm", + "service/acmpca", + "service/alexaforbusiness", + "service/amp", + "service/amplify", + "service/amplifybackend", + "service/apigateway", + "service/apigatewaymanagementapi", + "service/apigatewayv2", + "service/appconfig", + "service/appconfigdata", + "service/appflow", + "service/appintegrations", + "service/applicationautoscaling", + "service/applicationcostprofiler", + "service/applicationdiscoveryservice", + "service/applicationinsights", + "service/appmesh", + "service/apprunner", + "service/appstream", + "service/appsync", + "service/athena", + "service/auditmanager", + "service/autoscaling", + "service/autoscalingplans", + "service/backup", + "service/batch", + "service/braket", + "service/budgets", + "service/chime", + "service/chimesdkidentity", + "service/chimesdkmeetings", + "service/chimesdkmessaging", + "service/cloud9", + "service/cloudcontrol", + "service/clouddirectory", + "service/cloudformation", + "service/cloudfront", + "service/cloudhsm", + "service/cloudhsmv2", + "service/cloudsearch", + "service/cloudsearchdomain", + "service/cloudtrail", + "service/cloudwatch", + "service/cloudwatchevents", + "service/cloudwatchlogs", + "service/codeartifact", + "service/codebuild", + "service/codecommit", + "service/codedeploy", + "service/codeguruprofiler", + "service/codegurureviewer", + "service/codepipeline", + "service/codestar", + "service/codestarconnections", + "service/codestarnotifications", + "service/cognitoidentity", + "service/cognitoidentityprovider", + "service/cognitosync", + "service/comprehend", + "service/comprehendmedical", + "service/computeoptimizer", + "service/configservice", + "service/connect", + "service/connectcontactlens", + "service/connectparticipant", + "service/costandusagereportservice", + "service/costexplorer", + "service/customerprofiles", + "service/databasemigrationservice", + "service/databrew", + "service/dataexchange", + "service/datapipeline", + "service/datasync", + "service/dax", + "service/detective", + "service/devicefarm", + "service/devopsguru", + "service/directconnect", + "service/directoryservice", + "service/dlm", + "service/docdb", + "service/drs", + "service/dynamodb", + "service/dynamodbstreams", + "service/ebs", + "service/ec2", + "service/ec2instanceconnect", + "service/ecr", + "service/ecrpublic", + "service/ecs", + "service/efs", + "service/eks", + "service/elasticache", + "service/elasticbeanstalk", + "service/elasticinference", + "service/elasticloadbalancing", + "service/elasticloadbalancingv2", + "service/elasticsearchservice", + "service/elastictranscoder", + "service/emr", + "service/emrcontainers", + "service/eventbridge", + "service/evidently", + "service/finspace", + "service/finspacedata", + "service/firehose", + "service/fis", + "service/fms", + "service/forecast", + "service/forecastquery", + "service/frauddetector", + "service/fsx", + "service/gamelift", + "service/glacier", + "service/globalaccelerator", + "service/glue", + "service/grafana", + "service/greengrass", + "service/greengrassv2", + "service/groundstation", + "service/guardduty", + "service/health", + "service/healthlake", + "service/honeycode", + "service/iam", + "service/identitystore", + "service/imagebuilder", + "service/inspector", + "service/inspector2", + "service/iot", + "service/iot1clickdevicesservice", + "service/iot1clickprojects", + "service/iotanalytics", + "service/iotdataplane", + "service/iotdeviceadvisor", + "service/iotevents", + "service/ioteventsdata", + "service/iotfleethub", + "service/iotjobsdataplane", + "service/iotsecuretunneling", + "service/iotsitewise", + "service/iotthingsgraph", + "service/iotwireless", + "service/ivs", + "service/kafka", + "service/kafkaconnect", + "service/kendra", + "service/kinesis", + "service/kinesisanalytics", + "service/kinesisanalyticsv2", + "service/kinesisvideo", + "service/kinesisvideoarchivedmedia", + "service/kinesisvideomedia", + "service/kinesisvideosignaling", + "service/kms", + "service/lakeformation", + "service/lambda", + "service/lexmodelbuildingservice", + "service/lexmodelsv2", + "service/lexruntimeservice", + "service/lexruntimev2", + "service/licensemanager", + "service/lightsail", + "service/location", + "service/lookoutequipment", + "service/lookoutmetrics", + "service/lookoutvision", + "service/machinelearning", + "service/macie", + "service/macie2", + "service/managedblockchain", + "service/marketplacecatalog", + "service/marketplacecommerceanalytics", + "service/marketplaceentitlementservice", + "service/marketplacemetering", + "service/mediaconnect", + "service/mediaconvert", + "service/medialive", + "service/mediapackage", + "service/mediapackagevod", + "service/mediastore", + "service/mediastoredata", + "service/mediatailor", + "service/memorydb", + "service/mgn", + "service/migrationhub", + "service/migrationhubconfig", + "service/migrationhubrefactorspaces", + "service/migrationhubstrategy", + "service/mobile", + "service/mq", + "service/mturk", + "service/mwaa", + "service/neptune", + "service/networkfirewall", + "service/networkmanager", + "service/nimble", + "service/opensearch", + "service/opsworks", + "service/opsworkscm", + "service/organizations", + "service/outposts", + "service/panorama", + "service/personalize", + "service/personalizeevents", + "service/personalizeruntime", + "service/pi", + "service/pinpoint", + "service/pinpointemail", + "service/pinpointsmsvoice", + "service/polly", + "service/pricing", + "service/proton", + "service/qldb", + "service/qldbsession", + "service/quicksight", + "service/ram", + "service/rbin", + "service/rds", + "service/rdsdata", + "service/redshift", + "service/redshiftdata", + "service/rekognition", + "service/resiliencehub", + "service/resourcegroups", + "service/resourcegroupstaggingapi", + "service/robomaker", + "service/route53", + "service/route53domains", + "service/route53recoverycluster", + "service/route53recoverycontrolconfig", + "service/route53recoveryreadiness", + "service/route53resolver", + "service/rum", + "service/s3", + "service/s3control", + "service/s3outposts", + "service/sagemaker", + "service/sagemakera2iruntime", + "service/sagemakeredge", + "service/sagemakerfeaturestoreruntime", + "service/sagemakerruntime", + "service/savingsplans", + "service/schemas", + "service/secretsmanager", + "service/securityhub", + "service/serverlessapplicationrepository", + "service/servicecatalog", + "service/servicecatalogappregistry", + "service/servicediscovery", + "service/servicequotas", + "service/ses", + "service/sesv2", + "service/sfn", + "service/shield", + "service/signer", + "service/sms", + "service/snowball", + "service/snowdevicemanagement", + "service/sns", + "service/sqs", + "service/ssm", + "service/ssmcontacts", + "service/ssmincidents", + "service/sso", + "service/ssoadmin", + "service/ssooidc", + "service/storagegateway", + "service/sts", + "service/support", + "service/swf", + "service/synthetics", + "service/textract", + "service/timestreamquery", + "service/timestreamwrite", + "service/transcribe", + "service/transcribestreaming", + "service/transfer", + "service/translate", + "service/voiceid", + "service/waf", + "service/wafregional", + "service/wafv2", + "service/wellarchitected", + "service/wisdom", + "service/workdocs", + "service/worklink", + "service/workmail", + "service/workmailmessageflow", + "service/workspaces", + "service/xray" + ] +} \ No newline at end of file diff --git a/aws/config.go b/aws/config.go index 471fbe25b4e..2b346baee77 100644 --- a/aws/config.go +++ b/aws/config.go @@ -39,13 +39,20 @@ type Config struct { HTTPClient HTTPClient // An endpoint resolver that can be used to provide or override an endpoint for the given - // service and region Please see the `aws.EndpointResolver` documentation on usage. + // service and region. + // + // See the `aws.EndpointResolver` documentation for additional usage information. // // Deprecated: See Config.EndpointResolverWithOptions EndpointResolver EndpointResolver // An endpoint resolver that can be used to provide or override an endpoint for the given - // service and region Please see the `aws.EndpointResolverWithOptions` documentation on usage. + // service and region. + // + // When EndpointResolverWithOptions is specified, it will be used by a service client rather than using + // EndpointResolver if also specified. + // + // See the `aws.EndpointResolverWithOptions` documentation for additional usage information. EndpointResolverWithOptions EndpointResolverWithOptions // Retryer is a function that provides a Retryer implementation. A Retryer guides how HTTP requests should be diff --git a/aws/endpoints.go b/aws/endpoints.go index 706f13d2f1d..aa10a9b40f0 100644 --- a/aws/endpoints.go +++ b/aws/endpoints.go @@ -160,22 +160,28 @@ func (e *EndpointNotFoundError) Unwrap() error { // available. If the EndpointResolver returns an EndpointNotFoundError error, // API clients will fallback to attempting to resolve the endpoint using its // internal default endpoint resolver. +// +// Deprecated: See EndpointResolverWithOptions type EndpointResolver interface { ResolveEndpoint(service, region string) (Endpoint, error) } // EndpointResolverFunc wraps a function to satisfy the EndpointResolver interface. +// +// Deprecated: See EndpointResolverWithOptionsFunc type EndpointResolverFunc func(service, region string) (Endpoint, error) // ResolveEndpoint calls the wrapped function and returns the results. +// +// Deprecated: See EndpointResolverWithOptions.ResolveEndpoint func (e EndpointResolverFunc) ResolveEndpoint(service, region string) (Endpoint, error) { return e(service, region) } // EndpointResolverWithOptions is an endpoint resolver that can be used to provide or -// override an endpoint for the given service, region, and the service clients EndpointOptions. API clients will -// attempt to use the EndpointResolver first to resolve an endpoint if -// available. If the EndpointResolver returns an EndpointNotFoundError error, +// override an endpoint for the given service, region, and the service client's EndpointOptions. API clients will +// attempt to use the EndpointResolverWithOptions first to resolve an endpoint if +// available. If the EndpointResolverWithOptions returns an EndpointNotFoundError error, // API clients will fallback to attempting to resolve the endpoint using its // internal default endpoint resolver. type EndpointResolverWithOptions interface { diff --git a/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/AddAwsConfigFields.java b/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/AddAwsConfigFields.java index 2225ba40d6a..bffa70bcdfd 100644 --- a/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/AddAwsConfigFields.java +++ b/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/AddAwsConfigFields.java @@ -203,13 +203,22 @@ private void writeHttpClientResolver(GoWriter writer) { } private void writeAwsConfigEndpointResolver(GoWriter writer) { - writer.openBlock("func $L(cfg aws.Config, o *Options) {", "}", RESOLVE_AWS_CONFIG_ENDPOINT_RESOLVER, () -> { - writer.openBlock("if cfg.$L == nil {", "}", ENDPOINT_RESOLVER_CONFIG_NAME, () -> writer.write("return")); - writer.write("o.$L = $L(cfg.$L, cfg.$L, $L())", ENDPOINT_RESOLVER_CONFIG_NAME, - EndpointGenerator.AWS_ENDPOINT_RESOLVER_HELPER, ENDPOINT_RESOLVER_CONFIG_NAME, - AWS_ENDPOINT_RESOLVER_WITH_OPTIONS, - EndpointGenerator.RESOLVER_CONSTRUCTOR_NAME); - }); + writer.pushState(); + writer.putContext("resolverName", RESOLVE_AWS_CONFIG_ENDPOINT_RESOLVER); + writer.putContext("clientOption", ENDPOINT_RESOLVER_CONFIG_NAME); + writer.putContext("wrapperHelper", EndpointGenerator.AWS_ENDPOINT_RESOLVER_HELPER); + writer.putContext("awsResolver", ENDPOINT_RESOLVER_CONFIG_NAME); + writer.putContext("awsResolverWithOptions", AWS_ENDPOINT_RESOLVER_WITH_OPTIONS); + writer.putContext("newResolver", EndpointGenerator.RESOLVER_CONSTRUCTOR_NAME); + writer.write(""" + func $resolverName:L(cfg aws.Config, o *Options) { + if cfg.$awsResolver:L == nil && cfg.$awsResolverWithOptions:L == nil { + return + } + o.$clientOption:L = $wrapperHelper:L(cfg.$awsResolver:L, cfg.$awsResolverWithOptions:L, $newResolver:L()) + } + """); + writer.popState(); } @Override diff --git a/config/config.go b/config/config.go index fa2df2c822d..83fd1c952f5 100644 --- a/config/config.go +++ b/config/config.go @@ -34,8 +34,10 @@ var defaultAWSConfigResolvers = []awsConfigResolver{ // Sets the endpoint resolving behavior the API Clients will use for making // requests to. Clients default to their own clients this allows overrides - // to be specified. + // to be specified. The resolveEndpointResolver option is deprecated, but we still need to set it for + // backwards compatability on config construction. resolveEndpointResolver, + resolveEndpointResolverWithOptions, // Sets the retry behavior API clients will use within their retry attempt // middleware. Defaults to unset, allowing API clients to define their own diff --git a/config/example_test.go b/config/example_test.go index a81d29a6b93..267bd6944f0 100644 --- a/config/example_test.go +++ b/config/example_test.go @@ -91,6 +91,20 @@ func ExampleWithEndpointResolver() { _ = cfg } +func ExampleWithEndpointResolverWithOptions() { + cfg, err := config.LoadDefaultConfig(context.TODO(), + config.WithEndpointResolverWithOptions(aws.EndpointResolverWithOptionsFunc( + func(service, region string, options ...interface{}) (aws.Endpoint, error) { + return aws.Endpoint{URL: "https://mock.amazonaws.com"}, nil + })), + ) + + if err != nil { + log.Fatal(err) + } + _ = cfg +} + func ExampleWithHTTPClient() { cfg, err := config.LoadDefaultConfig(context.TODO(), config.WithHTTPClient(awshttp.NewBuildableClient(). diff --git a/config/load_options.go b/config/load_options.go index 15197dfb1b2..a02c6b08b87 100644 --- a/config/load_options.go +++ b/config/load_options.go @@ -31,9 +31,19 @@ type LoadOptions struct { HTTPClient HTTPClient // EndpointResolver that can be used to provide or override an endpoint for the given - // service and region Please see the `aws.EndpointResolver` documentation on usage. + // service and region. + // + // See the `aws.EndpointResolver` documentation on usage. + // + // Deprecated: See EndpointResolverWithOptions EndpointResolver aws.EndpointResolver + // EndpointResolverWithOptions that can be used to provide or override an endpoint for the given + // service and region. + // + // See the `aws.EndpointResolverWithOptions` documentation on usage. + EndpointResolverWithOptions aws.EndpointResolverWithOptions + // Retryer is a function that provides a Retryer implementation. A Retryer guides how HTTP requests should be // retried in case of recoverable failures. Retryer func() aws.Retryer @@ -533,9 +543,11 @@ func (o LoadOptions) getEndpointResolver(ctx context.Context) (aws.EndpointResol } // WithEndpointResolver is a helper function to construct functional options -// that sets endpoint resolver on LoadOptions. The EndpointResolver is set to nil, +// that sets the EndpointResolver on LoadOptions. If the EndpointResolver is set to nil, // the EndpointResolver value is ignored. If multiple WithEndpointResolver calls // are made, the last call overrides the previous call values. +// +// Deprecated: See WithEndpointResolverWithOptions func WithEndpointResolver(v aws.EndpointResolver) LoadOptionsFunc { return func(o *LoadOptions) error { o.EndpointResolver = v @@ -543,6 +555,25 @@ func WithEndpointResolver(v aws.EndpointResolver) LoadOptionsFunc { } } +func (o LoadOptions) getEndpointResolverWithOptions(ctx context.Context) (aws.EndpointResolverWithOptions, bool, error) { + if o.EndpointResolverWithOptions == nil { + return nil, false, nil + } + + return o.EndpointResolverWithOptions, true, nil +} + +// WithEndpointResolverWithOptions is a helper function to construct functional options +// that sets the EndpointResolverWithOptions on LoadOptions. If the EndpointResolverWithOptions is set to nil, +// the EndpointResolver value is ignored. If multiple WithEndpointResolver calls +// are made, the last call overrides the previous call values. +func WithEndpointResolverWithOptions(v aws.EndpointResolverWithOptions) LoadOptionsFunc { + return func(o *LoadOptions) error { + o.EndpointResolverWithOptions = v + return nil + } +} + func (o LoadOptions) getLogger(ctx context.Context) (logging.Logger, bool, error) { if o.Logger == nil { return nil, false, nil diff --git a/config/provider.go b/config/provider.go index a4308368d03..557db2c264a 100644 --- a/config/provider.go +++ b/config/provider.go @@ -336,6 +336,25 @@ func getEndpointResolver(ctx context.Context, configs configs) (f aws.EndpointRe return } +// endpointResolverWithOptionsProvider is an interface for retrieving an aws.EndpointResolverWithOptions from a configuration source +type endpointResolverWithOptionsProvider interface { + getEndpointResolverWithOptions(ctx context.Context) (aws.EndpointResolverWithOptions, bool, error) +} + +// getEndpointResolver searches the provided config sources for a EndpointResolverFunc that can be used +// to configure the aws.Config.EndpointResolver value. +func getEndpointResolverWithOptions(ctx context.Context, configs configs) (f aws.EndpointResolverWithOptions, found bool, err error) { + for _, c := range configs { + if p, ok := c.(endpointResolverWithOptionsProvider); ok { + f, found, err = p.getEndpointResolverWithOptions(ctx) + if err != nil || found { + break + } + } + } + return +} + // loggerProvider is an interface for retrieving a logging.Logger from a configuration source. type loggerProvider interface { getLogger(ctx context.Context) (logging.Logger, bool, error) diff --git a/config/resolve.go b/config/resolve.go index 550ca4e7178..305a2a16a3b 100644 --- a/config/resolve.go +++ b/config/resolve.go @@ -166,6 +166,22 @@ func resolveEndpointResolver(ctx context.Context, cfg *aws.Config, configs confi return nil } +// resolveEndpointResolver extracts the first instance of a EndpointResolverFunc from the config slice +// and sets the functions result on the aws.Config.EndpointResolver +func resolveEndpointResolverWithOptions(ctx context.Context, cfg *aws.Config, configs configs) error { + endpointResolver, found, err := getEndpointResolverWithOptions(ctx, configs) + if err != nil { + return err + } + if !found { + return nil + } + + cfg.EndpointResolverWithOptions = endpointResolver + + return nil +} + func resolveLogger(ctx context.Context, cfg *aws.Config, configs configs) error { logger, found, err := getLogger(ctx, configs) if err != nil { diff --git a/config/resolve_credentials_test.go b/config/resolve_credentials_test.go index a3888bbfdf7..d6663a0b77a 100644 --- a/config/resolve_credentials_test.go +++ b/config/resolve_credentials_test.go @@ -30,7 +30,7 @@ func swapECSContainerURI(path string) func() { } } -func setupCredentialsEndpoints(t *testing.T) (aws.EndpointResolver, func()) { +func setupCredentialsEndpoints(t *testing.T) (aws.EndpointResolverWithOptions, func()) { ecsMetadataServer := httptest.NewServer(http.HandlerFunc( func(w http.ResponseWriter, r *http.Request) { if r.URL.Path == "/ECS" { @@ -95,8 +95,8 @@ func setupCredentialsEndpoints(t *testing.T) (aws.EndpointResolver, func()) { UnixNano()/int64(time.Millisecond)))) })) - resolver := aws.EndpointResolverFunc( - func(service, region string) (aws.Endpoint, error) { + resolver := aws.EndpointResolverWithOptionsFunc( + func(service, region string, options ...interface{}) (aws.Endpoint, error) { switch service { case sts.ServiceID: return aws.Endpoint{ @@ -394,7 +394,7 @@ func TestSharedConfigCredentialSource(t *testing.T) { var credChain []string loadOptions := []func(*LoadOptions) error{ - WithEndpointResolver(endpointResolver), + WithEndpointResolverWithOptions(endpointResolver), WithAPIOptions([]func(*middleware.Stack) error{ func(stack *middleware.Stack) error { return stack.Initialize.Add(middleware.InitializeMiddlewareFunc("GetRoleArns", func(ctx context.Context, in middleware.InitializeInput, next middleware.InitializeHandler, diff --git a/internal/protocoltest/awsrestjson/api_client.go b/internal/protocoltest/awsrestjson/api_client.go index a9399f4aa2f..9c9d18af79b 100644 --- a/internal/protocoltest/awsrestjson/api_client.go +++ b/internal/protocoltest/awsrestjson/api_client.go @@ -200,7 +200,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/internal/protocoltest/ec2query/api_client.go b/internal/protocoltest/ec2query/api_client.go index 0578bd5c164..d844b5d9eb6 100644 --- a/internal/protocoltest/ec2query/api_client.go +++ b/internal/protocoltest/ec2query/api_client.go @@ -200,7 +200,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/internal/protocoltest/jsonrpc/api_client.go b/internal/protocoltest/jsonrpc/api_client.go index 88d1ee59c20..106fb0677b1 100644 --- a/internal/protocoltest/jsonrpc/api_client.go +++ b/internal/protocoltest/jsonrpc/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/internal/protocoltest/jsonrpc10/api_client.go b/internal/protocoltest/jsonrpc10/api_client.go index afb51cdbb69..5179f18aa1c 100644 --- a/internal/protocoltest/jsonrpc10/api_client.go +++ b/internal/protocoltest/jsonrpc10/api_client.go @@ -192,7 +192,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/internal/protocoltest/query/api_client.go b/internal/protocoltest/query/api_client.go index d7fd965f9f0..c31a406a709 100644 --- a/internal/protocoltest/query/api_client.go +++ b/internal/protocoltest/query/api_client.go @@ -200,7 +200,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/internal/protocoltest/restxml/api_client.go b/internal/protocoltest/restxml/api_client.go index 36d1c8c4736..f302d53aa9a 100644 --- a/internal/protocoltest/restxml/api_client.go +++ b/internal/protocoltest/restxml/api_client.go @@ -200,7 +200,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/internal/protocoltest/restxmlwithnamespace/api_client.go b/internal/protocoltest/restxmlwithnamespace/api_client.go index 312edd3b212..2e90b4d5219 100644 --- a/internal/protocoltest/restxmlwithnamespace/api_client.go +++ b/internal/protocoltest/restxmlwithnamespace/api_client.go @@ -192,7 +192,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/accessanalyzer/api_client.go b/service/accessanalyzer/api_client.go index a25b131e9a6..44a3ab0c94d 100644 --- a/service/accessanalyzer/api_client.go +++ b/service/accessanalyzer/api_client.go @@ -211,7 +211,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/account/api_client.go b/service/account/api_client.go index c1da446a771..a0897068f39 100644 --- a/service/account/api_client.go +++ b/service/account/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/acm/api_client.go b/service/acm/api_client.go index 1d56a002669..c0a80409b38 100644 --- a/service/acm/api_client.go +++ b/service/acm/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/acmpca/api_client.go b/service/acmpca/api_client.go index b1c4b77ca2e..c913621ef75 100644 --- a/service/acmpca/api_client.go +++ b/service/acmpca/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/alexaforbusiness/api_client.go b/service/alexaforbusiness/api_client.go index 6b96eddf798..cb345b016b9 100644 --- a/service/alexaforbusiness/api_client.go +++ b/service/alexaforbusiness/api_client.go @@ -211,7 +211,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/amp/api_client.go b/service/amp/api_client.go index bfee2383a66..ba3c1580727 100644 --- a/service/amp/api_client.go +++ b/service/amp/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/amplify/api_client.go b/service/amplify/api_client.go index 1baef1d6b8b..b3b7820d6d0 100644 --- a/service/amplify/api_client.go +++ b/service/amplify/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/amplifybackend/api_client.go b/service/amplifybackend/api_client.go index 94ab425c358..7f4e7c0d945 100644 --- a/service/amplifybackend/api_client.go +++ b/service/amplifybackend/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/apigateway/api_client.go b/service/apigateway/api_client.go index 6bd7685a5a2..ac94db1a410 100644 --- a/service/apigateway/api_client.go +++ b/service/apigateway/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/apigatewaymanagementapi/api_client.go b/service/apigatewaymanagementapi/api_client.go index d64539191c0..1ef14f6451f 100644 --- a/service/apigatewaymanagementapi/api_client.go +++ b/service/apigatewaymanagementapi/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/apigatewayv2/api_client.go b/service/apigatewayv2/api_client.go index 843bec62823..9256661e8e2 100644 --- a/service/apigatewayv2/api_client.go +++ b/service/apigatewayv2/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/appconfig/api_client.go b/service/appconfig/api_client.go index af2882578e7..c4c2283e37a 100644 --- a/service/appconfig/api_client.go +++ b/service/appconfig/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/appconfigdata/api_client.go b/service/appconfigdata/api_client.go index 4d601e1fbff..9d913425dc6 100644 --- a/service/appconfigdata/api_client.go +++ b/service/appconfigdata/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/appflow/api_client.go b/service/appflow/api_client.go index 2fe0f0df9b2..0ec64afa024 100644 --- a/service/appflow/api_client.go +++ b/service/appflow/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/appintegrations/api_client.go b/service/appintegrations/api_client.go index e502cd4fb26..f4ae9bb710d 100644 --- a/service/appintegrations/api_client.go +++ b/service/appintegrations/api_client.go @@ -212,7 +212,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/applicationautoscaling/api_client.go b/service/applicationautoscaling/api_client.go index a8d84011736..e87573caadc 100644 --- a/service/applicationautoscaling/api_client.go +++ b/service/applicationautoscaling/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/applicationcostprofiler/api_client.go b/service/applicationcostprofiler/api_client.go index 6a998f4202b..5a5297b960b 100644 --- a/service/applicationcostprofiler/api_client.go +++ b/service/applicationcostprofiler/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/applicationdiscoveryservice/api_client.go b/service/applicationdiscoveryservice/api_client.go index 5cefb3efd38..0a8000caf0e 100644 --- a/service/applicationdiscoveryservice/api_client.go +++ b/service/applicationdiscoveryservice/api_client.go @@ -212,7 +212,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/applicationinsights/api_client.go b/service/applicationinsights/api_client.go index 8cb5ca132c1..821f8d47227 100644 --- a/service/applicationinsights/api_client.go +++ b/service/applicationinsights/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/appmesh/api_client.go b/service/appmesh/api_client.go index 8093df75e92..ac44a1c7bc4 100644 --- a/service/appmesh/api_client.go +++ b/service/appmesh/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/apprunner/api_client.go b/service/apprunner/api_client.go index cd963fe662d..aa9ede04fc8 100644 --- a/service/apprunner/api_client.go +++ b/service/apprunner/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/appstream/api_client.go b/service/appstream/api_client.go index 6f6b127a25f..5e7d2d8dcde 100644 --- a/service/appstream/api_client.go +++ b/service/appstream/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/appsync/api_client.go b/service/appsync/api_client.go index 1a39036c1c0..e176d389875 100644 --- a/service/appsync/api_client.go +++ b/service/appsync/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/athena/api_client.go b/service/athena/api_client.go index 1481c873dd2..91212217814 100644 --- a/service/athena/api_client.go +++ b/service/athena/api_client.go @@ -211,7 +211,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/auditmanager/api_client.go b/service/auditmanager/api_client.go index 6250e55b06b..29fcebe863a 100644 --- a/service/auditmanager/api_client.go +++ b/service/auditmanager/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/autoscaling/api_client.go b/service/autoscaling/api_client.go index 8300319ae6f..dcff6e8b9ec 100644 --- a/service/autoscaling/api_client.go +++ b/service/autoscaling/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/autoscalingplans/api_client.go b/service/autoscalingplans/api_client.go index ffabf929105..eb7748a7370 100644 --- a/service/autoscalingplans/api_client.go +++ b/service/autoscalingplans/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/backup/api_client.go b/service/backup/api_client.go index 369c8f35e1a..e612eceabf7 100644 --- a/service/backup/api_client.go +++ b/service/backup/api_client.go @@ -211,7 +211,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/batch/api_client.go b/service/batch/api_client.go index efc583a2034..a72364711b4 100644 --- a/service/batch/api_client.go +++ b/service/batch/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/braket/api_client.go b/service/braket/api_client.go index 30eca52bb9a..d0999297f91 100644 --- a/service/braket/api_client.go +++ b/service/braket/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/budgets/api_client.go b/service/budgets/api_client.go index 6e39b81ada1..61d8114f547 100644 --- a/service/budgets/api_client.go +++ b/service/budgets/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/chime/api_client.go b/service/chime/api_client.go index 2c5099d2bf1..3c557703877 100644 --- a/service/chime/api_client.go +++ b/service/chime/api_client.go @@ -211,7 +211,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/chimesdkidentity/api_client.go b/service/chimesdkidentity/api_client.go index 0b6047e026a..311800a5333 100644 --- a/service/chimesdkidentity/api_client.go +++ b/service/chimesdkidentity/api_client.go @@ -212,7 +212,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/chimesdkmeetings/api_client.go b/service/chimesdkmeetings/api_client.go index 7615528b60d..a389ca3de85 100644 --- a/service/chimesdkmeetings/api_client.go +++ b/service/chimesdkmeetings/api_client.go @@ -212,7 +212,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/chimesdkmessaging/api_client.go b/service/chimesdkmessaging/api_client.go index eaf7c7cf6e6..076ee61fdcc 100644 --- a/service/chimesdkmessaging/api_client.go +++ b/service/chimesdkmessaging/api_client.go @@ -212,7 +212,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/cloud9/api_client.go b/service/cloud9/api_client.go index 6153c1fb8a4..d7d60ea97a6 100644 --- a/service/cloud9/api_client.go +++ b/service/cloud9/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/cloudcontrol/api_client.go b/service/cloudcontrol/api_client.go index 70185b89fa0..f8c3012adbd 100644 --- a/service/cloudcontrol/api_client.go +++ b/service/cloudcontrol/api_client.go @@ -212,7 +212,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/clouddirectory/api_client.go b/service/clouddirectory/api_client.go index 58481dc0a7d..7817f013f4c 100644 --- a/service/clouddirectory/api_client.go +++ b/service/clouddirectory/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/cloudformation/api_client.go b/service/cloudformation/api_client.go index f49372b901d..ff3df5de72c 100644 --- a/service/cloudformation/api_client.go +++ b/service/cloudformation/api_client.go @@ -211,7 +211,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/cloudfront/api_client.go b/service/cloudfront/api_client.go index 86dfa4284f9..bdabcd0a6fc 100644 --- a/service/cloudfront/api_client.go +++ b/service/cloudfront/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/cloudhsm/api_client.go b/service/cloudhsm/api_client.go index fea9ebe5f6c..ae1ade94c7f 100644 --- a/service/cloudhsm/api_client.go +++ b/service/cloudhsm/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/cloudhsmv2/api_client.go b/service/cloudhsmv2/api_client.go index 1229684c5f3..1b540d7e85e 100644 --- a/service/cloudhsmv2/api_client.go +++ b/service/cloudhsmv2/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/cloudsearch/api_client.go b/service/cloudsearch/api_client.go index 3000d4f4a14..9138e32da6a 100644 --- a/service/cloudsearch/api_client.go +++ b/service/cloudsearch/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/cloudsearchdomain/api_client.go b/service/cloudsearchdomain/api_client.go index d86ee649ef4..fe20221e480 100644 --- a/service/cloudsearchdomain/api_client.go +++ b/service/cloudsearchdomain/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/cloudtrail/api_client.go b/service/cloudtrail/api_client.go index 1f442784463..22dcd7fc398 100644 --- a/service/cloudtrail/api_client.go +++ b/service/cloudtrail/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/cloudwatch/api_client.go b/service/cloudwatch/api_client.go index f72eb6887af..8e66303ae92 100644 --- a/service/cloudwatch/api_client.go +++ b/service/cloudwatch/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/cloudwatchevents/api_client.go b/service/cloudwatchevents/api_client.go index 367face1255..be1d80022f4 100644 --- a/service/cloudwatchevents/api_client.go +++ b/service/cloudwatchevents/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/cloudwatchlogs/api_client.go b/service/cloudwatchlogs/api_client.go index 1ca981ff234..768ac315da9 100644 --- a/service/cloudwatchlogs/api_client.go +++ b/service/cloudwatchlogs/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/codeartifact/api_client.go b/service/codeartifact/api_client.go index 917c4c140ce..fe21458ee14 100644 --- a/service/codeartifact/api_client.go +++ b/service/codeartifact/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/codebuild/api_client.go b/service/codebuild/api_client.go index 5dd3d32f161..9b7e7072ccc 100644 --- a/service/codebuild/api_client.go +++ b/service/codebuild/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/codecommit/api_client.go b/service/codecommit/api_client.go index fa76d56d442..05b94644813 100644 --- a/service/codecommit/api_client.go +++ b/service/codecommit/api_client.go @@ -211,7 +211,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/codedeploy/api_client.go b/service/codedeploy/api_client.go index 774fdb9d14e..e06eb13a948 100644 --- a/service/codedeploy/api_client.go +++ b/service/codedeploy/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/codeguruprofiler/api_client.go b/service/codeguruprofiler/api_client.go index cc02468231d..a552694ff8a 100644 --- a/service/codeguruprofiler/api_client.go +++ b/service/codeguruprofiler/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/codegurureviewer/api_client.go b/service/codegurureviewer/api_client.go index 8845aab8056..b54d180ad4c 100644 --- a/service/codegurureviewer/api_client.go +++ b/service/codegurureviewer/api_client.go @@ -212,7 +212,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/codepipeline/api_client.go b/service/codepipeline/api_client.go index 6c858b8c0be..b8441bf4c95 100644 --- a/service/codepipeline/api_client.go +++ b/service/codepipeline/api_client.go @@ -211,7 +211,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/codestar/api_client.go b/service/codestar/api_client.go index f99d75bb4df..50fb4294397 100644 --- a/service/codestar/api_client.go +++ b/service/codestar/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/codestarconnections/api_client.go b/service/codestarconnections/api_client.go index c3a5df55d59..491bfb02d25 100644 --- a/service/codestarconnections/api_client.go +++ b/service/codestarconnections/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/codestarnotifications/api_client.go b/service/codestarnotifications/api_client.go index e66b718aeb6..9dec52c518a 100644 --- a/service/codestarnotifications/api_client.go +++ b/service/codestarnotifications/api_client.go @@ -212,7 +212,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/cognitoidentity/api_client.go b/service/cognitoidentity/api_client.go index 6434ca4cd9f..e6bda298e87 100644 --- a/service/cognitoidentity/api_client.go +++ b/service/cognitoidentity/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/cognitoidentityprovider/api_client.go b/service/cognitoidentityprovider/api_client.go index 8791df47980..a45093bd0f3 100644 --- a/service/cognitoidentityprovider/api_client.go +++ b/service/cognitoidentityprovider/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/cognitosync/api_client.go b/service/cognitosync/api_client.go index 63ca336623c..aff1c509165 100644 --- a/service/cognitosync/api_client.go +++ b/service/cognitosync/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/comprehend/api_client.go b/service/comprehend/api_client.go index 89b1e05d916..449059f04ae 100644 --- a/service/comprehend/api_client.go +++ b/service/comprehend/api_client.go @@ -211,7 +211,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/comprehendmedical/api_client.go b/service/comprehendmedical/api_client.go index 7b19c8cdea5..b69493fa786 100644 --- a/service/comprehendmedical/api_client.go +++ b/service/comprehendmedical/api_client.go @@ -212,7 +212,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/computeoptimizer/api_client.go b/service/computeoptimizer/api_client.go index 26d39c73624..b2400605665 100644 --- a/service/computeoptimizer/api_client.go +++ b/service/computeoptimizer/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/configservice/api_client.go b/service/configservice/api_client.go index 686ea0efcd3..9a53484e8d7 100644 --- a/service/configservice/api_client.go +++ b/service/configservice/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/connect/api_client.go b/service/connect/api_client.go index 6cab298ec96..9ae527750cf 100644 --- a/service/connect/api_client.go +++ b/service/connect/api_client.go @@ -212,7 +212,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/connectcontactlens/api_client.go b/service/connectcontactlens/api_client.go index 2b9accbb2a0..dc36e52bd3e 100644 --- a/service/connectcontactlens/api_client.go +++ b/service/connectcontactlens/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/connectparticipant/api_client.go b/service/connectparticipant/api_client.go index 0640e069957..26382553f90 100644 --- a/service/connectparticipant/api_client.go +++ b/service/connectparticipant/api_client.go @@ -212,7 +212,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/costandusagereportservice/api_client.go b/service/costandusagereportservice/api_client.go index 6758a1079ff..6b6121a19cd 100644 --- a/service/costandusagereportservice/api_client.go +++ b/service/costandusagereportservice/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/costexplorer/api_client.go b/service/costexplorer/api_client.go index 9d4d533077e..aa1a0366030 100644 --- a/service/costexplorer/api_client.go +++ b/service/costexplorer/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/customerprofiles/api_client.go b/service/customerprofiles/api_client.go index 478133143ce..755e045bf17 100644 --- a/service/customerprofiles/api_client.go +++ b/service/customerprofiles/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/databasemigrationservice/api_client.go b/service/databasemigrationservice/api_client.go index cf2cdd66818..26c6a076844 100644 --- a/service/databasemigrationservice/api_client.go +++ b/service/databasemigrationservice/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/databrew/api_client.go b/service/databrew/api_client.go index 8bb845da8ad..b44a2bacd65 100644 --- a/service/databrew/api_client.go +++ b/service/databrew/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/dataexchange/api_client.go b/service/dataexchange/api_client.go index c6a266293bf..97e3612eb05 100644 --- a/service/dataexchange/api_client.go +++ b/service/dataexchange/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/datapipeline/api_client.go b/service/datapipeline/api_client.go index a63a5e58c96..a8af747d866 100644 --- a/service/datapipeline/api_client.go +++ b/service/datapipeline/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/datasync/api_client.go b/service/datasync/api_client.go index 973aba70435..303e6293e6f 100644 --- a/service/datasync/api_client.go +++ b/service/datasync/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/dax/api_client.go b/service/dax/api_client.go index 4ada4e3f4c8..815a27f49ed 100644 --- a/service/dax/api_client.go +++ b/service/dax/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/detective/api_client.go b/service/detective/api_client.go index b0d0d9453dc..c64a2eea679 100644 --- a/service/detective/api_client.go +++ b/service/detective/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/devicefarm/api_client.go b/service/devicefarm/api_client.go index 86858e5da1b..c80899620fe 100644 --- a/service/devicefarm/api_client.go +++ b/service/devicefarm/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/devopsguru/api_client.go b/service/devopsguru/api_client.go index fc631fe698a..b33944376ae 100644 --- a/service/devopsguru/api_client.go +++ b/service/devopsguru/api_client.go @@ -211,7 +211,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/directconnect/api_client.go b/service/directconnect/api_client.go index 3cb106d6a51..941ecf1afa3 100644 --- a/service/directconnect/api_client.go +++ b/service/directconnect/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/directoryservice/api_client.go b/service/directoryservice/api_client.go index 99e3d55fb3f..3e384865aff 100644 --- a/service/directoryservice/api_client.go +++ b/service/directoryservice/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/dlm/api_client.go b/service/dlm/api_client.go index 2afeb943bbf..be8d8de18c7 100644 --- a/service/dlm/api_client.go +++ b/service/dlm/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/docdb/api_client.go b/service/docdb/api_client.go index b7784b2392a..edd3a633c77 100644 --- a/service/docdb/api_client.go +++ b/service/docdb/api_client.go @@ -206,7 +206,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/drs/api_client.go b/service/drs/api_client.go index e02a331157d..6cec3dc8ee8 100644 --- a/service/drs/api_client.go +++ b/service/drs/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/dynamodb/api_client.go b/service/dynamodb/api_client.go index fe930f645e1..94bce94fa51 100644 --- a/service/dynamodb/api_client.go +++ b/service/dynamodb/api_client.go @@ -236,7 +236,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/dynamodbstreams/api_client.go b/service/dynamodbstreams/api_client.go index 4af61ec29a7..40c54cf8298 100644 --- a/service/dynamodbstreams/api_client.go +++ b/service/dynamodbstreams/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/ebs/api_client.go b/service/ebs/api_client.go index 658e504922f..180d11903bd 100644 --- a/service/ebs/api_client.go +++ b/service/ebs/api_client.go @@ -212,7 +212,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/ec2/api_client.go b/service/ec2/api_client.go index da2bf6e0fb2..2c87c12b43a 100644 --- a/service/ec2/api_client.go +++ b/service/ec2/api_client.go @@ -214,7 +214,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/ec2instanceconnect/api_client.go b/service/ec2instanceconnect/api_client.go index 61ef4c6e666..0126d4d8031 100644 --- a/service/ec2instanceconnect/api_client.go +++ b/service/ec2instanceconnect/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/ecr/api_client.go b/service/ecr/api_client.go index 4e9acc0e683..4e274f2714c 100644 --- a/service/ecr/api_client.go +++ b/service/ecr/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/ecrpublic/api_client.go b/service/ecrpublic/api_client.go index e2e42620665..d8e2f569ba5 100644 --- a/service/ecrpublic/api_client.go +++ b/service/ecrpublic/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/ecs/api_client.go b/service/ecs/api_client.go index aebe8109d41..55ae6a0c909 100644 --- a/service/ecs/api_client.go +++ b/service/ecs/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/efs/api_client.go b/service/efs/api_client.go index 1d9cf84d7c7..c7660c5a7dc 100644 --- a/service/efs/api_client.go +++ b/service/efs/api_client.go @@ -212,7 +212,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/eks/api_client.go b/service/eks/api_client.go index 50f3cd6b199..63f36e5f571 100644 --- a/service/eks/api_client.go +++ b/service/eks/api_client.go @@ -212,7 +212,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/elasticache/api_client.go b/service/elasticache/api_client.go index d3f7c94d40e..3b5a3121327 100644 --- a/service/elasticache/api_client.go +++ b/service/elasticache/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/elasticbeanstalk/api_client.go b/service/elasticbeanstalk/api_client.go index 90fc63d3ac4..dd62e68f9c6 100644 --- a/service/elasticbeanstalk/api_client.go +++ b/service/elasticbeanstalk/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/elasticinference/api_client.go b/service/elasticinference/api_client.go index 3b520da3272..ed1322fc8cc 100644 --- a/service/elasticinference/api_client.go +++ b/service/elasticinference/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/elasticloadbalancing/api_client.go b/service/elasticloadbalancing/api_client.go index 920a2be97b4..5f6a55a5767 100644 --- a/service/elasticloadbalancing/api_client.go +++ b/service/elasticloadbalancing/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/elasticloadbalancingv2/api_client.go b/service/elasticloadbalancingv2/api_client.go index ae96c5d7d4e..e5691ba35bc 100644 --- a/service/elasticloadbalancingv2/api_client.go +++ b/service/elasticloadbalancingv2/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/elasticsearchservice/api_client.go b/service/elasticsearchservice/api_client.go index 93f8909c886..eb281eb41ca 100644 --- a/service/elasticsearchservice/api_client.go +++ b/service/elasticsearchservice/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/elastictranscoder/api_client.go b/service/elastictranscoder/api_client.go index 4e040a0513c..7eefaef0c5a 100644 --- a/service/elastictranscoder/api_client.go +++ b/service/elastictranscoder/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/emr/api_client.go b/service/emr/api_client.go index 9efb0734afe..32d7d776571 100644 --- a/service/emr/api_client.go +++ b/service/emr/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/emrcontainers/api_client.go b/service/emrcontainers/api_client.go index 9d3cfcfe70d..14599345160 100644 --- a/service/emrcontainers/api_client.go +++ b/service/emrcontainers/api_client.go @@ -212,7 +212,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/eventbridge/api_client.go b/service/eventbridge/api_client.go index 914ea55567a..8819268177c 100644 --- a/service/eventbridge/api_client.go +++ b/service/eventbridge/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/evidently/api_client.go b/service/evidently/api_client.go index 9419ec90ea7..b184f799906 100644 --- a/service/evidently/api_client.go +++ b/service/evidently/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/finspace/api_client.go b/service/finspace/api_client.go index cc6c6f43a7f..8feed162ee5 100644 --- a/service/finspace/api_client.go +++ b/service/finspace/api_client.go @@ -206,7 +206,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/finspacedata/api_client.go b/service/finspacedata/api_client.go index 262fd3466e9..46d9d6d6b22 100644 --- a/service/finspacedata/api_client.go +++ b/service/finspacedata/api_client.go @@ -213,7 +213,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/firehose/api_client.go b/service/firehose/api_client.go index 89ade1c6d93..55995909886 100644 --- a/service/firehose/api_client.go +++ b/service/firehose/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/fis/api_client.go b/service/fis/api_client.go index 4d49075dbbe..0d798f8bc2a 100644 --- a/service/fis/api_client.go +++ b/service/fis/api_client.go @@ -212,7 +212,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/fms/api_client.go b/service/fms/api_client.go index 0cbac2e4d4a..5804b3b2373 100644 --- a/service/fms/api_client.go +++ b/service/fms/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/forecast/api_client.go b/service/forecast/api_client.go index e47429ff878..665041b1d47 100644 --- a/service/forecast/api_client.go +++ b/service/forecast/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/forecastquery/api_client.go b/service/forecastquery/api_client.go index 532c9e0bb87..09c37a9df5c 100644 --- a/service/forecastquery/api_client.go +++ b/service/forecastquery/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/frauddetector/api_client.go b/service/frauddetector/api_client.go index 00f80938109..e46e520636c 100644 --- a/service/frauddetector/api_client.go +++ b/service/frauddetector/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/fsx/api_client.go b/service/fsx/api_client.go index 669761ad4bf..dddff0f42a1 100644 --- a/service/fsx/api_client.go +++ b/service/fsx/api_client.go @@ -211,7 +211,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/gamelift/api_client.go b/service/gamelift/api_client.go index c5967f55ec1..f6f1fceaad1 100644 --- a/service/gamelift/api_client.go +++ b/service/gamelift/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/glacier/api_client.go b/service/glacier/api_client.go index 2a6371fb97a..e607783e076 100644 --- a/service/glacier/api_client.go +++ b/service/glacier/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/globalaccelerator/api_client.go b/service/globalaccelerator/api_client.go index 4ddf515bfd7..79196de6319 100644 --- a/service/globalaccelerator/api_client.go +++ b/service/globalaccelerator/api_client.go @@ -212,7 +212,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/glue/api_client.go b/service/glue/api_client.go index 293210b3b7d..075243e9d0f 100644 --- a/service/glue/api_client.go +++ b/service/glue/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/grafana/api_client.go b/service/grafana/api_client.go index e7f344e3678..a39a4ae9c31 100644 --- a/service/grafana/api_client.go +++ b/service/grafana/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/greengrass/api_client.go b/service/greengrass/api_client.go index 6a83c57cc59..75a434b6280 100644 --- a/service/greengrass/api_client.go +++ b/service/greengrass/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/greengrassv2/api_client.go b/service/greengrassv2/api_client.go index f3b63ce211a..dc8d6ca6e90 100644 --- a/service/greengrassv2/api_client.go +++ b/service/greengrassv2/api_client.go @@ -212,7 +212,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/groundstation/api_client.go b/service/groundstation/api_client.go index 0b582c110bc..86da4af5a49 100644 --- a/service/groundstation/api_client.go +++ b/service/groundstation/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/guardduty/api_client.go b/service/guardduty/api_client.go index a2a0629ecbe..584769b9909 100644 --- a/service/guardduty/api_client.go +++ b/service/guardduty/api_client.go @@ -211,7 +211,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/health/api_client.go b/service/health/api_client.go index dfd6a0b8cac..0575dbff056 100644 --- a/service/health/api_client.go +++ b/service/health/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/healthlake/api_client.go b/service/healthlake/api_client.go index 3c82d5200a2..b30be495d41 100644 --- a/service/healthlake/api_client.go +++ b/service/healthlake/api_client.go @@ -211,7 +211,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/honeycode/api_client.go b/service/honeycode/api_client.go index 64f7b75e61a..6cc40d95a91 100644 --- a/service/honeycode/api_client.go +++ b/service/honeycode/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/iam/api_client.go b/service/iam/api_client.go index 691f8e58086..40826b4a0e6 100644 --- a/service/iam/api_client.go +++ b/service/iam/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/identitystore/api_client.go b/service/identitystore/api_client.go index 6b12df5691a..40b3a3b9eff 100644 --- a/service/identitystore/api_client.go +++ b/service/identitystore/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/imagebuilder/api_client.go b/service/imagebuilder/api_client.go index eea4e1f340d..18198401ee1 100644 --- a/service/imagebuilder/api_client.go +++ b/service/imagebuilder/api_client.go @@ -211,7 +211,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/inspector/api_client.go b/service/inspector/api_client.go index a91324fb3c1..1d47d8c1132 100644 --- a/service/inspector/api_client.go +++ b/service/inspector/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/inspector2/api_client.go b/service/inspector2/api_client.go index c97dddabc09..a2f0277ed14 100644 --- a/service/inspector2/api_client.go +++ b/service/inspector2/api_client.go @@ -211,7 +211,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/iot/api_client.go b/service/iot/api_client.go index 552087542fa..16b66e6751b 100644 --- a/service/iot/api_client.go +++ b/service/iot/api_client.go @@ -211,7 +211,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/iot1clickdevicesservice/api_client.go b/service/iot1clickdevicesservice/api_client.go index 3062a79d1cd..316f7739850 100644 --- a/service/iot1clickdevicesservice/api_client.go +++ b/service/iot1clickdevicesservice/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/iot1clickprojects/api_client.go b/service/iot1clickprojects/api_client.go index a0b9418b2d6..032ca767368 100644 --- a/service/iot1clickprojects/api_client.go +++ b/service/iot1clickprojects/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/iotanalytics/api_client.go b/service/iotanalytics/api_client.go index db047462b62..dd2ec058633 100644 --- a/service/iotanalytics/api_client.go +++ b/service/iotanalytics/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/iotdataplane/api_client.go b/service/iotdataplane/api_client.go index 40fe059fd5b..76ab9d9603c 100644 --- a/service/iotdataplane/api_client.go +++ b/service/iotdataplane/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/iotdeviceadvisor/api_client.go b/service/iotdeviceadvisor/api_client.go index b1aa7c0f925..ec33531accf 100644 --- a/service/iotdeviceadvisor/api_client.go +++ b/service/iotdeviceadvisor/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/iotevents/api_client.go b/service/iotevents/api_client.go index 8dc86dfd464..d9f5d002cfa 100644 --- a/service/iotevents/api_client.go +++ b/service/iotevents/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/ioteventsdata/api_client.go b/service/ioteventsdata/api_client.go index e312390a7a8..a421741634a 100644 --- a/service/ioteventsdata/api_client.go +++ b/service/ioteventsdata/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/iotfleethub/api_client.go b/service/iotfleethub/api_client.go index 28e7ff6a6e7..b05ecfffdef 100644 --- a/service/iotfleethub/api_client.go +++ b/service/iotfleethub/api_client.go @@ -211,7 +211,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/iotjobsdataplane/api_client.go b/service/iotjobsdataplane/api_client.go index d6ee74fbb29..b22f0f93f2c 100644 --- a/service/iotjobsdataplane/api_client.go +++ b/service/iotjobsdataplane/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/iotsecuretunneling/api_client.go b/service/iotsecuretunneling/api_client.go index c3f0f23c682..ef65b0d7980 100644 --- a/service/iotsecuretunneling/api_client.go +++ b/service/iotsecuretunneling/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/iotsitewise/api_client.go b/service/iotsitewise/api_client.go index 8ccbafad386..885686bf9b0 100644 --- a/service/iotsitewise/api_client.go +++ b/service/iotsitewise/api_client.go @@ -211,7 +211,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/iotthingsgraph/api_client.go b/service/iotthingsgraph/api_client.go index add2c56684f..701115c2c04 100644 --- a/service/iotthingsgraph/api_client.go +++ b/service/iotthingsgraph/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/iotwireless/api_client.go b/service/iotwireless/api_client.go index 8f9509d0967..a2c11473dd1 100644 --- a/service/iotwireless/api_client.go +++ b/service/iotwireless/api_client.go @@ -211,7 +211,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/ivs/api_client.go b/service/ivs/api_client.go index 684aa8b9c1d..598db3f0f63 100644 --- a/service/ivs/api_client.go +++ b/service/ivs/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/kafka/api_client.go b/service/kafka/api_client.go index 8b4c21a7d25..7bf5ee3d396 100644 --- a/service/kafka/api_client.go +++ b/service/kafka/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/kafkaconnect/api_client.go b/service/kafkaconnect/api_client.go index d4e59f10a85..bfb279bc8b3 100644 --- a/service/kafkaconnect/api_client.go +++ b/service/kafkaconnect/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/kendra/api_client.go b/service/kendra/api_client.go index 784c9a197f7..f499c9bd47c 100644 --- a/service/kendra/api_client.go +++ b/service/kendra/api_client.go @@ -212,7 +212,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/kinesis/api_client.go b/service/kinesis/api_client.go index 0ca37377282..9cc1ecf2079 100644 --- a/service/kinesis/api_client.go +++ b/service/kinesis/api_client.go @@ -205,7 +205,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/kinesisanalytics/api_client.go b/service/kinesisanalytics/api_client.go index 0a5ea458cd0..249edcd801e 100644 --- a/service/kinesisanalytics/api_client.go +++ b/service/kinesisanalytics/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/kinesisanalyticsv2/api_client.go b/service/kinesisanalyticsv2/api_client.go index f6296889684..4086730c560 100644 --- a/service/kinesisanalyticsv2/api_client.go +++ b/service/kinesisanalyticsv2/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/kinesisvideo/api_client.go b/service/kinesisvideo/api_client.go index 96b16fe6519..3d1f087624f 100644 --- a/service/kinesisvideo/api_client.go +++ b/service/kinesisvideo/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/kinesisvideoarchivedmedia/api_client.go b/service/kinesisvideoarchivedmedia/api_client.go index 5b6a0d53763..cf8e31b798e 100644 --- a/service/kinesisvideoarchivedmedia/api_client.go +++ b/service/kinesisvideoarchivedmedia/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/kinesisvideomedia/api_client.go b/service/kinesisvideomedia/api_client.go index 052e21fc7e7..3edaa11f41d 100644 --- a/service/kinesisvideomedia/api_client.go +++ b/service/kinesisvideomedia/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/kinesisvideosignaling/api_client.go b/service/kinesisvideosignaling/api_client.go index 5e7f3dd1f5a..21e0e36482c 100644 --- a/service/kinesisvideosignaling/api_client.go +++ b/service/kinesisvideosignaling/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/kms/api_client.go b/service/kms/api_client.go index baa3c4f402e..0bc829e22b9 100644 --- a/service/kms/api_client.go +++ b/service/kms/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/lakeformation/api_client.go b/service/lakeformation/api_client.go index e453ac9e8a6..c0d63664a88 100644 --- a/service/lakeformation/api_client.go +++ b/service/lakeformation/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/lambda/api_client.go b/service/lambda/api_client.go index 910b87d4c9c..770dd4ca943 100644 --- a/service/lambda/api_client.go +++ b/service/lambda/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/lexmodelbuildingservice/api_client.go b/service/lexmodelbuildingservice/api_client.go index 593bf54ea03..3aed57b2ec5 100644 --- a/service/lexmodelbuildingservice/api_client.go +++ b/service/lexmodelbuildingservice/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/lexmodelsv2/api_client.go b/service/lexmodelsv2/api_client.go index 2b295fd9579..1fa3b77b462 100644 --- a/service/lexmodelsv2/api_client.go +++ b/service/lexmodelsv2/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/lexruntimeservice/api_client.go b/service/lexruntimeservice/api_client.go index fd24ea3a330..7085144c4d0 100644 --- a/service/lexruntimeservice/api_client.go +++ b/service/lexruntimeservice/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/lexruntimev2/api_client.go b/service/lexruntimev2/api_client.go index 17800675b3c..9a60a9eeabf 100644 --- a/service/lexruntimev2/api_client.go +++ b/service/lexruntimev2/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/licensemanager/api_client.go b/service/licensemanager/api_client.go index 23f2ad1aedc..a09b8714518 100644 --- a/service/licensemanager/api_client.go +++ b/service/licensemanager/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/lightsail/api_client.go b/service/lightsail/api_client.go index e601121dc4f..60a6d9401bb 100644 --- a/service/lightsail/api_client.go +++ b/service/lightsail/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/location/api_client.go b/service/location/api_client.go index d5f3c7d8747..12f9b642559 100644 --- a/service/location/api_client.go +++ b/service/location/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/lookoutequipment/api_client.go b/service/lookoutequipment/api_client.go index 1ebadc5d5fd..9ccc3594582 100644 --- a/service/lookoutequipment/api_client.go +++ b/service/lookoutequipment/api_client.go @@ -212,7 +212,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/lookoutmetrics/api_client.go b/service/lookoutmetrics/api_client.go index 6ab72ee1fbc..efd21ee6616 100644 --- a/service/lookoutmetrics/api_client.go +++ b/service/lookoutmetrics/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/lookoutvision/api_client.go b/service/lookoutvision/api_client.go index f8f0741813d..293b8d102b1 100644 --- a/service/lookoutvision/api_client.go +++ b/service/lookoutvision/api_client.go @@ -212,7 +212,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/machinelearning/api_client.go b/service/machinelearning/api_client.go index 03eb7566c4e..ac2042157ee 100644 --- a/service/machinelearning/api_client.go +++ b/service/machinelearning/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/macie/api_client.go b/service/macie/api_client.go index 5cdeb42ef8b..392ba5756d3 100644 --- a/service/macie/api_client.go +++ b/service/macie/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/macie2/api_client.go b/service/macie2/api_client.go index b54c901027e..4ca29964d2b 100644 --- a/service/macie2/api_client.go +++ b/service/macie2/api_client.go @@ -211,7 +211,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/managedblockchain/api_client.go b/service/managedblockchain/api_client.go index 2fc12c84a39..07005e54c5e 100644 --- a/service/managedblockchain/api_client.go +++ b/service/managedblockchain/api_client.go @@ -212,7 +212,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/marketplacecatalog/api_client.go b/service/marketplacecatalog/api_client.go index f5562e10cd3..a8118344300 100644 --- a/service/marketplacecatalog/api_client.go +++ b/service/marketplacecatalog/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/marketplacecommerceanalytics/api_client.go b/service/marketplacecommerceanalytics/api_client.go index 98774af792e..1b91404b043 100644 --- a/service/marketplacecommerceanalytics/api_client.go +++ b/service/marketplacecommerceanalytics/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/marketplaceentitlementservice/api_client.go b/service/marketplaceentitlementservice/api_client.go index 5de7fc43237..9d15c76de37 100644 --- a/service/marketplaceentitlementservice/api_client.go +++ b/service/marketplaceentitlementservice/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/marketplacemetering/api_client.go b/service/marketplacemetering/api_client.go index 61b4a2d8404..a2fb2d1dfa1 100644 --- a/service/marketplacemetering/api_client.go +++ b/service/marketplacemetering/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/mediaconnect/api_client.go b/service/mediaconnect/api_client.go index f06dc9f66f3..be4d152e32d 100644 --- a/service/mediaconnect/api_client.go +++ b/service/mediaconnect/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/mediaconvert/api_client.go b/service/mediaconvert/api_client.go index e38d51a0500..4c1bdd05a7b 100644 --- a/service/mediaconvert/api_client.go +++ b/service/mediaconvert/api_client.go @@ -212,7 +212,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/medialive/api_client.go b/service/medialive/api_client.go index 9b18ae6f183..d86010cdfb2 100644 --- a/service/medialive/api_client.go +++ b/service/medialive/api_client.go @@ -212,7 +212,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/mediapackage/api_client.go b/service/mediapackage/api_client.go index b45cb0a48b8..db77449cfbf 100644 --- a/service/mediapackage/api_client.go +++ b/service/mediapackage/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/mediapackagevod/api_client.go b/service/mediapackagevod/api_client.go index 0969d0bb83e..4d602749411 100644 --- a/service/mediapackagevod/api_client.go +++ b/service/mediapackagevod/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/mediastore/api_client.go b/service/mediastore/api_client.go index 779bb5aafb0..fba84f951d3 100644 --- a/service/mediastore/api_client.go +++ b/service/mediastore/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/mediastoredata/api_client.go b/service/mediastoredata/api_client.go index e132e232fab..bf3e5a5a087 100644 --- a/service/mediastoredata/api_client.go +++ b/service/mediastoredata/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/mediatailor/api_client.go b/service/mediatailor/api_client.go index 22846f1faae..1c0f354cb20 100644 --- a/service/mediatailor/api_client.go +++ b/service/mediatailor/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/memorydb/api_client.go b/service/memorydb/api_client.go index 6445fc7bc52..74adb00bf3d 100644 --- a/service/memorydb/api_client.go +++ b/service/memorydb/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/mgn/api_client.go b/service/mgn/api_client.go index c6871c988bc..305aa603cde 100644 --- a/service/mgn/api_client.go +++ b/service/mgn/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/migrationhub/api_client.go b/service/migrationhub/api_client.go index 9d0185e14de..9f94687cc86 100644 --- a/service/migrationhub/api_client.go +++ b/service/migrationhub/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/migrationhubconfig/api_client.go b/service/migrationhubconfig/api_client.go index 47f088fd0e3..f2015d54ab1 100644 --- a/service/migrationhubconfig/api_client.go +++ b/service/migrationhubconfig/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/migrationhubrefactorspaces/api_client.go b/service/migrationhubrefactorspaces/api_client.go index 1960d1ae9c2..0ab54d9a6c0 100644 --- a/service/migrationhubrefactorspaces/api_client.go +++ b/service/migrationhubrefactorspaces/api_client.go @@ -212,7 +212,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/migrationhubstrategy/api_client.go b/service/migrationhubstrategy/api_client.go index bc576013225..ec6fa0d3025 100644 --- a/service/migrationhubstrategy/api_client.go +++ b/service/migrationhubstrategy/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/mobile/api_client.go b/service/mobile/api_client.go index 8a0dd372050..9a31eeca0c9 100644 --- a/service/mobile/api_client.go +++ b/service/mobile/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/mq/api_client.go b/service/mq/api_client.go index e2353d88c13..840d085a24c 100644 --- a/service/mq/api_client.go +++ b/service/mq/api_client.go @@ -211,7 +211,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/mturk/api_client.go b/service/mturk/api_client.go index c516f4b1dbb..073b943f166 100644 --- a/service/mturk/api_client.go +++ b/service/mturk/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/mwaa/api_client.go b/service/mwaa/api_client.go index 71468181e9a..3d3dc4c5911 100644 --- a/service/mwaa/api_client.go +++ b/service/mwaa/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/neptune/api_client.go b/service/neptune/api_client.go index bbf66d2adea..3ec95e82120 100644 --- a/service/neptune/api_client.go +++ b/service/neptune/api_client.go @@ -205,7 +205,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/networkfirewall/api_client.go b/service/networkfirewall/api_client.go index eb5dcbcc047..4cfa78ee1a5 100644 --- a/service/networkfirewall/api_client.go +++ b/service/networkfirewall/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/networkmanager/api_client.go b/service/networkmanager/api_client.go index 9d2e3cd1c7c..c857b885a6e 100644 --- a/service/networkmanager/api_client.go +++ b/service/networkmanager/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/nimble/api_client.go b/service/nimble/api_client.go index 7b6583aa7d8..30eedbd1e38 100644 --- a/service/nimble/api_client.go +++ b/service/nimble/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/opensearch/api_client.go b/service/opensearch/api_client.go index a5eed7556a0..e74881c4f9d 100644 --- a/service/opensearch/api_client.go +++ b/service/opensearch/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/opsworks/api_client.go b/service/opsworks/api_client.go index ad07bf5b99d..c436653ab23 100644 --- a/service/opsworks/api_client.go +++ b/service/opsworks/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/opsworkscm/api_client.go b/service/opsworkscm/api_client.go index 6df372b53ef..0f248c4ea28 100644 --- a/service/opsworkscm/api_client.go +++ b/service/opsworkscm/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/organizations/api_client.go b/service/organizations/api_client.go index faa19ead2ea..0ce750bf99e 100644 --- a/service/organizations/api_client.go +++ b/service/organizations/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/outposts/api_client.go b/service/outposts/api_client.go index 909ea730fb0..9803e6c1925 100644 --- a/service/outposts/api_client.go +++ b/service/outposts/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/panorama/api_client.go b/service/panorama/api_client.go index 5aa0679e3c4..851f4742618 100644 --- a/service/panorama/api_client.go +++ b/service/panorama/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/personalize/api_client.go b/service/personalize/api_client.go index ca51965667e..2c9ad427c64 100644 --- a/service/personalize/api_client.go +++ b/service/personalize/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/personalizeevents/api_client.go b/service/personalizeevents/api_client.go index f9d8acc6918..7b87a501aa7 100644 --- a/service/personalizeevents/api_client.go +++ b/service/personalizeevents/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/personalizeruntime/api_client.go b/service/personalizeruntime/api_client.go index ca942771f63..8576310fb69 100644 --- a/service/personalizeruntime/api_client.go +++ b/service/personalizeruntime/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/pi/api_client.go b/service/pi/api_client.go index 71b2302a72f..307eac2abfe 100644 --- a/service/pi/api_client.go +++ b/service/pi/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/pinpoint/api_client.go b/service/pinpoint/api_client.go index edb567f1ff5..5be5d300d71 100644 --- a/service/pinpoint/api_client.go +++ b/service/pinpoint/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/pinpointemail/api_client.go b/service/pinpointemail/api_client.go index 61290016c66..8f89c7de9c7 100644 --- a/service/pinpointemail/api_client.go +++ b/service/pinpointemail/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/pinpointsmsvoice/api_client.go b/service/pinpointsmsvoice/api_client.go index e7eedecc993..1ffea969245 100644 --- a/service/pinpointsmsvoice/api_client.go +++ b/service/pinpointsmsvoice/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/polly/api_client.go b/service/polly/api_client.go index 47553f8b010..9a79d7de6b1 100644 --- a/service/polly/api_client.go +++ b/service/polly/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/pricing/api_client.go b/service/pricing/api_client.go index dd9fd8f350c..4349b90cfa2 100644 --- a/service/pricing/api_client.go +++ b/service/pricing/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/proton/api_client.go b/service/proton/api_client.go index 662d030a03b..7a1f32cbd06 100644 --- a/service/proton/api_client.go +++ b/service/proton/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/qldb/api_client.go b/service/qldb/api_client.go index 101badc839f..26c0ac3b74c 100644 --- a/service/qldb/api_client.go +++ b/service/qldb/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/qldbsession/api_client.go b/service/qldbsession/api_client.go index 35b2eb8007f..3d386a80151 100644 --- a/service/qldbsession/api_client.go +++ b/service/qldbsession/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/quicksight/api_client.go b/service/quicksight/api_client.go index 7473f123c74..7d2020e4495 100644 --- a/service/quicksight/api_client.go +++ b/service/quicksight/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/ram/api_client.go b/service/ram/api_client.go index 6780f0ecef7..fe568838144 100644 --- a/service/ram/api_client.go +++ b/service/ram/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/rbin/api_client.go b/service/rbin/api_client.go index d8e2e5f272e..ac8290e525e 100644 --- a/service/rbin/api_client.go +++ b/service/rbin/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/rds/api_client.go b/service/rds/api_client.go index 5c9dcbe0c9e..143d13f6779 100644 --- a/service/rds/api_client.go +++ b/service/rds/api_client.go @@ -206,7 +206,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/rdsdata/api_client.go b/service/rdsdata/api_client.go index fa9176cc473..41a14ca6746 100644 --- a/service/rdsdata/api_client.go +++ b/service/rdsdata/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/redshift/api_client.go b/service/redshift/api_client.go index e23bf0b8925..c272628c214 100644 --- a/service/redshift/api_client.go +++ b/service/redshift/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/redshiftdata/api_client.go b/service/redshiftdata/api_client.go index 1a790ae0bc2..81c586e0399 100644 --- a/service/redshiftdata/api_client.go +++ b/service/redshiftdata/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/rekognition/api_client.go b/service/rekognition/api_client.go index 0b5427f91f5..2ca1f462349 100644 --- a/service/rekognition/api_client.go +++ b/service/rekognition/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/resiliencehub/api_client.go b/service/resiliencehub/api_client.go index e3dbe9bd131..90f47c10ec8 100644 --- a/service/resiliencehub/api_client.go +++ b/service/resiliencehub/api_client.go @@ -211,7 +211,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/resourcegroups/api_client.go b/service/resourcegroups/api_client.go index c81cfda1063..31bd8d6a029 100644 --- a/service/resourcegroups/api_client.go +++ b/service/resourcegroups/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/resourcegroupstaggingapi/api_client.go b/service/resourcegroupstaggingapi/api_client.go index a9281febc30..4a7118600ed 100644 --- a/service/resourcegroupstaggingapi/api_client.go +++ b/service/resourcegroupstaggingapi/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/robomaker/api_client.go b/service/robomaker/api_client.go index f1abefaa276..fd386046380 100644 --- a/service/robomaker/api_client.go +++ b/service/robomaker/api_client.go @@ -211,7 +211,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/route53/api_client.go b/service/route53/api_client.go index ec1c99854d1..631a0379ccf 100644 --- a/service/route53/api_client.go +++ b/service/route53/api_client.go @@ -205,7 +205,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/route53domains/api_client.go b/service/route53domains/api_client.go index a15474db72d..f14e4a921f0 100644 --- a/service/route53domains/api_client.go +++ b/service/route53domains/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/route53recoverycluster/api_client.go b/service/route53recoverycluster/api_client.go index 26d25df04af..0adfa8838f1 100644 --- a/service/route53recoverycluster/api_client.go +++ b/service/route53recoverycluster/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/route53recoverycontrolconfig/api_client.go b/service/route53recoverycontrolconfig/api_client.go index cc732c35a39..d58501955f1 100644 --- a/service/route53recoverycontrolconfig/api_client.go +++ b/service/route53recoverycontrolconfig/api_client.go @@ -212,7 +212,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/route53recoveryreadiness/api_client.go b/service/route53recoveryreadiness/api_client.go index 45309ae3a20..40bef15a63b 100644 --- a/service/route53recoveryreadiness/api_client.go +++ b/service/route53recoveryreadiness/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/route53resolver/api_client.go b/service/route53resolver/api_client.go index 385797084b3..49ac37626c5 100644 --- a/service/route53resolver/api_client.go +++ b/service/route53resolver/api_client.go @@ -212,7 +212,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/rum/api_client.go b/service/rum/api_client.go index ce56b2972e7..d652e38ca5c 100644 --- a/service/rum/api_client.go +++ b/service/rum/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/s3/api_client.go b/service/s3/api_client.go index 8764f4a8f2b..c5ab34de2d7 100644 --- a/service/s3/api_client.go +++ b/service/s3/api_client.go @@ -249,7 +249,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/s3control/api_client.go b/service/s3control/api_client.go index 493ebb50016..db075282397 100644 --- a/service/s3control/api_client.go +++ b/service/s3control/api_client.go @@ -224,7 +224,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/s3outposts/api_client.go b/service/s3outposts/api_client.go index 03b59069585..306535ff155 100644 --- a/service/s3outposts/api_client.go +++ b/service/s3outposts/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/sagemaker/api_client.go b/service/sagemaker/api_client.go index 53239854014..3ed0595b432 100644 --- a/service/sagemaker/api_client.go +++ b/service/sagemaker/api_client.go @@ -212,7 +212,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/sagemakera2iruntime/api_client.go b/service/sagemakera2iruntime/api_client.go index 83fbeb5fe19..a9079832011 100644 --- a/service/sagemakera2iruntime/api_client.go +++ b/service/sagemakera2iruntime/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/sagemakeredge/api_client.go b/service/sagemakeredge/api_client.go index 4e7736ebd84..452c86e4991 100644 --- a/service/sagemakeredge/api_client.go +++ b/service/sagemakeredge/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/sagemakerfeaturestoreruntime/api_client.go b/service/sagemakerfeaturestoreruntime/api_client.go index aa81974a4c1..7e6f2ba9b96 100644 --- a/service/sagemakerfeaturestoreruntime/api_client.go +++ b/service/sagemakerfeaturestoreruntime/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/sagemakerruntime/api_client.go b/service/sagemakerruntime/api_client.go index 8c8a0b381e8..dcc028e20f8 100644 --- a/service/sagemakerruntime/api_client.go +++ b/service/sagemakerruntime/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/savingsplans/api_client.go b/service/savingsplans/api_client.go index 176a0dddf90..d295bc95544 100644 --- a/service/savingsplans/api_client.go +++ b/service/savingsplans/api_client.go @@ -211,7 +211,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/schemas/api_client.go b/service/schemas/api_client.go index 6be800b9f57..6ab9afce8ba 100644 --- a/service/schemas/api_client.go +++ b/service/schemas/api_client.go @@ -211,7 +211,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/secretsmanager/api_client.go b/service/secretsmanager/api_client.go index b7ae6d3d604..9e17bf16356 100644 --- a/service/secretsmanager/api_client.go +++ b/service/secretsmanager/api_client.go @@ -211,7 +211,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/securityhub/api_client.go b/service/securityhub/api_client.go index ebed23376c9..6ea968c8b24 100644 --- a/service/securityhub/api_client.go +++ b/service/securityhub/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/serverlessapplicationrepository/api_client.go b/service/serverlessapplicationrepository/api_client.go index 161e09a2d92..d8c9d2e6d43 100644 --- a/service/serverlessapplicationrepository/api_client.go +++ b/service/serverlessapplicationrepository/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/servicecatalog/api_client.go b/service/servicecatalog/api_client.go index 4dacd28d95a..54b30ce7274 100644 --- a/service/servicecatalog/api_client.go +++ b/service/servicecatalog/api_client.go @@ -211,7 +211,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/servicecatalogappregistry/api_client.go b/service/servicecatalogappregistry/api_client.go index 2ed448d0b47..ba4105d9ad2 100644 --- a/service/servicecatalogappregistry/api_client.go +++ b/service/servicecatalogappregistry/api_client.go @@ -212,7 +212,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/servicediscovery/api_client.go b/service/servicediscovery/api_client.go index 4219b5b5796..be5cb36cae3 100644 --- a/service/servicediscovery/api_client.go +++ b/service/servicediscovery/api_client.go @@ -211,7 +211,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/servicequotas/api_client.go b/service/servicequotas/api_client.go index 482387ef386..6bd0dd0de3c 100644 --- a/service/servicequotas/api_client.go +++ b/service/servicequotas/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/ses/api_client.go b/service/ses/api_client.go index eb52c50a836..ad666c79874 100644 --- a/service/ses/api_client.go +++ b/service/ses/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/sesv2/api_client.go b/service/sesv2/api_client.go index 537179430a1..bc2c3db0a3f 100644 --- a/service/sesv2/api_client.go +++ b/service/sesv2/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/sfn/api_client.go b/service/sfn/api_client.go index 59c3e467b89..a392ed72ca5 100644 --- a/service/sfn/api_client.go +++ b/service/sfn/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/shield/api_client.go b/service/shield/api_client.go index bbef796acb7..f4b645b74c8 100644 --- a/service/shield/api_client.go +++ b/service/shield/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/signer/api_client.go b/service/signer/api_client.go index 2d000c9d6b2..21e91b6d9e1 100644 --- a/service/signer/api_client.go +++ b/service/signer/api_client.go @@ -211,7 +211,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/sms/api_client.go b/service/sms/api_client.go index 67883b3c244..6f8878f589f 100644 --- a/service/sms/api_client.go +++ b/service/sms/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/snowball/api_client.go b/service/snowball/api_client.go index b703d667767..2a26cb45d37 100644 --- a/service/snowball/api_client.go +++ b/service/snowball/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/snowdevicemanagement/api_client.go b/service/snowdevicemanagement/api_client.go index 9fc2036a3ed..00f1b294199 100644 --- a/service/snowdevicemanagement/api_client.go +++ b/service/snowdevicemanagement/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/sns/api_client.go b/service/sns/api_client.go index efea317a59c..d32d2676926 100644 --- a/service/sns/api_client.go +++ b/service/sns/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/sqs/api_client.go b/service/sqs/api_client.go index 14ea3feb2cd..eeecc931c50 100644 --- a/service/sqs/api_client.go +++ b/service/sqs/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/ssm/api_client.go b/service/ssm/api_client.go index 3c2488d256d..a785b03947b 100644 --- a/service/ssm/api_client.go +++ b/service/ssm/api_client.go @@ -212,7 +212,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/ssmcontacts/api_client.go b/service/ssmcontacts/api_client.go index d4946c05f78..98d7f225829 100644 --- a/service/ssmcontacts/api_client.go +++ b/service/ssmcontacts/api_client.go @@ -212,7 +212,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/ssmincidents/api_client.go b/service/ssmincidents/api_client.go index d7d436e2b6e..9373c5702a9 100644 --- a/service/ssmincidents/api_client.go +++ b/service/ssmincidents/api_client.go @@ -212,7 +212,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/sso/api_client.go b/service/sso/api_client.go index bd5039590ad..4fed68b6f9d 100644 --- a/service/sso/api_client.go +++ b/service/sso/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/ssoadmin/api_client.go b/service/ssoadmin/api_client.go index d92ede78640..2607cb86215 100644 --- a/service/ssoadmin/api_client.go +++ b/service/ssoadmin/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/ssooidc/api_client.go b/service/ssooidc/api_client.go index 0bfae13885e..0f2e100f801 100644 --- a/service/ssooidc/api_client.go +++ b/service/ssooidc/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/storagegateway/api_client.go b/service/storagegateway/api_client.go index 0cb7764e8c8..9b269399781 100644 --- a/service/storagegateway/api_client.go +++ b/service/storagegateway/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/sts/api_client.go b/service/sts/api_client.go index 1c022f9907e..6614d01b007 100644 --- a/service/sts/api_client.go +++ b/service/sts/api_client.go @@ -206,7 +206,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/support/api_client.go b/service/support/api_client.go index b52ed637b39..71b5174f53f 100644 --- a/service/support/api_client.go +++ b/service/support/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/swf/api_client.go b/service/swf/api_client.go index 53eb252efd4..485ffffa0ca 100644 --- a/service/swf/api_client.go +++ b/service/swf/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/synthetics/api_client.go b/service/synthetics/api_client.go index b4e9a284cf5..ee19b060b92 100644 --- a/service/synthetics/api_client.go +++ b/service/synthetics/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/textract/api_client.go b/service/textract/api_client.go index 5dd2eb7ddcb..fce4cafdcc1 100644 --- a/service/textract/api_client.go +++ b/service/textract/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/timestreamquery/api_client.go b/service/timestreamquery/api_client.go index 147c6bf0262..adafd4e65a0 100644 --- a/service/timestreamquery/api_client.go +++ b/service/timestreamquery/api_client.go @@ -227,7 +227,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/timestreamwrite/api_client.go b/service/timestreamwrite/api_client.go index 35543becfdc..685a9c060cd 100644 --- a/service/timestreamwrite/api_client.go +++ b/service/timestreamwrite/api_client.go @@ -219,7 +219,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/transcribe/api_client.go b/service/transcribe/api_client.go index d07ade077fd..d95a696e6ce 100644 --- a/service/transcribe/api_client.go +++ b/service/transcribe/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/transcribestreaming/api_client.go b/service/transcribestreaming/api_client.go index 00fce2a4e77..c81dbdfdc5a 100644 --- a/service/transcribestreaming/api_client.go +++ b/service/transcribestreaming/api_client.go @@ -206,7 +206,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/transfer/api_client.go b/service/transfer/api_client.go index 4466927d24e..ccf689c088d 100644 --- a/service/transfer/api_client.go +++ b/service/transfer/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/translate/api_client.go b/service/translate/api_client.go index c0a60882948..29f5555c466 100644 --- a/service/translate/api_client.go +++ b/service/translate/api_client.go @@ -211,7 +211,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/voiceid/api_client.go b/service/voiceid/api_client.go index e2528873ca6..2f8b253bc73 100644 --- a/service/voiceid/api_client.go +++ b/service/voiceid/api_client.go @@ -211,7 +211,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/waf/api_client.go b/service/waf/api_client.go index 078af807d9e..a6de09d8d78 100644 --- a/service/waf/api_client.go +++ b/service/waf/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/wafregional/api_client.go b/service/wafregional/api_client.go index cbd166cc242..79177caa9ef 100644 --- a/service/wafregional/api_client.go +++ b/service/wafregional/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/wafv2/api_client.go b/service/wafv2/api_client.go index 11a7986f8ce..df8a314829d 100644 --- a/service/wafv2/api_client.go +++ b/service/wafv2/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/wellarchitected/api_client.go b/service/wellarchitected/api_client.go index 61dfe007faa..b94e8fdfabc 100644 --- a/service/wellarchitected/api_client.go +++ b/service/wellarchitected/api_client.go @@ -212,7 +212,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/wisdom/api_client.go b/service/wisdom/api_client.go index ed2d8f36a5a..395920f1161 100644 --- a/service/wisdom/api_client.go +++ b/service/wisdom/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/workdocs/api_client.go b/service/workdocs/api_client.go index 3f9346f96af..2e724d0f654 100644 --- a/service/workdocs/api_client.go +++ b/service/workdocs/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/worklink/api_client.go b/service/worklink/api_client.go index 988b01e86ee..b4676f6b85e 100644 --- a/service/worklink/api_client.go +++ b/service/worklink/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/workmail/api_client.go b/service/workmail/api_client.go index 6eefeb83bd9..4bb3ff8f5e8 100644 --- a/service/workmail/api_client.go +++ b/service/workmail/api_client.go @@ -211,7 +211,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/workmailmessageflow/api_client.go b/service/workmailmessageflow/api_client.go index acd6905e61a..045cd2af6a5 100644 --- a/service/workmailmessageflow/api_client.go +++ b/service/workmailmessageflow/api_client.go @@ -204,7 +204,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/workspaces/api_client.go b/service/workspaces/api_client.go index e992f516964..030037a6c61 100644 --- a/service/workspaces/api_client.go +++ b/service/workspaces/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver()) diff --git a/service/xray/api_client.go b/service/xray/api_client.go index 237b95703b4..5d6da2140d0 100644 --- a/service/xray/api_client.go +++ b/service/xray/api_client.go @@ -203,7 +203,7 @@ func resolveAWSRetryerProvider(cfg aws.Config, o *Options) { } func resolveAWSEndpointResolver(cfg aws.Config, o *Options) { - if cfg.EndpointResolver == nil { + if cfg.EndpointResolver == nil && cfg.EndpointResolverWithOptions == nil { return } o.EndpointResolver = withEndpointResolver(cfg.EndpointResolver, cfg.EndpointResolverWithOptions, NewDefaultEndpointResolver())