diff --git a/.changelog/70EEF6C5-262D-4DDE-9B4A-B6ADDE267267.json b/.changelog/70EEF6C5-262D-4DDE-9B4A-B6ADDE267267.json new file mode 100644 index 00000000000..a83c6f0ab76 --- /dev/null +++ b/.changelog/70EEF6C5-262D-4DDE-9B4A-B6ADDE267267.json @@ -0,0 +1,419 @@ +{ + "id": "70EEF6C5-262D-4DDE-9B4A-B6ADDE267267", + "type": "feature", + "description": "Add ServiceOptions field to Config for service specific configuration", + "collapse": false, + "modules": [ + "aws", + "service/accessanalyzer", + "service/account", + "service/acm", + "service/acmpca", + "service/aiops", + "service/amp", + "service/amplify", + "service/amplifybackend", + "service/amplifyuibuilder", + "service/apigateway", + "service/apigatewaymanagementapi", + "service/apigatewayv2", + "service/appconfig", + "service/appconfigdata", + "service/appfabric", + "service/appflow", + "service/appintegrations", + "service/applicationautoscaling", + "service/applicationcostprofiler", + "service/applicationdiscoveryservice", + "service/applicationinsights", + "service/applicationsignals", + "service/appmesh", + "service/apprunner", + "service/appstream", + "service/appsync", + "service/apptest", + "service/arczonalshift", + "service/artifact", + "service/athena", + "service/auditmanager", + "service/autoscaling", + "service/autoscalingplans", + "service/b2bi", + "service/backup", + "service/backupgateway", + "service/backupsearch", + "service/batch", + "service/bcmdataexports", + "service/bcmpricingcalculator", + "service/bedrock", + "service/bedrockagent", + "service/bedrockagentcore", + "service/bedrockagentcorecontrol", + "service/bedrockagentruntime", + "service/bedrockdataautomation", + "service/bedrockdataautomationruntime", + "service/bedrockruntime", + "service/billing", + "service/billingconductor", + "service/braket", + "service/budgets", + "service/chatbot", + "service/chime", + "service/chimesdkidentity", + "service/chimesdkmediapipelines", + "service/chimesdkmeetings", + "service/chimesdkmessaging", + "service/chimesdkvoice", + "service/cleanrooms", + "service/cleanroomsml", + "service/cloud9", + "service/cloudcontrol", + "service/clouddirectory", + "service/cloudformation", + "service/cloudfront", + "service/cloudfrontkeyvaluestore", + "service/cloudhsm", + "service/cloudhsmv2", + "service/cloudsearch", + "service/cloudsearchdomain", + "service/cloudtrail", + "service/cloudtraildata", + "service/cloudwatch", + "service/cloudwatchevents", + "service/cloudwatchlogs", + "service/codeartifact", + "service/codebuild", + "service/codecatalyst", + "service/codecommit", + "service/codeconnections", + "service/codedeploy", + "service/codeguruprofiler", + "service/codegurureviewer", + "service/codegurusecurity", + "service/codepipeline", + "service/codestarconnections", + "service/codestarnotifications", + "service/cognitoidentity", + "service/cognitoidentityprovider", + "service/cognitosync", + "service/comprehend", + "service/comprehendmedical", + "service/computeoptimizer", + "service/configservice", + "service/connect", + "service/connectcampaigns", + "service/connectcampaignsv2", + "service/connectcases", + "service/connectcontactlens", + "service/connectparticipant", + "service/controlcatalog", + "service/controltower", + "service/costandusagereportservice", + "service/costexplorer", + "service/costoptimizationhub", + "service/customerprofiles", + "service/databasemigrationservice", + "service/databrew", + "service/dataexchange", + "service/datapipeline", + "service/datasync", + "service/datazone", + "service/dax", + "service/deadline", + "service/detective", + "service/devicefarm", + "service/devopsguru", + "service/directconnect", + "service/directoryservice", + "service/directoryservicedata", + "service/dlm", + "service/docdb", + "service/docdbelastic", + "service/drs", + "service/dsql", + "service/dynamodb", + "service/dynamodbstreams", + "service/ebs", + "service/ec2", + "service/ec2instanceconnect", + "service/ecr", + "service/ecrpublic", + "service/ecs", + "service/efs", + "service/eks", + "service/eksauth", + "service/elasticache", + "service/elasticbeanstalk", + "service/elasticloadbalancing", + "service/elasticloadbalancingv2", + "service/elasticsearchservice", + "service/elastictranscoder", + "service/emr", + "service/emrcontainers", + "service/emrserverless", + "service/entityresolution", + "service/eventbridge", + "service/evidently", + "service/evs", + "service/finspace", + "service/finspacedata", + "service/firehose", + "service/fis", + "service/fms", + "service/forecast", + "service/forecastquery", + "service/frauddetector", + "service/freetier", + "service/fsx", + "service/gamelift", + "service/gameliftstreams", + "service/geomaps", + "service/geoplaces", + "service/georoutes", + "service/glacier", + "service/globalaccelerator", + "service/glue", + "service/grafana", + "service/greengrass", + "service/greengrassv2", + "service/groundstation", + "service/guardduty", + "service/health", + "service/healthlake", + "service/iam", + "service/identitystore", + "service/imagebuilder", + "service/inspector", + "service/inspector2", + "service/inspectorscan", + "service/internetmonitor", + "service/invoicing", + "service/iot", + "service/iotanalytics", + "service/iotdataplane", + "service/iotdeviceadvisor", + "service/iotevents", + "service/ioteventsdata", + "service/iotfleethub", + "service/iotfleetwise", + "service/iotjobsdataplane", + "service/iotmanagedintegrations", + "service/iotsecuretunneling", + "service/iotsitewise", + "service/iotthingsgraph", + "service/iottwinmaker", + "service/iotwireless", + "service/ivs", + "service/ivschat", + "service/ivsrealtime", + "service/kafka", + "service/kafkaconnect", + "service/kendra", + "service/kendraranking", + "service/keyspaces", + "service/keyspacesstreams", + "service/kinesis", + "service/kinesisanalytics", + "service/kinesisanalyticsv2", + "service/kinesisvideo", + "service/kinesisvideoarchivedmedia", + "service/kinesisvideomedia", + "service/kinesisvideosignaling", + "service/kinesisvideowebrtcstorage", + "service/kms", + "service/lakeformation", + "service/lambda", + "service/launchwizard", + "service/lexmodelbuildingservice", + "service/lexmodelsv2", + "service/lexruntimeservice", + "service/lexruntimev2", + "service/licensemanager", + "service/licensemanagerlinuxsubscriptions", + "service/licensemanagerusersubscriptions", + "service/lightsail", + "service/location", + "service/lookoutequipment", + "service/lookoutmetrics", + "service/lookoutvision", + "service/m2", + "service/machinelearning", + "service/macie2", + "service/mailmanager", + "service/managedblockchain", + "service/managedblockchainquery", + "service/marketplaceagreement", + "service/marketplacecatalog", + "service/marketplacecommerceanalytics", + "service/marketplacedeployment", + "service/marketplaceentitlementservice", + "service/marketplacemetering", + "service/marketplacereporting", + "service/mediaconnect", + "service/mediaconvert", + "service/medialive", + "service/mediapackage", + "service/mediapackagev2", + "service/mediapackagevod", + "service/mediastore", + "service/mediastoredata", + "service/mediatailor", + "service/medicalimaging", + "service/memorydb", + "service/mgn", + "service/migrationhub", + "service/migrationhubconfig", + "service/migrationhuborchestrator", + "service/migrationhubrefactorspaces", + "service/migrationhubstrategy", + "service/mpa", + "service/mq", + "service/mturk", + "service/mwaa", + "service/neptune", + "service/neptunedata", + "service/neptunegraph", + "service/networkfirewall", + "service/networkflowmonitor", + "service/networkmanager", + "service/networkmonitor", + "service/notifications", + "service/notificationscontacts", + "service/oam", + "service/observabilityadmin", + "service/odb", + "service/omics", + "service/opensearch", + "service/opensearchserverless", + "service/opsworks", + "service/opsworkscm", + "service/organizations", + "service/osis", + "service/outposts", + "service/panorama", + "service/partnercentralselling", + "service/paymentcryptography", + "service/paymentcryptographydata", + "service/pcaconnectorad", + "service/pcaconnectorscep", + "service/pcs", + "service/personalize", + "service/personalizeevents", + "service/personalizeruntime", + "service/pi", + "service/pinpoint", + "service/pinpointemail", + "service/pinpointsmsvoice", + "service/pinpointsmsvoicev2", + "service/pipes", + "service/polly", + "service/pricing", + "service/proton", + "service/qapps", + "service/qbusiness", + "service/qconnect", + "service/qldb", + "service/qldbsession", + "service/quicksight", + "service/ram", + "service/rbin", + "service/rds", + "service/rdsdata", + "service/redshift", + "service/redshiftdata", + "service/redshiftserverless", + "service/rekognition", + "service/repostspace", + "service/resiliencehub", + "service/resourceexplorer2", + "service/resourcegroups", + "service/resourcegroupstaggingapi", + "service/robomaker", + "service/rolesanywhere", + "service/route53", + "service/route53domains", + "service/route53profiles", + "service/route53recoverycluster", + "service/route53recoverycontrolconfig", + "service/route53recoveryreadiness", + "service/route53resolver", + "service/rum", + "service/s3", + "service/s3control", + "service/s3outposts", + "service/s3tables", + "service/s3vectors", + "service/sagemaker", + "service/sagemakera2iruntime", + "service/sagemakeredge", + "service/sagemakermetrics", + "service/sagemakerruntime", + "service/savingsplans", + "service/scheduler", + "service/schemas", + "service/secretsmanager", + "service/securityhub", + "service/securityir", + "service/securitylake", + "service/serverlessapplicationrepository", + "service/servicecatalog", + "service/servicecatalogappregistry", + "service/servicediscovery", + "service/servicequotas", + "service/ses", + "service/sesv2", + "service/sfn", + "service/shield", + "service/signer", + "service/simspaceweaver", + "service/sms", + "service/snowball", + "service/snowdevicemanagement", + "service/sns", + "service/socialmessaging", + "service/sqs", + "service/ssm", + "service/ssmcontacts", + "service/ssmguiconnect", + "service/ssmincidents", + "service/ssmquicksetup", + "service/ssmsap", + "service/sso", + "service/ssoadmin", + "service/ssooidc", + "service/storagegateway", + "service/sts", + "service/supplychain", + "service/support", + "service/supportapp", + "service/swf", + "service/synthetics", + "service/taxsettings", + "service/textract", + "service/timestreaminfluxdb", + "service/timestreamquery", + "service/timestreamwrite", + "service/tnb", + "service/transcribe", + "service/transcribestreaming", + "service/transfer", + "service/translate", + "service/trustedadvisor", + "service/verifiedpermissions", + "service/voiceid", + "service/vpclattice", + "service/waf", + "service/wafregional", + "service/wafv2", + "service/wellarchitected", + "service/wisdom", + "service/workdocs", + "service/workmail", + "service/workmailmessageflow", + "service/workspaces", + "service/workspacesinstances", + "service/workspacesthinclient", + "service/workspacesweb", + "service/xray" + ] +} diff --git a/aws/config.go b/aws/config.go index c78ef70c5d7..3219517dabc 100644 --- a/aws/config.go +++ b/aws/config.go @@ -199,6 +199,11 @@ type Config struct { // Priority list of preferred auth scheme IDs. AuthSchemePreference []string + + // ServiceOptions provides service specific configuration options that will be applied + // when constructing clients for specific services. Each callback function receives the service ID + // and the service's Options struct, allowing for dynamic configuration based on the service. + ServiceOptions []func(string, any) } // NewConfig returns a new Config pointer that can be chained with builder diff --git a/aws/config_test.go b/aws/config_test.go new file mode 100644 index 00000000000..edf4bbb70a9 --- /dev/null +++ b/aws/config_test.go @@ -0,0 +1,248 @@ +package aws + +import ( + "testing" +) + +// Mock service options struct for testing +type MockServiceOptions struct { + Field1 bool + Field2 string + Field3 int +} + +func TestWithServiceOptions(t *testing.T) { + cfg := NewConfig() + + // Add ServiceOptions directly to test the field + cfg.ServiceOptions = []func(string, any){ + func(serviceID string, opts any) { + if serviceID == "TestService" { + if mockOpts, ok := opts.(*MockServiceOptions); ok { + mockOpts.Field1 = true + mockOpts.Field2 = "test" + } + } + }, + } + + if cfg.ServiceOptions == nil { + t.Fatal("ServiceOptions should not be nil") + } + + if len(cfg.ServiceOptions) != 1 { + t.Fatalf("Expected 1 callback, got %d", len(cfg.ServiceOptions)) + } + + mockOpts := &MockServiceOptions{} + for _, callback := range cfg.ServiceOptions { + callback("TestService", mockOpts) + } + + if !mockOpts.Field1 { + t.Error("Field1 should be true") + } + + if mockOpts.Field2 != "test" { + t.Errorf("Field2 should be 'test', got '%s'", mockOpts.Field2) + } +} + +func TestWithServiceOptionsMultiple(t *testing.T) { + cfg := NewConfig() + + // Add ServiceOptions directly to test the field + cfg.ServiceOptions = []func(string, any){ + func(serviceID string, opts any) { + if serviceID == "Service1" { + if mockOpts, ok := opts.(*MockServiceOptions); ok { + mockOpts.Field1 = true + } + } + }, + func(serviceID string, opts any) { + if serviceID == "Service2" { + if mockOpts, ok := opts.(*MockServiceOptions); ok { + mockOpts.Field2 = "test" + } + } + }, + } + + if len(cfg.ServiceOptions) != 2 { + t.Fatalf("Expected 2 callbacks, got %d", len(cfg.ServiceOptions)) + } + + mockOpts1 := &MockServiceOptions{} + for _, callback := range cfg.ServiceOptions { + callback("Service1", mockOpts1) + } + + if !mockOpts1.Field1 { + t.Error("Service1 Field1 should be true") + } + + if mockOpts1.Field2 != "" { + t.Errorf("Service1 Field2 should be empty, got '%s'", mockOpts1.Field2) + } + + mockOpts2 := &MockServiceOptions{} + for _, callback := range cfg.ServiceOptions { + callback("Service2", mockOpts2) + } + + if mockOpts2.Field1 { + t.Error("Service2 Field1 should be false") + } + + if mockOpts2.Field2 != "test" { + t.Errorf("Service2 Field2 should be 'test', got '%s'", mockOpts2.Field2) + } +} + +func TestWithServiceOptionsMultipleServiceIDs(t *testing.T) { + cfg := NewConfig() + + // Add ServiceOptions directly to test the field + cfg.ServiceOptions = []func(string, any){ + func(serviceID string, opts any) { + if mockOpts, ok := opts.(*MockServiceOptions); ok { + switch serviceID { + case "Service1": + mockOpts.Field1 = true + mockOpts.Field2 = "service1" + case "Service2": + mockOpts.Field1 = false + mockOpts.Field2 = "service2" + case "Service3": + mockOpts.Field3 = 42 + } + } + }, + } + + if len(cfg.ServiceOptions) != 1 { + t.Fatalf("Expected 1 callback, got %d", len(cfg.ServiceOptions)) + } + + mockOpts1 := &MockServiceOptions{} + for _, callback := range cfg.ServiceOptions { + callback("Service1", mockOpts1) + } + + if !mockOpts1.Field1 { + t.Error("Service1 Field1 should be true") + } + if mockOpts1.Field2 != "service1" { + t.Errorf("Service1 Field2 should be 'service1', got '%s'", mockOpts1.Field2) + } + if mockOpts1.Field3 != 0 { + t.Errorf("Service1 Field3 should be 0, got %d", mockOpts1.Field3) + } + + mockOpts2 := &MockServiceOptions{} + for _, callback := range cfg.ServiceOptions { + callback("Service2", mockOpts2) + } + + if mockOpts2.Field1 { + t.Error("Service2 Field1 should be false") + } + if mockOpts2.Field2 != "service2" { + t.Errorf("Service2 Field2 should be 'service2', got '%s'", mockOpts2.Field2) + } + if mockOpts2.Field3 != 0 { + t.Errorf("Service2 Field3 should be 0, got %d", mockOpts2.Field3) + } + + mockOpts3 := &MockServiceOptions{} + for _, callback := range cfg.ServiceOptions { + callback("Service3", mockOpts3) + } + + if mockOpts3.Field1 { + t.Error("Service3 Field1 should be false") + } + if mockOpts3.Field2 != "" { + t.Errorf("Service3 Field2 should be empty, got '%s'", mockOpts3.Field2) + } + if mockOpts3.Field3 != 42 { + t.Errorf("Service3 Field3 should be 42, got %d", mockOpts3.Field3) + } +} + +func TestApplyServiceOptionsNonExistent(t *testing.T) { + mockOpts := &MockServiceOptions{} + + // No service options configured, so no callbacks to execute + if mockOpts.Field1 || mockOpts.Field2 != "" || mockOpts.Field3 != 0 { + t.Error("Options should not be modified for non-existent service") + } +} + +func TestTypeAssertionFailure(t *testing.T) { + cfg := NewConfig() + + // Add ServiceOptions directly to test the field + cfg.ServiceOptions = []func(string, any){ + func(serviceID string, opts any) { + if serviceID == "TestService" { + if mockOpts, ok := opts.(*MockServiceOptions); ok { + mockOpts.Field1 = true + } + } + }, + } + + differentOpts := &struct{ Field string }{Field: "test"} + for _, callback := range cfg.ServiceOptions { + callback("TestService", differentOpts) + } + + if differentOpts.Field != "test" { + t.Error("Different options should not be modified") + } +} + +func TestChaining(t *testing.T) { + cfg := NewConfig() + + cfg.ServiceOptions = []func(string, any){ + func(serviceID string, opts any) { + if serviceID == "Service1" { + if mockOpts, ok := opts.(*MockServiceOptions); ok { + mockOpts.Field1 = true + } + } + }, + func(serviceID string, opts any) { + if serviceID == "Service2" { + if mockOpts, ok := opts.(*MockServiceOptions); ok { + mockOpts.Field2 = "chained" + } + } + }, + } + + if len(cfg.ServiceOptions) != 2 { + t.Fatalf("Expected 2 callbacks, got %d", len(cfg.ServiceOptions)) + } + + mockOpts1 := &MockServiceOptions{} + for _, callback := range cfg.ServiceOptions { + callback("Service1", mockOpts1) + } + + if !mockOpts1.Field1 { + t.Error("Service1 Field1 should be true") + } + + mockOpts2 := &MockServiceOptions{} + for _, callback := range cfg.ServiceOptions { + callback("Service2", mockOpts2) + } + + if mockOpts2.Field2 != "chained" { + t.Errorf("Service2 Field2 should be 'chained', got '%s'", mockOpts2.Field2) + } +} 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 edd3ef41b2a..03b3a9f096d 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 @@ -750,7 +750,14 @@ private void writeAwsConfigConstructor(Model model, ServiceShape service, GoWrit writer.write("$L(cfg, &opts)", awsResolverFunction.get()); } - writer.write("return New(opts, optFns...)"); + writer.write("return New(opts, func(o *Options) {"); + writer.write(" for _, opt := range cfg.ServiceOptions {"); + writer.write(" opt(ServiceID, o)"); + writer.write(" }"); + writer.write(" for _, opt := range optFns {"); + writer.write(" opt(o)"); + writer.write(" }"); + writer.write("})"); }); writer.write(""); } diff --git a/config/config.go b/config/config.go index b138b8d95dd..caa20a158aa 100644 --- a/config/config.go +++ b/config/config.go @@ -93,6 +93,9 @@ var defaultAWSConfigResolvers = []awsConfigResolver{ resolveInterceptors, resolveAuthSchemePreference, + + // Sets the ServiceOptions if present in LoadOptions + resolveServiceOptions, } // A Config represents a generic configuration value or set of values. This type diff --git a/config/load_options.go b/config/load_options.go index 0f0f928cb65..7cb5a136588 100644 --- a/config/load_options.go +++ b/config/load_options.go @@ -235,6 +235,11 @@ type LoadOptions struct { // Priority list of preferred auth scheme names (e.g. sigv4a). AuthSchemePreference []string + + // ServiceOptions provides service specific configuration options that will be applied + // when constructing clients for specific services. Each callback function receives the service ID + // and the service's Options struct, allowing for dynamic configuration based on the service. + ServiceOptions []func(string, any) } func (o LoadOptions) getDefaultsMode(ctx context.Context) (aws.DefaultsMode, bool, error) { @@ -314,6 +319,10 @@ func (o LoadOptions) getBaseEndpoint(context.Context) (string, bool, error) { return o.BaseEndpoint, o.BaseEndpoint != "", nil } +func (o LoadOptions) getServiceOptions(context.Context) ([]func(string, any), bool, error) { + return o.ServiceOptions, len(o.ServiceOptions) > 0, nil +} + // GetServiceBaseEndpoint satisfies (internal/configsources).ServiceBaseEndpointProvider. // // The sdkID value is unused because LoadOptions only supports setting a GLOBAL @@ -1215,6 +1224,15 @@ func WithBaseEndpoint(v string) LoadOptionsFunc { } } +// WithServiceOptions is a helper function to construct functional options +// that sets ServiceOptions on config's LoadOptions. +func WithServiceOptions(callbacks ...func(string, any)) LoadOptionsFunc { + return func(o *LoadOptions) error { + o.ServiceOptions = append(o.ServiceOptions, callbacks...) + return nil + } +} + // WithBeforeExecution adds the BeforeExecutionInterceptor to config. func WithBeforeExecution(i smithyhttp.BeforeExecutionInterceptor) LoadOptionsFunc { return func(o *LoadOptions) error { diff --git a/config/provider.go b/config/provider.go index b03292f7ec9..18b9b5ad20e 100644 --- a/config/provider.go +++ b/config/provider.go @@ -768,3 +768,19 @@ func getAuthSchemePreference(ctx context.Context, configs configs) ([]string, bo } return nil, false } + +type serviceOptionsProvider interface { + getServiceOptions(ctx context.Context) ([]func(string, any), bool, error) +} + +func getServiceOptions(ctx context.Context, configs configs) (v []func(string, any), found bool, err error) { + for _, c := range configs { + if p, ok := c.(serviceOptionsProvider); ok { + v, found, err = p.getServiceOptions(ctx) + if err != nil || found { + break + } + } + } + return v, found, err +} diff --git a/config/resolve.go b/config/resolve.go index 64ae63808aa..92a16d718df 100644 --- a/config/resolve.go +++ b/config/resolve.go @@ -429,3 +429,16 @@ func resolveAuthSchemePreference(ctx context.Context, cfg *aws.Config, configs c } return nil } + +func resolveServiceOptions(ctx context.Context, cfg *aws.Config, configs configs) error { + serviceOptions, found, err := getServiceOptions(ctx, configs) + if err != nil { + return err + } + if !found { + return nil + } + + cfg.ServiceOptions = serviceOptions + return nil +} diff --git a/internal/kitchensinktest/api_client.go b/internal/kitchensinktest/api_client.go index 676f8b46e50..e08bd113138 100644 --- a/internal/kitchensinktest/api_client.go +++ b/internal/kitchensinktest/api_client.go @@ -437,7 +437,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/internal/protocoltest/awsrestjson/api_client.go b/internal/protocoltest/awsrestjson/api_client.go index 45e2d122f18..7648b9d929e 100644 --- a/internal/protocoltest/awsrestjson/api_client.go +++ b/internal/protocoltest/awsrestjson/api_client.go @@ -444,7 +444,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/internal/protocoltest/ec2query/api_client.go b/internal/protocoltest/ec2query/api_client.go index a934bffb98b..b8c69ad26f3 100644 --- a/internal/protocoltest/ec2query/api_client.go +++ b/internal/protocoltest/ec2query/api_client.go @@ -444,7 +444,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/internal/protocoltest/jsonrpc/api_client.go b/internal/protocoltest/jsonrpc/api_client.go index 221c4cfaac0..649e90a29bd 100644 --- a/internal/protocoltest/jsonrpc/api_client.go +++ b/internal/protocoltest/jsonrpc/api_client.go @@ -440,7 +440,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/internal/protocoltest/jsonrpc10/api_client.go b/internal/protocoltest/jsonrpc10/api_client.go index 3027cadc3ce..c9eadc1a76b 100644 --- a/internal/protocoltest/jsonrpc10/api_client.go +++ b/internal/protocoltest/jsonrpc10/api_client.go @@ -440,7 +440,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/internal/protocoltest/jsonrpc10querycompatible/api_client.go b/internal/protocoltest/jsonrpc10querycompatible/api_client.go index c1679fbae18..c0a8a4bae28 100644 --- a/internal/protocoltest/jsonrpc10querycompatible/api_client.go +++ b/internal/protocoltest/jsonrpc10querycompatible/api_client.go @@ -437,7 +437,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/internal/protocoltest/nonquerycompatiblerpcv2protocol/api_client.go b/internal/protocoltest/nonquerycompatiblerpcv2protocol/api_client.go index d2fa0288332..9dd333fc7e7 100644 --- a/internal/protocoltest/nonquerycompatiblerpcv2protocol/api_client.go +++ b/internal/protocoltest/nonquerycompatiblerpcv2protocol/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/internal/protocoltest/query/api_client.go b/internal/protocoltest/query/api_client.go index b7b62081cce..6e956adeab5 100644 --- a/internal/protocoltest/query/api_client.go +++ b/internal/protocoltest/query/api_client.go @@ -444,7 +444,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/internal/protocoltest/querycompatiblejsonrpc10/api_client.go b/internal/protocoltest/querycompatiblejsonrpc10/api_client.go index 3c80942850d..e231c205b88 100644 --- a/internal/protocoltest/querycompatiblejsonrpc10/api_client.go +++ b/internal/protocoltest/querycompatiblejsonrpc10/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/internal/protocoltest/querycompatiblerpcv2protocol/api_client.go b/internal/protocoltest/querycompatiblerpcv2protocol/api_client.go index 99ad65eb336..b0f2b65ebba 100644 --- a/internal/protocoltest/querycompatiblerpcv2protocol/api_client.go +++ b/internal/protocoltest/querycompatiblerpcv2protocol/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/internal/protocoltest/restxml/api_client.go b/internal/protocoltest/restxml/api_client.go index 20758f4d102..7f6fddf4b2a 100644 --- a/internal/protocoltest/restxml/api_client.go +++ b/internal/protocoltest/restxml/api_client.go @@ -444,7 +444,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/internal/protocoltest/restxmlwithnamespace/api_client.go b/internal/protocoltest/restxmlwithnamespace/api_client.go index d6f3d9d9a5f..1f0dab9d971 100644 --- a/internal/protocoltest/restxmlwithnamespace/api_client.go +++ b/internal/protocoltest/restxmlwithnamespace/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/internal/protocoltest/smithyrpcv2cbor/api_client.go b/internal/protocoltest/smithyrpcv2cbor/api_client.go index 74f207e325b..801d3d718ac 100644 --- a/internal/protocoltest/smithyrpcv2cbor/api_client.go +++ b/internal/protocoltest/smithyrpcv2cbor/api_client.go @@ -424,7 +424,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/internal/protocoltest/smithyrpcv2cborquerycompatible/api_client.go b/internal/protocoltest/smithyrpcv2cborquerycompatible/api_client.go index ecdb0eeece6..67cde1c86a0 100644 --- a/internal/protocoltest/smithyrpcv2cborquerycompatible/api_client.go +++ b/internal/protocoltest/smithyrpcv2cborquerycompatible/api_client.go @@ -437,7 +437,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/accessanalyzer/api_client.go b/service/accessanalyzer/api_client.go index b3f94f95c8c..3d9365cae8d 100644 --- a/service/accessanalyzer/api_client.go +++ b/service/accessanalyzer/api_client.go @@ -442,7 +442,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/account/api_client.go b/service/account/api_client.go index 45ec7b5b9c0..bda07e42346 100644 --- a/service/account/api_client.go +++ b/service/account/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/acm/api_client.go b/service/acm/api_client.go index a9dce07826e..43b053720ac 100644 --- a/service/acm/api_client.go +++ b/service/acm/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/acmpca/api_client.go b/service/acmpca/api_client.go index 34f9867043b..36fc278f529 100644 --- a/service/acmpca/api_client.go +++ b/service/acmpca/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/aiops/api_client.go b/service/aiops/api_client.go index 8a54c4291b1..632def3eb96 100644 --- a/service/aiops/api_client.go +++ b/service/aiops/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/amp/api_client.go b/service/amp/api_client.go index 90b96a17900..d92e1150102 100644 --- a/service/amp/api_client.go +++ b/service/amp/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/amplify/api_client.go b/service/amplify/api_client.go index 95d5798a985..c7beee18fd3 100644 --- a/service/amplify/api_client.go +++ b/service/amplify/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/amplifybackend/api_client.go b/service/amplifybackend/api_client.go index ee5bdafdaf1..2932d10625b 100644 --- a/service/amplifybackend/api_client.go +++ b/service/amplifybackend/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/amplifyuibuilder/api_client.go b/service/amplifyuibuilder/api_client.go index e8a28f2ec5c..3a53b608c90 100644 --- a/service/amplifyuibuilder/api_client.go +++ b/service/amplifyuibuilder/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/apigateway/api_client.go b/service/apigateway/api_client.go index 56ee71e414c..ddb9ced01ad 100644 --- a/service/apigateway/api_client.go +++ b/service/apigateway/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/apigatewaymanagementapi/api_client.go b/service/apigatewaymanagementapi/api_client.go index b8e07067fe6..1ca2d169be0 100644 --- a/service/apigatewaymanagementapi/api_client.go +++ b/service/apigatewaymanagementapi/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/apigatewayv2/api_client.go b/service/apigatewayv2/api_client.go index 778d69f2067..0c1708dc937 100644 --- a/service/apigatewayv2/api_client.go +++ b/service/apigatewayv2/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/appconfig/api_client.go b/service/appconfig/api_client.go index 16a531c2339..c9b5da5a40c 100644 --- a/service/appconfig/api_client.go +++ b/service/appconfig/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/appconfigdata/api_client.go b/service/appconfigdata/api_client.go index 19aa5874d1a..94acea6fc87 100644 --- a/service/appconfigdata/api_client.go +++ b/service/appconfigdata/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/appfabric/api_client.go b/service/appfabric/api_client.go index dfad76688f9..5c3c84803d0 100644 --- a/service/appfabric/api_client.go +++ b/service/appfabric/api_client.go @@ -442,7 +442,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/appflow/api_client.go b/service/appflow/api_client.go index 4a33b6bc79e..37bbcff7a48 100644 --- a/service/appflow/api_client.go +++ b/service/appflow/api_client.go @@ -442,7 +442,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/appintegrations/api_client.go b/service/appintegrations/api_client.go index 88dafea54b1..edb22cc5feb 100644 --- a/service/appintegrations/api_client.go +++ b/service/appintegrations/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/applicationautoscaling/api_client.go b/service/applicationautoscaling/api_client.go index 4f6002a7d02..6e5026f1ab9 100644 --- a/service/applicationautoscaling/api_client.go +++ b/service/applicationautoscaling/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/applicationcostprofiler/api_client.go b/service/applicationcostprofiler/api_client.go index f41969661d2..ed32d0eb779 100644 --- a/service/applicationcostprofiler/api_client.go +++ b/service/applicationcostprofiler/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/applicationdiscoveryservice/api_client.go b/service/applicationdiscoveryservice/api_client.go index b1056ca1c07..082d7347a01 100644 --- a/service/applicationdiscoveryservice/api_client.go +++ b/service/applicationdiscoveryservice/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/applicationinsights/api_client.go b/service/applicationinsights/api_client.go index 40654e3e3c1..88669ba9549 100644 --- a/service/applicationinsights/api_client.go +++ b/service/applicationinsights/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/applicationsignals/api_client.go b/service/applicationsignals/api_client.go index 5c3ce93b080..fb0e687abc4 100644 --- a/service/applicationsignals/api_client.go +++ b/service/applicationsignals/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/appmesh/api_client.go b/service/appmesh/api_client.go index 5a3844bc904..c6296b2d6bf 100644 --- a/service/appmesh/api_client.go +++ b/service/appmesh/api_client.go @@ -442,7 +442,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/apprunner/api_client.go b/service/apprunner/api_client.go index d045a952d57..9a5d7d49182 100644 --- a/service/apprunner/api_client.go +++ b/service/apprunner/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/appstream/api_client.go b/service/appstream/api_client.go index 57cd5b106d5..c1f6e710a41 100644 --- a/service/appstream/api_client.go +++ b/service/appstream/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/appsync/api_client.go b/service/appsync/api_client.go index bcc5b198318..168d46fa8cf 100644 --- a/service/appsync/api_client.go +++ b/service/appsync/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/apptest/api_client.go b/service/apptest/api_client.go index 534edcfed12..b5a1db13bcc 100644 --- a/service/apptest/api_client.go +++ b/service/apptest/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/arczonalshift/api_client.go b/service/arczonalshift/api_client.go index 8b5c6f960e8..c93f7f5a72f 100644 --- a/service/arczonalshift/api_client.go +++ b/service/arczonalshift/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/artifact/api_client.go b/service/artifact/api_client.go index 931ddfcf2f0..4a89a7cbe51 100644 --- a/service/artifact/api_client.go +++ b/service/artifact/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/athena/api_client.go b/service/athena/api_client.go index 1e81f8c4f0f..b4c2e9ee435 100644 --- a/service/athena/api_client.go +++ b/service/athena/api_client.go @@ -442,7 +442,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/auditmanager/api_client.go b/service/auditmanager/api_client.go index 44d339d314a..a0adf0b7336 100644 --- a/service/auditmanager/api_client.go +++ b/service/auditmanager/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/autoscaling/api_client.go b/service/autoscaling/api_client.go index 79ef5707fe9..12465e762ea 100644 --- a/service/autoscaling/api_client.go +++ b/service/autoscaling/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/autoscalingplans/api_client.go b/service/autoscalingplans/api_client.go index be696735304..8c87a473db3 100644 --- a/service/autoscalingplans/api_client.go +++ b/service/autoscalingplans/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/b2bi/api_client.go b/service/b2bi/api_client.go index 279da576491..38327c6492a 100644 --- a/service/b2bi/api_client.go +++ b/service/b2bi/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/backup/api_client.go b/service/backup/api_client.go index 0ca3b58bd69..f83217b3792 100644 --- a/service/backup/api_client.go +++ b/service/backup/api_client.go @@ -442,7 +442,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/backupgateway/api_client.go b/service/backupgateway/api_client.go index 6fd62687da9..e9868b847a6 100644 --- a/service/backupgateway/api_client.go +++ b/service/backupgateway/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/backupsearch/api_client.go b/service/backupsearch/api_client.go index 2c759aae0e9..f40b5766a22 100644 --- a/service/backupsearch/api_client.go +++ b/service/backupsearch/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/batch/api_client.go b/service/batch/api_client.go index 943daad77e7..97b92259676 100644 --- a/service/batch/api_client.go +++ b/service/batch/api_client.go @@ -442,7 +442,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/bcmdataexports/api_client.go b/service/bcmdataexports/api_client.go index 10c7c8894f1..d61bde6a3c9 100644 --- a/service/bcmdataexports/api_client.go +++ b/service/bcmdataexports/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/bcmpricingcalculator/api_client.go b/service/bcmpricingcalculator/api_client.go index c3ca4e4a615..62c596882d2 100644 --- a/service/bcmpricingcalculator/api_client.go +++ b/service/bcmpricingcalculator/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/bedrock/api_client.go b/service/bedrock/api_client.go index 656418c8062..1fb107a2c2e 100644 --- a/service/bedrock/api_client.go +++ b/service/bedrock/api_client.go @@ -447,7 +447,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/bedrockagent/api_client.go b/service/bedrockagent/api_client.go index 7a06c98385b..850efa7356e 100644 --- a/service/bedrockagent/api_client.go +++ b/service/bedrockagent/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/bedrockagentcore/api_client.go b/service/bedrockagentcore/api_client.go index 50a110cedc3..68840658b7c 100644 --- a/service/bedrockagentcore/api_client.go +++ b/service/bedrockagentcore/api_client.go @@ -445,7 +445,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/bedrockagentcorecontrol/api_client.go b/service/bedrockagentcorecontrol/api_client.go index 3ffeca12d87..7cb2d62f686 100644 --- a/service/bedrockagentcorecontrol/api_client.go +++ b/service/bedrockagentcorecontrol/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/bedrockagentruntime/api_client.go b/service/bedrockagentruntime/api_client.go index 9ebd4588124..af76ebcdb4c 100644 --- a/service/bedrockagentruntime/api_client.go +++ b/service/bedrockagentruntime/api_client.go @@ -441,7 +441,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/bedrockdataautomation/api_client.go b/service/bedrockdataautomation/api_client.go index ddd5219c593..933dcfe027a 100644 --- a/service/bedrockdataautomation/api_client.go +++ b/service/bedrockdataautomation/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/bedrockdataautomationruntime/api_client.go b/service/bedrockdataautomationruntime/api_client.go index 7e8b5950173..aac7f775a69 100644 --- a/service/bedrockdataautomationruntime/api_client.go +++ b/service/bedrockdataautomationruntime/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/bedrockruntime/api_client.go b/service/bedrockruntime/api_client.go index b5ab6950cc1..d8ea03e5686 100644 --- a/service/bedrockruntime/api_client.go +++ b/service/bedrockruntime/api_client.go @@ -450,7 +450,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/billing/api_client.go b/service/billing/api_client.go index edaa9cfbfb3..f89775c00ca 100644 --- a/service/billing/api_client.go +++ b/service/billing/api_client.go @@ -442,7 +442,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/billingconductor/api_client.go b/service/billingconductor/api_client.go index c782b101dc5..74e06b46376 100644 --- a/service/billingconductor/api_client.go +++ b/service/billingconductor/api_client.go @@ -442,7 +442,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/braket/api_client.go b/service/braket/api_client.go index 7425209571c..886075b0cc3 100644 --- a/service/braket/api_client.go +++ b/service/braket/api_client.go @@ -442,7 +442,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/budgets/api_client.go b/service/budgets/api_client.go index 71f6e7c40f9..b9f5a4de245 100644 --- a/service/budgets/api_client.go +++ b/service/budgets/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/chatbot/api_client.go b/service/chatbot/api_client.go index c345652cca1..7e95aa5eb1d 100644 --- a/service/chatbot/api_client.go +++ b/service/chatbot/api_client.go @@ -442,7 +442,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/chime/api_client.go b/service/chime/api_client.go index 3216ff5be77..2ff8b03ca01 100644 --- a/service/chime/api_client.go +++ b/service/chime/api_client.go @@ -442,7 +442,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/chimesdkidentity/api_client.go b/service/chimesdkidentity/api_client.go index 7a3ebb2caa5..cb71e17efad 100644 --- a/service/chimesdkidentity/api_client.go +++ b/service/chimesdkidentity/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/chimesdkmediapipelines/api_client.go b/service/chimesdkmediapipelines/api_client.go index 21eb4183350..ff31bff1b33 100644 --- a/service/chimesdkmediapipelines/api_client.go +++ b/service/chimesdkmediapipelines/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/chimesdkmeetings/api_client.go b/service/chimesdkmeetings/api_client.go index 59993645f5c..8e69cb004d2 100644 --- a/service/chimesdkmeetings/api_client.go +++ b/service/chimesdkmeetings/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/chimesdkmessaging/api_client.go b/service/chimesdkmessaging/api_client.go index a595df13a4e..9022e132475 100644 --- a/service/chimesdkmessaging/api_client.go +++ b/service/chimesdkmessaging/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/chimesdkvoice/api_client.go b/service/chimesdkvoice/api_client.go index d0bbd8e5ac1..cf76c74350f 100644 --- a/service/chimesdkvoice/api_client.go +++ b/service/chimesdkvoice/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/cleanrooms/api_client.go b/service/cleanrooms/api_client.go index 55dc23bde17..d1c7fbb4bef 100644 --- a/service/cleanrooms/api_client.go +++ b/service/cleanrooms/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/cleanroomsml/api_client.go b/service/cleanroomsml/api_client.go index 791dd9436d0..59c9d5adfd0 100644 --- a/service/cleanroomsml/api_client.go +++ b/service/cleanroomsml/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/cloud9/api_client.go b/service/cloud9/api_client.go index f571f0c8ff5..7a747eebd9e 100644 --- a/service/cloud9/api_client.go +++ b/service/cloud9/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/cloudcontrol/api_client.go b/service/cloudcontrol/api_client.go index 27409cc61b2..7b2941a7a87 100644 --- a/service/cloudcontrol/api_client.go +++ b/service/cloudcontrol/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/clouddirectory/api_client.go b/service/clouddirectory/api_client.go index 2942e59f119..5387e6a2134 100644 --- a/service/clouddirectory/api_client.go +++ b/service/clouddirectory/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/cloudformation/api_client.go b/service/cloudformation/api_client.go index feb2bef5c0e..1584051f44b 100644 --- a/service/cloudformation/api_client.go +++ b/service/cloudformation/api_client.go @@ -442,7 +442,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/cloudfront/api_client.go b/service/cloudfront/api_client.go index dbc9b0c9545..61cb7d768a0 100644 --- a/service/cloudfront/api_client.go +++ b/service/cloudfront/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/cloudfrontkeyvaluestore/api_client.go b/service/cloudfrontkeyvaluestore/api_client.go index cabcc5f8a25..0ddc182464f 100644 --- a/service/cloudfrontkeyvaluestore/api_client.go +++ b/service/cloudfrontkeyvaluestore/api_client.go @@ -447,7 +447,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/cloudhsm/api_client.go b/service/cloudhsm/api_client.go index 111710dcc11..f8262f47aef 100644 --- a/service/cloudhsm/api_client.go +++ b/service/cloudhsm/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/cloudhsmv2/api_client.go b/service/cloudhsmv2/api_client.go index cc89f90e353..a1ea8930bda 100644 --- a/service/cloudhsmv2/api_client.go +++ b/service/cloudhsmv2/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/cloudsearch/api_client.go b/service/cloudsearch/api_client.go index 5b6b3f4ce16..f329ef49bd8 100644 --- a/service/cloudsearch/api_client.go +++ b/service/cloudsearch/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/cloudsearchdomain/api_client.go b/service/cloudsearchdomain/api_client.go index 2f9ddbc11c1..e67c44fd5b9 100644 --- a/service/cloudsearchdomain/api_client.go +++ b/service/cloudsearchdomain/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/cloudtrail/api_client.go b/service/cloudtrail/api_client.go index e0bf8eabb3d..f89ab4080a2 100644 --- a/service/cloudtrail/api_client.go +++ b/service/cloudtrail/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/cloudtraildata/api_client.go b/service/cloudtraildata/api_client.go index 2fc01d543ea..a2d5eda7297 100644 --- a/service/cloudtraildata/api_client.go +++ b/service/cloudtraildata/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/cloudwatch/api_client.go b/service/cloudwatch/api_client.go index 9ec0832f5e8..dfddbdebe0e 100644 --- a/service/cloudwatch/api_client.go +++ b/service/cloudwatch/api_client.go @@ -440,7 +440,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/cloudwatchevents/api_client.go b/service/cloudwatchevents/api_client.go index bbacaf9f513..31b979b324e 100644 --- a/service/cloudwatchevents/api_client.go +++ b/service/cloudwatchevents/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/cloudwatchlogs/api_client.go b/service/cloudwatchlogs/api_client.go index 15344fbbfcf..439133475b7 100644 --- a/service/cloudwatchlogs/api_client.go +++ b/service/cloudwatchlogs/api_client.go @@ -445,7 +445,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/codeartifact/api_client.go b/service/codeartifact/api_client.go index 5ed2fab22e2..3382476da81 100644 --- a/service/codeartifact/api_client.go +++ b/service/codeartifact/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/codebuild/api_client.go b/service/codebuild/api_client.go index d8e221bcb4e..c38a85ac845 100644 --- a/service/codebuild/api_client.go +++ b/service/codebuild/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/codecatalyst/api_client.go b/service/codecatalyst/api_client.go index 7eccfc2335c..13d84650e13 100644 --- a/service/codecatalyst/api_client.go +++ b/service/codecatalyst/api_client.go @@ -436,7 +436,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/codecommit/api_client.go b/service/codecommit/api_client.go index 63c271c2a2c..1ddafcd5148 100644 --- a/service/codecommit/api_client.go +++ b/service/codecommit/api_client.go @@ -442,7 +442,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/codeconnections/api_client.go b/service/codeconnections/api_client.go index 34ac18652b4..58d60ef06b3 100644 --- a/service/codeconnections/api_client.go +++ b/service/codeconnections/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/codedeploy/api_client.go b/service/codedeploy/api_client.go index 6725702f33d..2e8bd59d1a7 100644 --- a/service/codedeploy/api_client.go +++ b/service/codedeploy/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/codeguruprofiler/api_client.go b/service/codeguruprofiler/api_client.go index e531d8ca380..6b5a31ed035 100644 --- a/service/codeguruprofiler/api_client.go +++ b/service/codeguruprofiler/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/codegurureviewer/api_client.go b/service/codegurureviewer/api_client.go index fd9fc95a90c..55c157a05c7 100644 --- a/service/codegurureviewer/api_client.go +++ b/service/codegurureviewer/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/codegurusecurity/api_client.go b/service/codegurusecurity/api_client.go index f6cf7d44af7..cdc5d550920 100644 --- a/service/codegurusecurity/api_client.go +++ b/service/codegurusecurity/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/codepipeline/api_client.go b/service/codepipeline/api_client.go index 141644f0d5f..e9975b57895 100644 --- a/service/codepipeline/api_client.go +++ b/service/codepipeline/api_client.go @@ -442,7 +442,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/codestarconnections/api_client.go b/service/codestarconnections/api_client.go index b979c86cb43..2204050df8e 100644 --- a/service/codestarconnections/api_client.go +++ b/service/codestarconnections/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/codestarnotifications/api_client.go b/service/codestarnotifications/api_client.go index caa228bd5b5..7e4b83f4af5 100644 --- a/service/codestarnotifications/api_client.go +++ b/service/codestarnotifications/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/cognitoidentity/api_client.go b/service/cognitoidentity/api_client.go index f0cccb42371..f71e1af58a5 100644 --- a/service/cognitoidentity/api_client.go +++ b/service/cognitoidentity/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/cognitoidentityprovider/api_client.go b/service/cognitoidentityprovider/api_client.go index ec4d2f5c3fb..259f89775cc 100644 --- a/service/cognitoidentityprovider/api_client.go +++ b/service/cognitoidentityprovider/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/cognitosync/api_client.go b/service/cognitosync/api_client.go index 32c883bea0b..5224eecff31 100644 --- a/service/cognitosync/api_client.go +++ b/service/cognitosync/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/comprehend/api_client.go b/service/comprehend/api_client.go index 6a04d9ae3dd..1988e9f9418 100644 --- a/service/comprehend/api_client.go +++ b/service/comprehend/api_client.go @@ -442,7 +442,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/comprehendmedical/api_client.go b/service/comprehendmedical/api_client.go index 9d6001ee1a5..3bc3875bd31 100644 --- a/service/comprehendmedical/api_client.go +++ b/service/comprehendmedical/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/computeoptimizer/api_client.go b/service/computeoptimizer/api_client.go index c94eb6f2bd8..d22610059e4 100644 --- a/service/computeoptimizer/api_client.go +++ b/service/computeoptimizer/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/configservice/api_client.go b/service/configservice/api_client.go index 503a96f1f29..879204a79fa 100644 --- a/service/configservice/api_client.go +++ b/service/configservice/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/connect/api_client.go b/service/connect/api_client.go index 4f6284ff7a9..f894c6574f7 100644 --- a/service/connect/api_client.go +++ b/service/connect/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/connectcampaigns/api_client.go b/service/connectcampaigns/api_client.go index b7242986df0..021a511045d 100644 --- a/service/connectcampaigns/api_client.go +++ b/service/connectcampaigns/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/connectcampaignsv2/api_client.go b/service/connectcampaignsv2/api_client.go index 49a561a993a..58ebc08530c 100644 --- a/service/connectcampaignsv2/api_client.go +++ b/service/connectcampaignsv2/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/connectcases/api_client.go b/service/connectcases/api_client.go index 840a9477406..6e6f0eb1030 100644 --- a/service/connectcases/api_client.go +++ b/service/connectcases/api_client.go @@ -442,7 +442,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/connectcontactlens/api_client.go b/service/connectcontactlens/api_client.go index bede1529b50..64189782531 100644 --- a/service/connectcontactlens/api_client.go +++ b/service/connectcontactlens/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/connectparticipant/api_client.go b/service/connectparticipant/api_client.go index bd5ea53d9b0..797e3a873cc 100644 --- a/service/connectparticipant/api_client.go +++ b/service/connectparticipant/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/controlcatalog/api_client.go b/service/controlcatalog/api_client.go index cce24a8b1db..488bb63319a 100644 --- a/service/controlcatalog/api_client.go +++ b/service/controlcatalog/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/controltower/api_client.go b/service/controltower/api_client.go index e777ab918b9..bf53c3e1be6 100644 --- a/service/controltower/api_client.go +++ b/service/controltower/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/costandusagereportservice/api_client.go b/service/costandusagereportservice/api_client.go index 5436bf60b1b..bda1e8bd4c3 100644 --- a/service/costandusagereportservice/api_client.go +++ b/service/costandusagereportservice/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/costexplorer/api_client.go b/service/costexplorer/api_client.go index 34e7150b30a..17a89f39860 100644 --- a/service/costexplorer/api_client.go +++ b/service/costexplorer/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/costoptimizationhub/api_client.go b/service/costoptimizationhub/api_client.go index 0da0c2d3b90..fad8bf64f03 100644 --- a/service/costoptimizationhub/api_client.go +++ b/service/costoptimizationhub/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/customerprofiles/api_client.go b/service/customerprofiles/api_client.go index 8776766fc01..6ae1c3862b8 100644 --- a/service/customerprofiles/api_client.go +++ b/service/customerprofiles/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/databasemigrationservice/api_client.go b/service/databasemigrationservice/api_client.go index c64e4843d73..21b01eac83d 100644 --- a/service/databasemigrationservice/api_client.go +++ b/service/databasemigrationservice/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/databrew/api_client.go b/service/databrew/api_client.go index 914cd79d9a7..0a0f94a2cb7 100644 --- a/service/databrew/api_client.go +++ b/service/databrew/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/dataexchange/api_client.go b/service/dataexchange/api_client.go index 833fb4b4917..a503ed531cf 100644 --- a/service/dataexchange/api_client.go +++ b/service/dataexchange/api_client.go @@ -442,7 +442,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/datapipeline/api_client.go b/service/datapipeline/api_client.go index 0c7e0198216..363a03e8fa7 100644 --- a/service/datapipeline/api_client.go +++ b/service/datapipeline/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/datasync/api_client.go b/service/datasync/api_client.go index 176989fa52c..9307e98c538 100644 --- a/service/datasync/api_client.go +++ b/service/datasync/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/datazone/api_client.go b/service/datazone/api_client.go index 59e9846c927..73093df9ff7 100644 --- a/service/datazone/api_client.go +++ b/service/datazone/api_client.go @@ -442,7 +442,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/dax/api_client.go b/service/dax/api_client.go index 739c40f657e..78d5da2ef46 100644 --- a/service/dax/api_client.go +++ b/service/dax/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/deadline/api_client.go b/service/deadline/api_client.go index c0e54382c68..636e6755724 100644 --- a/service/deadline/api_client.go +++ b/service/deadline/api_client.go @@ -442,7 +442,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/detective/api_client.go b/service/detective/api_client.go index d9849bbea7f..cf09f18d09a 100644 --- a/service/detective/api_client.go +++ b/service/detective/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/devicefarm/api_client.go b/service/devicefarm/api_client.go index 7226cbb5b99..c623df90755 100644 --- a/service/devicefarm/api_client.go +++ b/service/devicefarm/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/devopsguru/api_client.go b/service/devopsguru/api_client.go index d95aab43853..71f94d70a22 100644 --- a/service/devopsguru/api_client.go +++ b/service/devopsguru/api_client.go @@ -442,7 +442,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/directconnect/api_client.go b/service/directconnect/api_client.go index ba0cf4a02ac..46645afa2f5 100644 --- a/service/directconnect/api_client.go +++ b/service/directconnect/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/directoryservice/api_client.go b/service/directoryservice/api_client.go index 90c0a4076be..7af61565dbc 100644 --- a/service/directoryservice/api_client.go +++ b/service/directoryservice/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/directoryservicedata/api_client.go b/service/directoryservicedata/api_client.go index fab0d47c3cd..e73b42d5126 100644 --- a/service/directoryservicedata/api_client.go +++ b/service/directoryservicedata/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/dlm/api_client.go b/service/dlm/api_client.go index cfa9507efdb..4e8cbb8c555 100644 --- a/service/dlm/api_client.go +++ b/service/dlm/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/docdb/api_client.go b/service/docdb/api_client.go index 2073391e57d..b71c759b54e 100644 --- a/service/docdb/api_client.go +++ b/service/docdb/api_client.go @@ -442,7 +442,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/docdbelastic/api_client.go b/service/docdbelastic/api_client.go index 2b2031fc656..cd0c03894d6 100644 --- a/service/docdbelastic/api_client.go +++ b/service/docdbelastic/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/drs/api_client.go b/service/drs/api_client.go index b32ac75703b..6b334b320ff 100644 --- a/service/drs/api_client.go +++ b/service/drs/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/dsql/api_client.go b/service/dsql/api_client.go index 32478f98db3..629d8ef166f 100644 --- a/service/dsql/api_client.go +++ b/service/dsql/api_client.go @@ -442,7 +442,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/dynamodb/api_client.go b/service/dynamodb/api_client.go index 11db79680f4..487c8200a6a 100644 --- a/service/dynamodb/api_client.go +++ b/service/dynamodb/api_client.go @@ -456,7 +456,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/dynamodbstreams/api_client.go b/service/dynamodbstreams/api_client.go index 3531e5112fe..be1c880d7e3 100644 --- a/service/dynamodbstreams/api_client.go +++ b/service/dynamodbstreams/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/ebs/api_client.go b/service/ebs/api_client.go index 659742ea2e1..280c737f5ac 100644 --- a/service/ebs/api_client.go +++ b/service/ebs/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/ec2/api_client.go b/service/ec2/api_client.go index 6e52e5f6e99..31695be564c 100644 --- a/service/ec2/api_client.go +++ b/service/ec2/api_client.go @@ -446,7 +446,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/ec2instanceconnect/api_client.go b/service/ec2instanceconnect/api_client.go index 704591c98d4..9e2404a2c2c 100644 --- a/service/ec2instanceconnect/api_client.go +++ b/service/ec2instanceconnect/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/ecr/api_client.go b/service/ecr/api_client.go index 96de65367fa..55723423102 100644 --- a/service/ecr/api_client.go +++ b/service/ecr/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/ecrpublic/api_client.go b/service/ecrpublic/api_client.go index 26f4f270cfa..c16587275bf 100644 --- a/service/ecrpublic/api_client.go +++ b/service/ecrpublic/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/ecs/api_client.go b/service/ecs/api_client.go index fd9e12f04f3..52d79f507a2 100644 --- a/service/ecs/api_client.go +++ b/service/ecs/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/efs/api_client.go b/service/efs/api_client.go index 53385d4d939..4fe5359a57f 100644 --- a/service/efs/api_client.go +++ b/service/efs/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/eks/api_client.go b/service/eks/api_client.go index 12a1a5d294a..fdb0a6fceb8 100644 --- a/service/eks/api_client.go +++ b/service/eks/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/eksauth/api_client.go b/service/eksauth/api_client.go index 045d70ba316..951a88fd8e5 100644 --- a/service/eksauth/api_client.go +++ b/service/eksauth/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/elasticache/api_client.go b/service/elasticache/api_client.go index d15d85f79d7..d958b4c6090 100644 --- a/service/elasticache/api_client.go +++ b/service/elasticache/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/elasticbeanstalk/api_client.go b/service/elasticbeanstalk/api_client.go index e27ea676184..d03d6839047 100644 --- a/service/elasticbeanstalk/api_client.go +++ b/service/elasticbeanstalk/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/elasticloadbalancing/api_client.go b/service/elasticloadbalancing/api_client.go index b53efd31846..ecb73963db7 100644 --- a/service/elasticloadbalancing/api_client.go +++ b/service/elasticloadbalancing/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/elasticloadbalancingv2/api_client.go b/service/elasticloadbalancingv2/api_client.go index ddb010d1b00..0480e1cf4a4 100644 --- a/service/elasticloadbalancingv2/api_client.go +++ b/service/elasticloadbalancingv2/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/elasticsearchservice/api_client.go b/service/elasticsearchservice/api_client.go index 7e0d113d8ef..1a3454a46c4 100644 --- a/service/elasticsearchservice/api_client.go +++ b/service/elasticsearchservice/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/elastictranscoder/api_client.go b/service/elastictranscoder/api_client.go index de58e48a276..d951fc71d08 100644 --- a/service/elastictranscoder/api_client.go +++ b/service/elastictranscoder/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/emr/api_client.go b/service/emr/api_client.go index 46d051fbe96..02931aa7413 100644 --- a/service/emr/api_client.go +++ b/service/emr/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/emrcontainers/api_client.go b/service/emrcontainers/api_client.go index 9c094bb3e1a..133c768cf54 100644 --- a/service/emrcontainers/api_client.go +++ b/service/emrcontainers/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/emrserverless/api_client.go b/service/emrserverless/api_client.go index 776db6bd111..98a8f7141bc 100644 --- a/service/emrserverless/api_client.go +++ b/service/emrserverless/api_client.go @@ -442,7 +442,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/entityresolution/api_client.go b/service/entityresolution/api_client.go index d3c12d36026..9d2cb752330 100644 --- a/service/entityresolution/api_client.go +++ b/service/entityresolution/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/eventbridge/api_client.go b/service/eventbridge/api_client.go index 174ee2cfacc..bfd75279d8c 100644 --- a/service/eventbridge/api_client.go +++ b/service/eventbridge/api_client.go @@ -448,7 +448,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/evidently/api_client.go b/service/evidently/api_client.go index 7fae52afed6..6045971b934 100644 --- a/service/evidently/api_client.go +++ b/service/evidently/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/evs/api_client.go b/service/evs/api_client.go index ee570561b77..3e932584338 100644 --- a/service/evs/api_client.go +++ b/service/evs/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/finspace/api_client.go b/service/finspace/api_client.go index c2a73e247b4..30502528c0a 100644 --- a/service/finspace/api_client.go +++ b/service/finspace/api_client.go @@ -444,7 +444,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/finspacedata/api_client.go b/service/finspacedata/api_client.go index 72e8d0609dd..41faf8f8dac 100644 --- a/service/finspacedata/api_client.go +++ b/service/finspacedata/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/firehose/api_client.go b/service/firehose/api_client.go index 3c4a44794e9..25092e1424a 100644 --- a/service/firehose/api_client.go +++ b/service/firehose/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/fis/api_client.go b/service/fis/api_client.go index fb785496057..8e5a9fdfb37 100644 --- a/service/fis/api_client.go +++ b/service/fis/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/fms/api_client.go b/service/fms/api_client.go index 4186cd35841..652221a5aaf 100644 --- a/service/fms/api_client.go +++ b/service/fms/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/forecast/api_client.go b/service/forecast/api_client.go index d7f4a2fcf4d..948d25af106 100644 --- a/service/forecast/api_client.go +++ b/service/forecast/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/forecastquery/api_client.go b/service/forecastquery/api_client.go index bb5ee10a6d0..8216e342edc 100644 --- a/service/forecastquery/api_client.go +++ b/service/forecastquery/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/frauddetector/api_client.go b/service/frauddetector/api_client.go index 1f1827521d3..da64495db27 100644 --- a/service/frauddetector/api_client.go +++ b/service/frauddetector/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/freetier/api_client.go b/service/freetier/api_client.go index 0ee97a36e45..fa7043ff409 100644 --- a/service/freetier/api_client.go +++ b/service/freetier/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/fsx/api_client.go b/service/fsx/api_client.go index 3577b666e88..1122ab92b42 100644 --- a/service/fsx/api_client.go +++ b/service/fsx/api_client.go @@ -442,7 +442,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/gamelift/api_client.go b/service/gamelift/api_client.go index efd15614f78..fe22713a70b 100644 --- a/service/gamelift/api_client.go +++ b/service/gamelift/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/gameliftstreams/api_client.go b/service/gameliftstreams/api_client.go index f8d8ceed3a3..46c538a1f05 100644 --- a/service/gameliftstreams/api_client.go +++ b/service/gameliftstreams/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/geomaps/api_client.go b/service/geomaps/api_client.go index 789e6ba60b6..91007f78a22 100644 --- a/service/geomaps/api_client.go +++ b/service/geomaps/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/geoplaces/api_client.go b/service/geoplaces/api_client.go index 4415c0d6d74..dfe482469a6 100644 --- a/service/geoplaces/api_client.go +++ b/service/geoplaces/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/georoutes/api_client.go b/service/georoutes/api_client.go index d0bfe5b3440..e3584780c53 100644 --- a/service/georoutes/api_client.go +++ b/service/georoutes/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/glacier/api_client.go b/service/glacier/api_client.go index 7d984e336db..e3a62f3dc3e 100644 --- a/service/glacier/api_client.go +++ b/service/glacier/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/globalaccelerator/api_client.go b/service/globalaccelerator/api_client.go index 8cd01c7ea04..a2322600597 100644 --- a/service/globalaccelerator/api_client.go +++ b/service/globalaccelerator/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/glue/api_client.go b/service/glue/api_client.go index 35c4251f86f..c21c6a1f337 100644 --- a/service/glue/api_client.go +++ b/service/glue/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/grafana/api_client.go b/service/grafana/api_client.go index 3cc95fb4ea3..77d248f787c 100644 --- a/service/grafana/api_client.go +++ b/service/grafana/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/greengrass/api_client.go b/service/greengrass/api_client.go index f047e24be1f..50fd8024792 100644 --- a/service/greengrass/api_client.go +++ b/service/greengrass/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/greengrassv2/api_client.go b/service/greengrassv2/api_client.go index 36e83c17a10..3634980f870 100644 --- a/service/greengrassv2/api_client.go +++ b/service/greengrassv2/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/groundstation/api_client.go b/service/groundstation/api_client.go index 9cfbb72ff60..0b167ec2196 100644 --- a/service/groundstation/api_client.go +++ b/service/groundstation/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/guardduty/api_client.go b/service/guardduty/api_client.go index 6e2c55e6677..f40bb034b5d 100644 --- a/service/guardduty/api_client.go +++ b/service/guardduty/api_client.go @@ -442,7 +442,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/health/api_client.go b/service/health/api_client.go index 3d7cb3b5c18..d89bc8c54d3 100644 --- a/service/health/api_client.go +++ b/service/health/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/healthlake/api_client.go b/service/healthlake/api_client.go index 265ff8adf57..03882cd39ae 100644 --- a/service/healthlake/api_client.go +++ b/service/healthlake/api_client.go @@ -442,7 +442,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/iam/api_client.go b/service/iam/api_client.go index 6c73b0c91d7..8c439cb0f94 100644 --- a/service/iam/api_client.go +++ b/service/iam/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/identitystore/api_client.go b/service/identitystore/api_client.go index e1bf6f31439..68c27164a5d 100644 --- a/service/identitystore/api_client.go +++ b/service/identitystore/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/imagebuilder/api_client.go b/service/imagebuilder/api_client.go index 4b06a7175e9..f75c91005e1 100644 --- a/service/imagebuilder/api_client.go +++ b/service/imagebuilder/api_client.go @@ -442,7 +442,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/inspector/api_client.go b/service/inspector/api_client.go index 97875594c29..218361775fd 100644 --- a/service/inspector/api_client.go +++ b/service/inspector/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/inspector2/api_client.go b/service/inspector2/api_client.go index 1420e686e12..0d637401c96 100644 --- a/service/inspector2/api_client.go +++ b/service/inspector2/api_client.go @@ -442,7 +442,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/inspectorscan/api_client.go b/service/inspectorscan/api_client.go index 1309418d718..b0b4cb6276d 100644 --- a/service/inspectorscan/api_client.go +++ b/service/inspectorscan/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/internetmonitor/api_client.go b/service/internetmonitor/api_client.go index 1fe61b52ad0..db9490f47c5 100644 --- a/service/internetmonitor/api_client.go +++ b/service/internetmonitor/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/invoicing/api_client.go b/service/invoicing/api_client.go index 24322ec7840..3c3c7524ca2 100644 --- a/service/invoicing/api_client.go +++ b/service/invoicing/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/iot/api_client.go b/service/iot/api_client.go index 9bd6eec820f..57c7e811f54 100644 --- a/service/iot/api_client.go +++ b/service/iot/api_client.go @@ -442,7 +442,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/iotanalytics/api_client.go b/service/iotanalytics/api_client.go index 11001be298a..ff59aa0d474 100644 --- a/service/iotanalytics/api_client.go +++ b/service/iotanalytics/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/iotdataplane/api_client.go b/service/iotdataplane/api_client.go index c82786f7861..96cc64c1cf2 100644 --- a/service/iotdataplane/api_client.go +++ b/service/iotdataplane/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/iotdeviceadvisor/api_client.go b/service/iotdeviceadvisor/api_client.go index c43c6256eed..73aab9e4571 100644 --- a/service/iotdeviceadvisor/api_client.go +++ b/service/iotdeviceadvisor/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/iotevents/api_client.go b/service/iotevents/api_client.go index 62f10269758..727b0aac935 100644 --- a/service/iotevents/api_client.go +++ b/service/iotevents/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/ioteventsdata/api_client.go b/service/ioteventsdata/api_client.go index 19a41453742..9b9d49b33ac 100644 --- a/service/ioteventsdata/api_client.go +++ b/service/ioteventsdata/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/iotfleethub/api_client.go b/service/iotfleethub/api_client.go index 1eb16d9f367..9cbb954ab2d 100644 --- a/service/iotfleethub/api_client.go +++ b/service/iotfleethub/api_client.go @@ -442,7 +442,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/iotfleetwise/api_client.go b/service/iotfleetwise/api_client.go index a3ecf76f283..c01e9728404 100644 --- a/service/iotfleetwise/api_client.go +++ b/service/iotfleetwise/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/iotjobsdataplane/api_client.go b/service/iotjobsdataplane/api_client.go index 8b1b06a3868..2962e35cff3 100644 --- a/service/iotjobsdataplane/api_client.go +++ b/service/iotjobsdataplane/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/iotmanagedintegrations/api_client.go b/service/iotmanagedintegrations/api_client.go index 6abfc8a24dc..a0baafd9ba0 100644 --- a/service/iotmanagedintegrations/api_client.go +++ b/service/iotmanagedintegrations/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/iotsecuretunneling/api_client.go b/service/iotsecuretunneling/api_client.go index c39fc5764e4..92fb3dd9718 100644 --- a/service/iotsecuretunneling/api_client.go +++ b/service/iotsecuretunneling/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/iotsitewise/api_client.go b/service/iotsitewise/api_client.go index 4dcbcfe42bc..8b2921bc834 100644 --- a/service/iotsitewise/api_client.go +++ b/service/iotsitewise/api_client.go @@ -444,7 +444,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/iotthingsgraph/api_client.go b/service/iotthingsgraph/api_client.go index b9333af9aa6..593b8084dfc 100644 --- a/service/iotthingsgraph/api_client.go +++ b/service/iotthingsgraph/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/iottwinmaker/api_client.go b/service/iottwinmaker/api_client.go index d37d1dc22c3..fdbbe99d26a 100644 --- a/service/iottwinmaker/api_client.go +++ b/service/iottwinmaker/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/iotwireless/api_client.go b/service/iotwireless/api_client.go index 717b9c33226..675f2bf980d 100644 --- a/service/iotwireless/api_client.go +++ b/service/iotwireless/api_client.go @@ -442,7 +442,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/ivs/api_client.go b/service/ivs/api_client.go index bbdb7750bb6..1656fbc802a 100644 --- a/service/ivs/api_client.go +++ b/service/ivs/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/ivschat/api_client.go b/service/ivschat/api_client.go index ba1ece59aa8..1b3e54f9004 100644 --- a/service/ivschat/api_client.go +++ b/service/ivschat/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/ivsrealtime/api_client.go b/service/ivsrealtime/api_client.go index 59fe3c45b91..58207bb10a6 100644 --- a/service/ivsrealtime/api_client.go +++ b/service/ivsrealtime/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/kafka/api_client.go b/service/kafka/api_client.go index 6d7c3a82d93..2151a26803c 100644 --- a/service/kafka/api_client.go +++ b/service/kafka/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/kafkaconnect/api_client.go b/service/kafkaconnect/api_client.go index cf56a52cf78..084a359f939 100644 --- a/service/kafkaconnect/api_client.go +++ b/service/kafkaconnect/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/kendra/api_client.go b/service/kendra/api_client.go index 8c6e9f39e49..5864c7761a9 100644 --- a/service/kendra/api_client.go +++ b/service/kendra/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/kendraranking/api_client.go b/service/kendraranking/api_client.go index cb17461e29a..2b8fa44787f 100644 --- a/service/kendraranking/api_client.go +++ b/service/kendraranking/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/keyspaces/api_client.go b/service/keyspaces/api_client.go index 936e62cdb2a..a7050ea7f69 100644 --- a/service/keyspaces/api_client.go +++ b/service/keyspaces/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/keyspacesstreams/api_client.go b/service/keyspacesstreams/api_client.go index d2f8fa53792..28e1bd33cc4 100644 --- a/service/keyspacesstreams/api_client.go +++ b/service/keyspacesstreams/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/kinesis/api_client.go b/service/kinesis/api_client.go index 32277255578..0c94ed634cf 100644 --- a/service/kinesis/api_client.go +++ b/service/kinesis/api_client.go @@ -440,7 +440,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/kinesisanalytics/api_client.go b/service/kinesisanalytics/api_client.go index e821db4d14a..df92d5e0122 100644 --- a/service/kinesisanalytics/api_client.go +++ b/service/kinesisanalytics/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/kinesisanalyticsv2/api_client.go b/service/kinesisanalyticsv2/api_client.go index 72a5ba11314..3e4245c30c8 100644 --- a/service/kinesisanalyticsv2/api_client.go +++ b/service/kinesisanalyticsv2/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/kinesisvideo/api_client.go b/service/kinesisvideo/api_client.go index c9fa8525e2a..6f21494ece4 100644 --- a/service/kinesisvideo/api_client.go +++ b/service/kinesisvideo/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/kinesisvideoarchivedmedia/api_client.go b/service/kinesisvideoarchivedmedia/api_client.go index 796347ea7c1..315bb0ac747 100644 --- a/service/kinesisvideoarchivedmedia/api_client.go +++ b/service/kinesisvideoarchivedmedia/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/kinesisvideomedia/api_client.go b/service/kinesisvideomedia/api_client.go index bca38f12db9..a8884535209 100644 --- a/service/kinesisvideomedia/api_client.go +++ b/service/kinesisvideomedia/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/kinesisvideosignaling/api_client.go b/service/kinesisvideosignaling/api_client.go index 35dca105b15..ab4de73ab62 100644 --- a/service/kinesisvideosignaling/api_client.go +++ b/service/kinesisvideosignaling/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/kinesisvideowebrtcstorage/api_client.go b/service/kinesisvideowebrtcstorage/api_client.go index f825f5292e2..965fc661a48 100644 --- a/service/kinesisvideowebrtcstorage/api_client.go +++ b/service/kinesisvideowebrtcstorage/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/kms/api_client.go b/service/kms/api_client.go index 59d4a066a34..38c17c28a26 100644 --- a/service/kms/api_client.go +++ b/service/kms/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/lakeformation/api_client.go b/service/lakeformation/api_client.go index e4ba4addbc8..b79eaf97c43 100644 --- a/service/lakeformation/api_client.go +++ b/service/lakeformation/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/lambda/api_client.go b/service/lambda/api_client.go index 4b0e653a9da..446b58c29cd 100644 --- a/service/lambda/api_client.go +++ b/service/lambda/api_client.go @@ -440,7 +440,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/launchwizard/api_client.go b/service/launchwizard/api_client.go index 28d7498badf..acd958f2d8d 100644 --- a/service/launchwizard/api_client.go +++ b/service/launchwizard/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/lexmodelbuildingservice/api_client.go b/service/lexmodelbuildingservice/api_client.go index 33ee991cbc4..0c8762f0e7f 100644 --- a/service/lexmodelbuildingservice/api_client.go +++ b/service/lexmodelbuildingservice/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/lexmodelsv2/api_client.go b/service/lexmodelsv2/api_client.go index 4457b77b649..596aaf1a674 100644 --- a/service/lexmodelsv2/api_client.go +++ b/service/lexmodelsv2/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/lexruntimeservice/api_client.go b/service/lexruntimeservice/api_client.go index 0021606263a..a5150ebed19 100644 --- a/service/lexruntimeservice/api_client.go +++ b/service/lexruntimeservice/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/lexruntimev2/api_client.go b/service/lexruntimev2/api_client.go index d69ce082444..c6f475f3622 100644 --- a/service/lexruntimev2/api_client.go +++ b/service/lexruntimev2/api_client.go @@ -441,7 +441,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/licensemanager/api_client.go b/service/licensemanager/api_client.go index e01bd4c6721..6ff4f43a5da 100644 --- a/service/licensemanager/api_client.go +++ b/service/licensemanager/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/licensemanagerlinuxsubscriptions/api_client.go b/service/licensemanagerlinuxsubscriptions/api_client.go index 8443bb3532b..286b7225e0b 100644 --- a/service/licensemanagerlinuxsubscriptions/api_client.go +++ b/service/licensemanagerlinuxsubscriptions/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/licensemanagerusersubscriptions/api_client.go b/service/licensemanagerusersubscriptions/api_client.go index 840bb0ccbe0..79c7451d1ce 100644 --- a/service/licensemanagerusersubscriptions/api_client.go +++ b/service/licensemanagerusersubscriptions/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/lightsail/api_client.go b/service/lightsail/api_client.go index 0999dd62e27..5d7f9e21397 100644 --- a/service/lightsail/api_client.go +++ b/service/lightsail/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/location/api_client.go b/service/location/api_client.go index 9c465604962..371d0d0c74d 100644 --- a/service/location/api_client.go +++ b/service/location/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/lookoutequipment/api_client.go b/service/lookoutequipment/api_client.go index a73064f2a02..3cb8e86b4a3 100644 --- a/service/lookoutequipment/api_client.go +++ b/service/lookoutequipment/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/lookoutmetrics/api_client.go b/service/lookoutmetrics/api_client.go index c9fbfc58f5c..19c198c9953 100644 --- a/service/lookoutmetrics/api_client.go +++ b/service/lookoutmetrics/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/lookoutvision/api_client.go b/service/lookoutvision/api_client.go index 666181eff4b..f77bd7c7e07 100644 --- a/service/lookoutvision/api_client.go +++ b/service/lookoutvision/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/m2/api_client.go b/service/m2/api_client.go index 02d12c034c6..8a9c963b69d 100644 --- a/service/m2/api_client.go +++ b/service/m2/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/machinelearning/api_client.go b/service/machinelearning/api_client.go index 98cc3264450..5ab72144b32 100644 --- a/service/machinelearning/api_client.go +++ b/service/machinelearning/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/macie2/api_client.go b/service/macie2/api_client.go index df4b0bb08f1..6408b6e375a 100644 --- a/service/macie2/api_client.go +++ b/service/macie2/api_client.go @@ -442,7 +442,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/mailmanager/api_client.go b/service/mailmanager/api_client.go index 4db57db082c..5070bf5abbc 100644 --- a/service/mailmanager/api_client.go +++ b/service/mailmanager/api_client.go @@ -442,7 +442,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/managedblockchain/api_client.go b/service/managedblockchain/api_client.go index 396d9659fb4..6475b54dec1 100644 --- a/service/managedblockchain/api_client.go +++ b/service/managedblockchain/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/managedblockchainquery/api_client.go b/service/managedblockchainquery/api_client.go index 746a5e8a58c..764e6aac239 100644 --- a/service/managedblockchainquery/api_client.go +++ b/service/managedblockchainquery/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/marketplaceagreement/api_client.go b/service/marketplaceagreement/api_client.go index 04073cd139d..d6136cb574a 100644 --- a/service/marketplaceagreement/api_client.go +++ b/service/marketplaceagreement/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/marketplacecatalog/api_client.go b/service/marketplacecatalog/api_client.go index 420f9f2eb3b..d38e43d08b1 100644 --- a/service/marketplacecatalog/api_client.go +++ b/service/marketplacecatalog/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/marketplacecommerceanalytics/api_client.go b/service/marketplacecommerceanalytics/api_client.go index f02c70b5102..a9e6e53a706 100644 --- a/service/marketplacecommerceanalytics/api_client.go +++ b/service/marketplacecommerceanalytics/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/marketplacedeployment/api_client.go b/service/marketplacedeployment/api_client.go index d34c9303dfc..fffaa8781d2 100644 --- a/service/marketplacedeployment/api_client.go +++ b/service/marketplacedeployment/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/marketplaceentitlementservice/api_client.go b/service/marketplaceentitlementservice/api_client.go index 43a78fa1e62..26c3f5561ab 100644 --- a/service/marketplaceentitlementservice/api_client.go +++ b/service/marketplaceentitlementservice/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/marketplacemetering/api_client.go b/service/marketplacemetering/api_client.go index c44fe71890b..0ae952002a1 100644 --- a/service/marketplacemetering/api_client.go +++ b/service/marketplacemetering/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/marketplacereporting/api_client.go b/service/marketplacereporting/api_client.go index 01209202049..a7ef9045a47 100644 --- a/service/marketplacereporting/api_client.go +++ b/service/marketplacereporting/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/mediaconnect/api_client.go b/service/mediaconnect/api_client.go index 4d5440a12ee..7656e52ab90 100644 --- a/service/mediaconnect/api_client.go +++ b/service/mediaconnect/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/mediaconvert/api_client.go b/service/mediaconvert/api_client.go index 84e60d12fd5..7b26913d735 100644 --- a/service/mediaconvert/api_client.go +++ b/service/mediaconvert/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/medialive/api_client.go b/service/medialive/api_client.go index 3a03d9b6368..695a98bc9fa 100644 --- a/service/medialive/api_client.go +++ b/service/medialive/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/mediapackage/api_client.go b/service/mediapackage/api_client.go index 010dc4218b6..e27db089c20 100644 --- a/service/mediapackage/api_client.go +++ b/service/mediapackage/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/mediapackagev2/api_client.go b/service/mediapackagev2/api_client.go index 2c6e2c059ce..dea4b5f0eeb 100644 --- a/service/mediapackagev2/api_client.go +++ b/service/mediapackagev2/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/mediapackagevod/api_client.go b/service/mediapackagevod/api_client.go index b319fbf43e6..7f4b01f0278 100644 --- a/service/mediapackagevod/api_client.go +++ b/service/mediapackagevod/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/mediastore/api_client.go b/service/mediastore/api_client.go index d7c8b75f769..0f37b046bd5 100644 --- a/service/mediastore/api_client.go +++ b/service/mediastore/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/mediastoredata/api_client.go b/service/mediastoredata/api_client.go index 1db2079bee6..3851dbca59b 100644 --- a/service/mediastoredata/api_client.go +++ b/service/mediastoredata/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/mediatailor/api_client.go b/service/mediatailor/api_client.go index 54cbcdea585..2b32b2b4768 100644 --- a/service/mediatailor/api_client.go +++ b/service/mediatailor/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/medicalimaging/api_client.go b/service/medicalimaging/api_client.go index 36a3b7b39e1..05752e63ffb 100644 --- a/service/medicalimaging/api_client.go +++ b/service/medicalimaging/api_client.go @@ -442,7 +442,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/memorydb/api_client.go b/service/memorydb/api_client.go index dc0e1248bb4..56f111ffcb4 100644 --- a/service/memorydb/api_client.go +++ b/service/memorydb/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/mgn/api_client.go b/service/mgn/api_client.go index e14da481e6b..0715f60451b 100644 --- a/service/mgn/api_client.go +++ b/service/mgn/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/migrationhub/api_client.go b/service/migrationhub/api_client.go index 4e357a868b0..0aa8ad0614b 100644 --- a/service/migrationhub/api_client.go +++ b/service/migrationhub/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/migrationhubconfig/api_client.go b/service/migrationhubconfig/api_client.go index 5df39c8570a..99e0a6520ea 100644 --- a/service/migrationhubconfig/api_client.go +++ b/service/migrationhubconfig/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/migrationhuborchestrator/api_client.go b/service/migrationhuborchestrator/api_client.go index c453d6dbaaf..6be041cf7bd 100644 --- a/service/migrationhuborchestrator/api_client.go +++ b/service/migrationhuborchestrator/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/migrationhubrefactorspaces/api_client.go b/service/migrationhubrefactorspaces/api_client.go index 06651fde6ea..92e45c08ff1 100644 --- a/service/migrationhubrefactorspaces/api_client.go +++ b/service/migrationhubrefactorspaces/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/migrationhubstrategy/api_client.go b/service/migrationhubstrategy/api_client.go index 8f818b5672f..db862e01ac3 100644 --- a/service/migrationhubstrategy/api_client.go +++ b/service/migrationhubstrategy/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/mpa/api_client.go b/service/mpa/api_client.go index f888f563bf5..620bb97fd12 100644 --- a/service/mpa/api_client.go +++ b/service/mpa/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/mq/api_client.go b/service/mq/api_client.go index 78ddd720608..b8edf3c6c1c 100644 --- a/service/mq/api_client.go +++ b/service/mq/api_client.go @@ -442,7 +442,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/mturk/api_client.go b/service/mturk/api_client.go index e7c49fbe851..cd8aa143771 100644 --- a/service/mturk/api_client.go +++ b/service/mturk/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/mwaa/api_client.go b/service/mwaa/api_client.go index d9d2c5ebdf8..32265439eda 100644 --- a/service/mwaa/api_client.go +++ b/service/mwaa/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/neptune/api_client.go b/service/neptune/api_client.go index d0e58ed515e..2b8086dd2b9 100644 --- a/service/neptune/api_client.go +++ b/service/neptune/api_client.go @@ -441,7 +441,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/neptunedata/api_client.go b/service/neptunedata/api_client.go index dc6c937f286..ed7df031fd0 100644 --- a/service/neptunedata/api_client.go +++ b/service/neptunedata/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/neptunegraph/api_client.go b/service/neptunegraph/api_client.go index bcdc3af7f96..8860817b3d0 100644 --- a/service/neptunegraph/api_client.go +++ b/service/neptunegraph/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/networkfirewall/api_client.go b/service/networkfirewall/api_client.go index 0e7ba8e292e..16ca1989606 100644 --- a/service/networkfirewall/api_client.go +++ b/service/networkfirewall/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/networkflowmonitor/api_client.go b/service/networkflowmonitor/api_client.go index 077cb4ccae4..31cc32551d3 100644 --- a/service/networkflowmonitor/api_client.go +++ b/service/networkflowmonitor/api_client.go @@ -442,7 +442,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/networkmanager/api_client.go b/service/networkmanager/api_client.go index fef43b1e367..0cc7e2d8215 100644 --- a/service/networkmanager/api_client.go +++ b/service/networkmanager/api_client.go @@ -442,7 +442,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/networkmonitor/api_client.go b/service/networkmonitor/api_client.go index 22b3c516ec6..e27aa242869 100644 --- a/service/networkmonitor/api_client.go +++ b/service/networkmonitor/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/notifications/api_client.go b/service/notifications/api_client.go index 027cc14e954..7d6400bb1ac 100644 --- a/service/notifications/api_client.go +++ b/service/notifications/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/notificationscontacts/api_client.go b/service/notificationscontacts/api_client.go index 5a85f196ec6..7005b0f99d1 100644 --- a/service/notificationscontacts/api_client.go +++ b/service/notificationscontacts/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/oam/api_client.go b/service/oam/api_client.go index 81c4939b59d..0aa6ee8cb2d 100644 --- a/service/oam/api_client.go +++ b/service/oam/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/observabilityadmin/api_client.go b/service/observabilityadmin/api_client.go index 9dee270ba3e..4bd57b27558 100644 --- a/service/observabilityadmin/api_client.go +++ b/service/observabilityadmin/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/odb/api_client.go b/service/odb/api_client.go index 6ad654ceaae..df2c99d9c85 100644 --- a/service/odb/api_client.go +++ b/service/odb/api_client.go @@ -442,7 +442,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/omics/api_client.go b/service/omics/api_client.go index 2fa259ee2f1..751f38b0756 100644 --- a/service/omics/api_client.go +++ b/service/omics/api_client.go @@ -442,7 +442,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/opensearch/api_client.go b/service/opensearch/api_client.go index 4f47c9428c7..42862d8ad1a 100644 --- a/service/opensearch/api_client.go +++ b/service/opensearch/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/opensearchserverless/api_client.go b/service/opensearchserverless/api_client.go index 532b56df2ae..fdaad65c42e 100644 --- a/service/opensearchserverless/api_client.go +++ b/service/opensearchserverless/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/opsworks/api_client.go b/service/opsworks/api_client.go index 88aabc9994d..30f9fb2b79e 100644 --- a/service/opsworks/api_client.go +++ b/service/opsworks/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/opsworkscm/api_client.go b/service/opsworkscm/api_client.go index be8babad4e3..fcce198140a 100644 --- a/service/opsworkscm/api_client.go +++ b/service/opsworkscm/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/organizations/api_client.go b/service/organizations/api_client.go index b4855429a44..5bd1617d8ec 100644 --- a/service/organizations/api_client.go +++ b/service/organizations/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/osis/api_client.go b/service/osis/api_client.go index a7921fb6198..1dc513c2787 100644 --- a/service/osis/api_client.go +++ b/service/osis/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/outposts/api_client.go b/service/outposts/api_client.go index 1f4192cd35e..74b608381a8 100644 --- a/service/outposts/api_client.go +++ b/service/outposts/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/panorama/api_client.go b/service/panorama/api_client.go index 4dbd024be75..0374b59161f 100644 --- a/service/panorama/api_client.go +++ b/service/panorama/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/partnercentralselling/api_client.go b/service/partnercentralselling/api_client.go index e09dbd21c03..f606585cbe9 100644 --- a/service/partnercentralselling/api_client.go +++ b/service/partnercentralselling/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/paymentcryptography/api_client.go b/service/paymentcryptography/api_client.go index cb514952274..4025e0c6a10 100644 --- a/service/paymentcryptography/api_client.go +++ b/service/paymentcryptography/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/paymentcryptographydata/api_client.go b/service/paymentcryptographydata/api_client.go index cd382aeeb18..7708ebd83b4 100644 --- a/service/paymentcryptographydata/api_client.go +++ b/service/paymentcryptographydata/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/pcaconnectorad/api_client.go b/service/pcaconnectorad/api_client.go index 26b44076257..3db667b429b 100644 --- a/service/pcaconnectorad/api_client.go +++ b/service/pcaconnectorad/api_client.go @@ -442,7 +442,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/pcaconnectorscep/api_client.go b/service/pcaconnectorscep/api_client.go index ea88f0f84f9..03dbf7a00ae 100644 --- a/service/pcaconnectorscep/api_client.go +++ b/service/pcaconnectorscep/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/pcs/api_client.go b/service/pcs/api_client.go index b5c1936440f..86a8fb1449c 100644 --- a/service/pcs/api_client.go +++ b/service/pcs/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/personalize/api_client.go b/service/personalize/api_client.go index d07bd64aa24..3d8be941b24 100644 --- a/service/personalize/api_client.go +++ b/service/personalize/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/personalizeevents/api_client.go b/service/personalizeevents/api_client.go index 8b89dcc7c17..d3a64146b5d 100644 --- a/service/personalizeevents/api_client.go +++ b/service/personalizeevents/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/personalizeruntime/api_client.go b/service/personalizeruntime/api_client.go index c767933bf63..ab2ea3cff77 100644 --- a/service/personalizeruntime/api_client.go +++ b/service/personalizeruntime/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/pi/api_client.go b/service/pi/api_client.go index eb2f192451f..99b4599ee9a 100644 --- a/service/pi/api_client.go +++ b/service/pi/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/pinpoint/api_client.go b/service/pinpoint/api_client.go index 8549e6f1825..6b7664a7d31 100644 --- a/service/pinpoint/api_client.go +++ b/service/pinpoint/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/pinpointemail/api_client.go b/service/pinpointemail/api_client.go index 0b372a72fe0..e04fb56cca5 100644 --- a/service/pinpointemail/api_client.go +++ b/service/pinpointemail/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/pinpointsmsvoice/api_client.go b/service/pinpointsmsvoice/api_client.go index c7f3ef50859..55c7469c07f 100644 --- a/service/pinpointsmsvoice/api_client.go +++ b/service/pinpointsmsvoice/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/pinpointsmsvoicev2/api_client.go b/service/pinpointsmsvoicev2/api_client.go index f6667337370..f18293f6047 100644 --- a/service/pinpointsmsvoicev2/api_client.go +++ b/service/pinpointsmsvoicev2/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/pipes/api_client.go b/service/pipes/api_client.go index 967629b9f8f..bfcc9678da8 100644 --- a/service/pipes/api_client.go +++ b/service/pipes/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/polly/api_client.go b/service/polly/api_client.go index 42bf70e6d3d..ea67a8c3061 100644 --- a/service/polly/api_client.go +++ b/service/polly/api_client.go @@ -441,7 +441,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/pricing/api_client.go b/service/pricing/api_client.go index ccd10b0126b..99d1ba2295b 100644 --- a/service/pricing/api_client.go +++ b/service/pricing/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/proton/api_client.go b/service/proton/api_client.go index 176e079c9fa..adc83f06f6f 100644 --- a/service/proton/api_client.go +++ b/service/proton/api_client.go @@ -442,7 +442,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/qapps/api_client.go b/service/qapps/api_client.go index 0aafb9d73df..3f64a5069a7 100644 --- a/service/qapps/api_client.go +++ b/service/qapps/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/qbusiness/api_client.go b/service/qbusiness/api_client.go index d92092d1fb5..50b223b3ea2 100644 --- a/service/qbusiness/api_client.go +++ b/service/qbusiness/api_client.go @@ -444,7 +444,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/qconnect/api_client.go b/service/qconnect/api_client.go index 7c3ab9ff533..8db67586c98 100644 --- a/service/qconnect/api_client.go +++ b/service/qconnect/api_client.go @@ -442,7 +442,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/qldb/api_client.go b/service/qldb/api_client.go index 18a5723f8f3..8583f82ff59 100644 --- a/service/qldb/api_client.go +++ b/service/qldb/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/qldbsession/api_client.go b/service/qldbsession/api_client.go index 5a0fbe275a0..29cb7160705 100644 --- a/service/qldbsession/api_client.go +++ b/service/qldbsession/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/quicksight/api_client.go b/service/quicksight/api_client.go index 34c905eb3aa..32d54f7805f 100644 --- a/service/quicksight/api_client.go +++ b/service/quicksight/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/ram/api_client.go b/service/ram/api_client.go index bb6eed5f5c4..1ede12c51b7 100644 --- a/service/ram/api_client.go +++ b/service/ram/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/rbin/api_client.go b/service/rbin/api_client.go index df28b2a36cb..f2f8daa68d9 100644 --- a/service/rbin/api_client.go +++ b/service/rbin/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/rds/api_client.go b/service/rds/api_client.go index 6bb4e44d99c..122252b0d7b 100644 --- a/service/rds/api_client.go +++ b/service/rds/api_client.go @@ -442,7 +442,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/rdsdata/api_client.go b/service/rdsdata/api_client.go index dc2f977d5bd..f8efec08fd9 100644 --- a/service/rdsdata/api_client.go +++ b/service/rdsdata/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/redshift/api_client.go b/service/redshift/api_client.go index e4f83b033e0..5901c98ee4a 100644 --- a/service/redshift/api_client.go +++ b/service/redshift/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/redshiftdata/api_client.go b/service/redshiftdata/api_client.go index c41ac196287..c23a19c96b9 100644 --- a/service/redshiftdata/api_client.go +++ b/service/redshiftdata/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/redshiftserverless/api_client.go b/service/redshiftserverless/api_client.go index 2a287b372e5..56087cd67a3 100644 --- a/service/redshiftserverless/api_client.go +++ b/service/redshiftserverless/api_client.go @@ -442,7 +442,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/rekognition/api_client.go b/service/rekognition/api_client.go index e46216b13b7..600ecccf1c7 100644 --- a/service/rekognition/api_client.go +++ b/service/rekognition/api_client.go @@ -442,7 +442,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/repostspace/api_client.go b/service/repostspace/api_client.go index fb105f00dd9..65712b26447 100644 --- a/service/repostspace/api_client.go +++ b/service/repostspace/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/resiliencehub/api_client.go b/service/resiliencehub/api_client.go index 11f751bcd16..ac06ccbb2a6 100644 --- a/service/resiliencehub/api_client.go +++ b/service/resiliencehub/api_client.go @@ -442,7 +442,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/resourceexplorer2/api_client.go b/service/resourceexplorer2/api_client.go index 8ca605513eb..815eb78467a 100644 --- a/service/resourceexplorer2/api_client.go +++ b/service/resourceexplorer2/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/resourcegroups/api_client.go b/service/resourcegroups/api_client.go index 1352b8df22c..47da3dd9625 100644 --- a/service/resourcegroups/api_client.go +++ b/service/resourcegroups/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/resourcegroupstaggingapi/api_client.go b/service/resourcegroupstaggingapi/api_client.go index f766f5319e6..e2bb083c1d9 100644 --- a/service/resourcegroupstaggingapi/api_client.go +++ b/service/resourcegroupstaggingapi/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/robomaker/api_client.go b/service/robomaker/api_client.go index 2e6342abed8..db8135ce475 100644 --- a/service/robomaker/api_client.go +++ b/service/robomaker/api_client.go @@ -442,7 +442,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/rolesanywhere/api_client.go b/service/rolesanywhere/api_client.go index 94d03dfbf78..99a9bca5f36 100644 --- a/service/rolesanywhere/api_client.go +++ b/service/rolesanywhere/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/route53/api_client.go b/service/route53/api_client.go index 8f5109e28aa..8293333425b 100644 --- a/service/route53/api_client.go +++ b/service/route53/api_client.go @@ -440,7 +440,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/route53domains/api_client.go b/service/route53domains/api_client.go index 0ec3684eb2a..a041642b8a2 100644 --- a/service/route53domains/api_client.go +++ b/service/route53domains/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/route53profiles/api_client.go b/service/route53profiles/api_client.go index 816d688067a..e4ba467c9eb 100644 --- a/service/route53profiles/api_client.go +++ b/service/route53profiles/api_client.go @@ -442,7 +442,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/route53recoverycluster/api_client.go b/service/route53recoverycluster/api_client.go index fd3b5334e44..17113d9238c 100644 --- a/service/route53recoverycluster/api_client.go +++ b/service/route53recoverycluster/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/route53recoverycontrolconfig/api_client.go b/service/route53recoverycontrolconfig/api_client.go index 45f495c8c46..06e2f8ab4ae 100644 --- a/service/route53recoverycontrolconfig/api_client.go +++ b/service/route53recoverycontrolconfig/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/route53recoveryreadiness/api_client.go b/service/route53recoveryreadiness/api_client.go index 008c1a6a180..c923cbc9d0b 100644 --- a/service/route53recoveryreadiness/api_client.go +++ b/service/route53recoveryreadiness/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/route53resolver/api_client.go b/service/route53resolver/api_client.go index d58a2f2f2d6..3f255d0b1a1 100644 --- a/service/route53resolver/api_client.go +++ b/service/route53resolver/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/rum/api_client.go b/service/rum/api_client.go index 02242c5110f..3ac25353a6d 100644 --- a/service/rum/api_client.go +++ b/service/rum/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/s3/api_client.go b/service/s3/api_client.go index 1be4d359b40..d6637410a86 100644 --- a/service/s3/api_client.go +++ b/service/s3/api_client.go @@ -477,7 +477,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/s3control/api_client.go b/service/s3control/api_client.go index b5c6deaee5f..1e1dd6830e0 100644 --- a/service/s3control/api_client.go +++ b/service/s3control/api_client.go @@ -445,7 +445,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/s3outposts/api_client.go b/service/s3outposts/api_client.go index 954c1089472..07b4bd55bdb 100644 --- a/service/s3outposts/api_client.go +++ b/service/s3outposts/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/s3tables/api_client.go b/service/s3tables/api_client.go index fb272885c5e..cb8084bf18c 100644 --- a/service/s3tables/api_client.go +++ b/service/s3tables/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/s3vectors/api_client.go b/service/s3vectors/api_client.go index 0b10021510e..ddd8292c3b1 100644 --- a/service/s3vectors/api_client.go +++ b/service/s3vectors/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/sagemaker/api_client.go b/service/sagemaker/api_client.go index 254b4eed143..f9c4af3348b 100644 --- a/service/sagemaker/api_client.go +++ b/service/sagemaker/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/sagemakera2iruntime/api_client.go b/service/sagemakera2iruntime/api_client.go index 6c20faec2ec..f2edfdbc4b1 100644 --- a/service/sagemakera2iruntime/api_client.go +++ b/service/sagemakera2iruntime/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/sagemakeredge/api_client.go b/service/sagemakeredge/api_client.go index f53c3c9c9ba..540e6dbb8b5 100644 --- a/service/sagemakeredge/api_client.go +++ b/service/sagemakeredge/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/sagemakerfeaturestoreruntime/api_client.go b/service/sagemakerfeaturestoreruntime/api_client.go index 24c15d6fb66..bc2d8d1dc1d 100644 --- a/service/sagemakerfeaturestoreruntime/api_client.go +++ b/service/sagemakerfeaturestoreruntime/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/sagemakergeospatial/api_client.go b/service/sagemakergeospatial/api_client.go index 8c6115527ce..e36813e3aed 100644 --- a/service/sagemakergeospatial/api_client.go +++ b/service/sagemakergeospatial/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/sagemakermetrics/api_client.go b/service/sagemakermetrics/api_client.go index cfff3964adf..392089e1d8e 100644 --- a/service/sagemakermetrics/api_client.go +++ b/service/sagemakermetrics/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/sagemakerruntime/api_client.go b/service/sagemakerruntime/api_client.go index 6aa0c108cd0..45b92ba77cf 100644 --- a/service/sagemakerruntime/api_client.go +++ b/service/sagemakerruntime/api_client.go @@ -441,7 +441,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/savingsplans/api_client.go b/service/savingsplans/api_client.go index e8e972be805..ab0d754db4c 100644 --- a/service/savingsplans/api_client.go +++ b/service/savingsplans/api_client.go @@ -442,7 +442,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/scheduler/api_client.go b/service/scheduler/api_client.go index 2bae3c6a8d6..c26dfbef8ed 100644 --- a/service/scheduler/api_client.go +++ b/service/scheduler/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/schemas/api_client.go b/service/schemas/api_client.go index 5149d6496d1..0b5b7497261 100644 --- a/service/schemas/api_client.go +++ b/service/schemas/api_client.go @@ -442,7 +442,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/secretsmanager/api_client.go b/service/secretsmanager/api_client.go index ce3d89065aa..6e606be15da 100644 --- a/service/secretsmanager/api_client.go +++ b/service/secretsmanager/api_client.go @@ -442,7 +442,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/securityhub/api_client.go b/service/securityhub/api_client.go index 741d149278f..e0a2aa46f4e 100644 --- a/service/securityhub/api_client.go +++ b/service/securityhub/api_client.go @@ -442,7 +442,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/securityir/api_client.go b/service/securityir/api_client.go index f77d60eb4b4..f070e62bd20 100644 --- a/service/securityir/api_client.go +++ b/service/securityir/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/securitylake/api_client.go b/service/securitylake/api_client.go index ff2c970b458..9558823dcd9 100644 --- a/service/securitylake/api_client.go +++ b/service/securitylake/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/serverlessapplicationrepository/api_client.go b/service/serverlessapplicationrepository/api_client.go index 5ef686ecdbd..3e51964028b 100644 --- a/service/serverlessapplicationrepository/api_client.go +++ b/service/serverlessapplicationrepository/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/servicecatalog/api_client.go b/service/servicecatalog/api_client.go index 2d419b46a39..56bd5101eb7 100644 --- a/service/servicecatalog/api_client.go +++ b/service/servicecatalog/api_client.go @@ -442,7 +442,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/servicecatalogappregistry/api_client.go b/service/servicecatalogappregistry/api_client.go index 32f25aec050..a4d173f5985 100644 --- a/service/servicecatalogappregistry/api_client.go +++ b/service/servicecatalogappregistry/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/servicediscovery/api_client.go b/service/servicediscovery/api_client.go index b547ef4497c..47411f3217d 100644 --- a/service/servicediscovery/api_client.go +++ b/service/servicediscovery/api_client.go @@ -442,7 +442,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/servicequotas/api_client.go b/service/servicequotas/api_client.go index 6d0c427d022..4d8009b42ce 100644 --- a/service/servicequotas/api_client.go +++ b/service/servicequotas/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/ses/api_client.go b/service/ses/api_client.go index 63d81fc3e4e..43554d00e88 100644 --- a/service/ses/api_client.go +++ b/service/ses/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/sesv2/api_client.go b/service/sesv2/api_client.go index fb82e263586..1380a9d49f1 100644 --- a/service/sesv2/api_client.go +++ b/service/sesv2/api_client.go @@ -449,7 +449,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/sfn/api_client.go b/service/sfn/api_client.go index 6674fdc883b..6e4d3de2a1e 100644 --- a/service/sfn/api_client.go +++ b/service/sfn/api_client.go @@ -442,7 +442,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/shield/api_client.go b/service/shield/api_client.go index ddd5eb32d68..2679ff86da4 100644 --- a/service/shield/api_client.go +++ b/service/shield/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/signer/api_client.go b/service/signer/api_client.go index 6274ff58f06..5a01dd1158f 100644 --- a/service/signer/api_client.go +++ b/service/signer/api_client.go @@ -442,7 +442,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/simspaceweaver/api_client.go b/service/simspaceweaver/api_client.go index 538ad796142..3d6e612473a 100644 --- a/service/simspaceweaver/api_client.go +++ b/service/simspaceweaver/api_client.go @@ -442,7 +442,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/sms/api_client.go b/service/sms/api_client.go index 83891ec8c51..187012a9fec 100644 --- a/service/sms/api_client.go +++ b/service/sms/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/snowball/api_client.go b/service/snowball/api_client.go index 5c3947cfd9a..656d5b1cfd1 100644 --- a/service/snowball/api_client.go +++ b/service/snowball/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/snowdevicemanagement/api_client.go b/service/snowdevicemanagement/api_client.go index d82ce0de290..646ca8bf8c8 100644 --- a/service/snowdevicemanagement/api_client.go +++ b/service/snowdevicemanagement/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/sns/api_client.go b/service/sns/api_client.go index 76ba244761b..72bc075bb73 100644 --- a/service/sns/api_client.go +++ b/service/sns/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/socialmessaging/api_client.go b/service/socialmessaging/api_client.go index 972237df098..c33b468eef3 100644 --- a/service/socialmessaging/api_client.go +++ b/service/socialmessaging/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/sqs/api_client.go b/service/sqs/api_client.go index 7dda3895412..ba84048bb98 100644 --- a/service/sqs/api_client.go +++ b/service/sqs/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/ssm/api_client.go b/service/ssm/api_client.go index 74cdda7ba8b..2002321dba7 100644 --- a/service/ssm/api_client.go +++ b/service/ssm/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/ssmcontacts/api_client.go b/service/ssmcontacts/api_client.go index 4d3c98f72b0..6da31ff23c0 100644 --- a/service/ssmcontacts/api_client.go +++ b/service/ssmcontacts/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/ssmguiconnect/api_client.go b/service/ssmguiconnect/api_client.go index e8f968082b0..17ef628d411 100644 --- a/service/ssmguiconnect/api_client.go +++ b/service/ssmguiconnect/api_client.go @@ -442,7 +442,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/ssmincidents/api_client.go b/service/ssmincidents/api_client.go index 71b463f65a4..626ef0f06d3 100644 --- a/service/ssmincidents/api_client.go +++ b/service/ssmincidents/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/ssmquicksetup/api_client.go b/service/ssmquicksetup/api_client.go index 80cbc299eee..f7af6bd77a0 100644 --- a/service/ssmquicksetup/api_client.go +++ b/service/ssmquicksetup/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/ssmsap/api_client.go b/service/ssmsap/api_client.go index 59905f32e8e..eba1c2353e7 100644 --- a/service/ssmsap/api_client.go +++ b/service/ssmsap/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/sso/api_client.go b/service/sso/api_client.go index 3ea8f01db28..2c498e4689a 100644 --- a/service/sso/api_client.go +++ b/service/sso/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/ssoadmin/api_client.go b/service/ssoadmin/api_client.go index 848d6cdbf23..43d0b4b072d 100644 --- a/service/ssoadmin/api_client.go +++ b/service/ssoadmin/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/ssooidc/api_client.go b/service/ssooidc/api_client.go index b635720fbfd..12ad2f5d9d5 100644 --- a/service/ssooidc/api_client.go +++ b/service/ssooidc/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/storagegateway/api_client.go b/service/storagegateway/api_client.go index 047fb7a20f2..b94e0017e94 100644 --- a/service/storagegateway/api_client.go +++ b/service/storagegateway/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/sts/api_client.go b/service/sts/api_client.go index e25193d1ec5..6658babc95f 100644 --- a/service/sts/api_client.go +++ b/service/sts/api_client.go @@ -442,7 +442,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/supplychain/api_client.go b/service/supplychain/api_client.go index 43864ffdda4..6cf56bd9ff3 100644 --- a/service/supplychain/api_client.go +++ b/service/supplychain/api_client.go @@ -442,7 +442,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/support/api_client.go b/service/support/api_client.go index 4e1515622f1..7552d08a186 100644 --- a/service/support/api_client.go +++ b/service/support/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/supportapp/api_client.go b/service/supportapp/api_client.go index 7e5acd836f5..f3205ada42c 100644 --- a/service/supportapp/api_client.go +++ b/service/supportapp/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/swf/api_client.go b/service/swf/api_client.go index 92794f242f2..3c6e3d7c0ee 100644 --- a/service/swf/api_client.go +++ b/service/swf/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/synthetics/api_client.go b/service/synthetics/api_client.go index 23fa99ca673..45cd16d1eac 100644 --- a/service/synthetics/api_client.go +++ b/service/synthetics/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/taxsettings/api_client.go b/service/taxsettings/api_client.go index 68391cc3806..b281fea78bc 100644 --- a/service/taxsettings/api_client.go +++ b/service/taxsettings/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/textract/api_client.go b/service/textract/api_client.go index 1e3dbb626ec..de32922250f 100644 --- a/service/textract/api_client.go +++ b/service/textract/api_client.go @@ -442,7 +442,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/timestreaminfluxdb/api_client.go b/service/timestreaminfluxdb/api_client.go index ce026322a0a..2c3436af40e 100644 --- a/service/timestreaminfluxdb/api_client.go +++ b/service/timestreaminfluxdb/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/timestreamquery/api_client.go b/service/timestreamquery/api_client.go index 82c669c11b8..22b7dd2dca9 100644 --- a/service/timestreamquery/api_client.go +++ b/service/timestreamquery/api_client.go @@ -454,7 +454,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/timestreamwrite/api_client.go b/service/timestreamwrite/api_client.go index 2c14d3c78dc..b90df33d1e8 100644 --- a/service/timestreamwrite/api_client.go +++ b/service/timestreamwrite/api_client.go @@ -454,7 +454,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/tnb/api_client.go b/service/tnb/api_client.go index a85e240e1ef..46efb7099d4 100644 --- a/service/tnb/api_client.go +++ b/service/tnb/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/transcribe/api_client.go b/service/transcribe/api_client.go index b5a77570751..4e6c5ba2059 100644 --- a/service/transcribe/api_client.go +++ b/service/transcribe/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/transcribestreaming/api_client.go b/service/transcribestreaming/api_client.go index c77ded0f0f8..b8f42b1c868 100644 --- a/service/transcribestreaming/api_client.go +++ b/service/transcribestreaming/api_client.go @@ -441,7 +441,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/transfer/api_client.go b/service/transfer/api_client.go index 764b04bbbf6..50ceb606927 100644 --- a/service/transfer/api_client.go +++ b/service/transfer/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/translate/api_client.go b/service/translate/api_client.go index b9684bc2458..d0fb0840164 100644 --- a/service/translate/api_client.go +++ b/service/translate/api_client.go @@ -442,7 +442,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/trustedadvisor/api_client.go b/service/trustedadvisor/api_client.go index d750db956a8..9d046ce2567 100644 --- a/service/trustedadvisor/api_client.go +++ b/service/trustedadvisor/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/verifiedpermissions/api_client.go b/service/verifiedpermissions/api_client.go index 884a8b2410b..e290c3618a3 100644 --- a/service/verifiedpermissions/api_client.go +++ b/service/verifiedpermissions/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/voiceid/api_client.go b/service/voiceid/api_client.go index 55fde8fdcd7..8be5ba1ef87 100644 --- a/service/voiceid/api_client.go +++ b/service/voiceid/api_client.go @@ -442,7 +442,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/vpclattice/api_client.go b/service/vpclattice/api_client.go index 1400c23da14..cc0e95e1a3c 100644 --- a/service/vpclattice/api_client.go +++ b/service/vpclattice/api_client.go @@ -442,7 +442,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/waf/api_client.go b/service/waf/api_client.go index 069dffd7a55..ac34b6ca7fc 100644 --- a/service/waf/api_client.go +++ b/service/waf/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/wafregional/api_client.go b/service/wafregional/api_client.go index 30c831ca1c8..5f7f5a84df3 100644 --- a/service/wafregional/api_client.go +++ b/service/wafregional/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/wafv2/api_client.go b/service/wafv2/api_client.go index 214d7af3db1..9dedf39f694 100644 --- a/service/wafv2/api_client.go +++ b/service/wafv2/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/wellarchitected/api_client.go b/service/wellarchitected/api_client.go index 3e0e75ce2a1..591da452e3b 100644 --- a/service/wellarchitected/api_client.go +++ b/service/wellarchitected/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/wisdom/api_client.go b/service/wisdom/api_client.go index b4ff9d9567e..0770d4c6bc4 100644 --- a/service/wisdom/api_client.go +++ b/service/wisdom/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/workdocs/api_client.go b/service/workdocs/api_client.go index 5276e4e788f..5325a56776c 100644 --- a/service/workdocs/api_client.go +++ b/service/workdocs/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/workmail/api_client.go b/service/workmail/api_client.go index 8924fc2c9c7..ad8803d1c55 100644 --- a/service/workmail/api_client.go +++ b/service/workmail/api_client.go @@ -442,7 +442,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/workmailmessageflow/api_client.go b/service/workmailmessageflow/api_client.go index 2e567cdac61..91c6b7b040c 100644 --- a/service/workmailmessageflow/api_client.go +++ b/service/workmailmessageflow/api_client.go @@ -439,7 +439,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/workspaces/api_client.go b/service/workspaces/api_client.go index 41676443e43..240daaab309 100644 --- a/service/workspaces/api_client.go +++ b/service/workspaces/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/workspacesinstances/api_client.go b/service/workspacesinstances/api_client.go index 2f5bb6abfc6..0f92790b57a 100644 --- a/service/workspacesinstances/api_client.go +++ b/service/workspacesinstances/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/workspacesthinclient/api_client.go b/service/workspacesthinclient/api_client.go index 1c58fcc7b34..1296c18cb88 100644 --- a/service/workspacesthinclient/api_client.go +++ b/service/workspacesthinclient/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/workspacesweb/api_client.go b/service/workspacesweb/api_client.go index a76313d6273..dc1ca123df7 100644 --- a/service/workspacesweb/api_client.go +++ b/service/workspacesweb/api_client.go @@ -443,7 +443,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) { diff --git a/service/xray/api_client.go b/service/xray/api_client.go index 4dc8c1bd5ed..eeda82d0fe5 100644 --- a/service/xray/api_client.go +++ b/service/xray/api_client.go @@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client { resolveUseDualStackEndpoint(cfg, &opts) resolveUseFIPSEndpoint(cfg, &opts) resolveBaseEndpoint(cfg, &opts) - return New(opts, optFns...) + return New(opts, func(o *Options) { + for _, opt := range cfg.ServiceOptions { + opt(ServiceID, o) + } + for _, opt := range optFns { + opt(o) + } + }) } func resolveHTTPClient(o *Options) {