Tech debt: Use service package API client withExtraOptions mechanism

internal/generate/serviceendpointtests/main.go

@@ -83,7 +83,7 @@ func main() {
 
 		switch packageName {
 		// TODO: This case should be handled in service data
-		case "costoptimizationhub", "cur", "globalaccelerator", "route53domains":
+		case "costoptimizationhub", "cur", "globalaccelerator", "route53domains", "route53recoverycontrolconfig", "route53recoveryreadiness":
 			td.OverrideRegionRegionalEndpoint = true
 
 		case "chatbot":

internal/service/apigateway/service_package.go

@@ -12,16 +12,12 @@ import (
 	"github.com/aws/aws-sdk-go-v2/service/apigateway/types"
 	"github.com/hashicorp/terraform-provider-aws/internal/conns"
 	"github.com/hashicorp/terraform-provider-aws/internal/errs"
-	"github.com/hashicorp/terraform-provider-aws/names"
 )
 
-// NewClient returns a new AWS SDK for Go v2 client for this service package's AWS API.
-func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*apigateway.Client, error) {
+func (p *servicePackage) withExtraOptions(_ context.Context, config map[string]any) []func(*apigateway.Options) {
 	cfg := *(config["aws_sdkv2_config"].(*aws.Config))
 
-	return apigateway.NewFromConfig(cfg,
-		apigateway.WithEndpointResolverV2(newEndpointResolverV2()),
-		withBaseEndpoint(config[names.AttrEndpoint].(string)),
+	return []func(*apigateway.Options){
 		func(o *apigateway.Options) {
 			o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(func(err error) aws.Ternary {
 				// Many operations can return an error such as:
@@ -33,5 +29,5 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (
 				return aws.UnknownTernary // Delegate to configured Retryer.
 			}))
 		},
-	), nil
+	}
 }

internal/service/apigatewayv2/service_package.go

@@ -12,16 +12,12 @@ import (
 	awstypes "github.com/aws/aws-sdk-go-v2/service/apigatewayv2/types"
 	"github.com/hashicorp/terraform-provider-aws/internal/conns"
 	"github.com/hashicorp/terraform-provider-aws/internal/errs"
-	"github.com/hashicorp/terraform-provider-aws/names"
 )
 
-// NewClient returns a new AWS SDK for Go v2 client for this service package's AWS API.
-func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*apigatewayv2.Client, error) {
+func (p *servicePackage) withExtraOptions(_ context.Context, config map[string]any) []func(*apigatewayv2.Options) {
 	cfg := *(config["aws_sdkv2_config"].(*aws.Config))
 
-	return apigatewayv2.NewFromConfig(cfg,
-		apigatewayv2.WithEndpointResolverV2(newEndpointResolverV2()),
-		withBaseEndpoint(config[names.AttrEndpoint].(string)),
+	return []func(*apigatewayv2.Options){
 		func(o *apigatewayv2.Options) {
 			o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(func(err error) aws.Ternary {
 				if errs.IsAErrorMessageContains[*awstypes.ConflictException](err, "try again later") {
@@ -37,5 +33,5 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (
 				return aws.UnknownTernary // Delegate to configured Retryer.
 			}))
 		},
-	), nil
+	}
 }

internal/service/appsync/service_package.go

@@ -12,22 +12,19 @@ import (
 	awstypes "github.com/aws/aws-sdk-go-v2/service/appsync/types"
 	"github.com/hashicorp/terraform-provider-aws/internal/conns"
 	"github.com/hashicorp/terraform-provider-aws/internal/errs"
-	"github.com/hashicorp/terraform-provider-aws/names"
 )
 
-// NewClient returns a new AWS SDK for Go v2 client for this service package's AWS API.
-func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*appsync.Client, error) {
+func (p *servicePackage) withExtraOptions(_ context.Context, config map[string]any) []func(*appsync.Options) {
 	cfg := *(config["aws_sdkv2_config"].(*aws.Config))
 
-	return appsync.NewFromConfig(cfg,
-		appsync.WithEndpointResolverV2(newEndpointResolverV2()),
-		withBaseEndpoint(config[names.AttrEndpoint].(string)),
+	return []func(*appsync.Options){
 		func(o *appsync.Options) {
 			o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(func(err error) aws.Ternary {
 				if errs.IsAErrorMessageContains[*awstypes.ConcurrentModificationException](err, "a GraphQL API creation is already in progress") {
 					return aws.TrueTernary
 				}
 				return aws.UnknownTernary // Delegate to configured Retryer.
 			}))
-		}), nil
+		},
+	}
 }

internal/service/chatbot/service_package.go

@@ -11,16 +11,12 @@ import (
 	"github.com/aws/aws-sdk-go-v2/service/chatbot"
 	"github.com/hashicorp/aws-sdk-go-base/v2/endpoints"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	"github.com/hashicorp/terraform-provider-aws/names"
 )
 
-// NewClient returns a new AWS SDK for Go v2 client for this service package's AWS API.
-func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*chatbot.Client, error) {
+func (p *servicePackage) withExtraOptions(ctx context.Context, config map[string]any) []func(*chatbot.Options) {
 	cfg := *(config["aws_sdkv2_config"].(*aws.Config))
 
-	return chatbot.NewFromConfig(cfg,
-		chatbot.WithEndpointResolverV2(newEndpointResolverV2()),
-		withBaseEndpoint(config[names.AttrEndpoint].(string)),
+	return []func(*chatbot.Options){
 		func(o *chatbot.Options) {
 			if config["partition"].(string) == endpoints.AwsPartitionID {
 				// Chatbot endpoint is available only in the 4 regions us-east-2, us-west-2, eu-west-1, and ap-southeast-1.
@@ -36,5 +32,5 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (
 				}
 			}
 		},
-	), nil
+	}
 }

internal/service/cloudformation/service_package.go

@@ -12,16 +12,12 @@ import (
 	"github.com/aws/aws-sdk-go-v2/service/cloudformation/types"
 	"github.com/hashicorp/terraform-provider-aws/internal/conns"
 	"github.com/hashicorp/terraform-provider-aws/internal/errs"
-	"github.com/hashicorp/terraform-provider-aws/names"
 )
 
-// NewClient returns a new AWS SDK for Go v2 client for this service package's AWS API.
-func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*cloudformation.Client, error) {
+func (p *servicePackage) withExtraOptions(_ context.Context, config map[string]any) []func(*cloudformation.Options) {
 	cfg := *(config["aws_sdkv2_config"].(*aws.Config))
 
-	return cloudformation.NewFromConfig(cfg,
-		cloudformation.WithEndpointResolverV2(newEndpointResolverV2()),
-		withBaseEndpoint(config[names.AttrEndpoint].(string)),
+	return []func(*cloudformation.Options){
 		func(o *cloudformation.Options) {
 			o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(func(err error) aws.Ternary {
 				if errs.IsAErrorMessageContains[*types.OperationInProgressException](err, "Another Operation on StackSet") {
@@ -30,5 +26,5 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (
 				return aws.UnknownTernary // Delegate to configured Retryer.
 			}))
 		},
-	), nil
+	}
 }

internal/service/cloudhsmv2/service_package.go

@@ -12,16 +12,12 @@ import (
 	"github.com/aws/aws-sdk-go-v2/service/cloudhsmv2/types"
 	"github.com/hashicorp/terraform-provider-aws/internal/conns"
 	"github.com/hashicorp/terraform-provider-aws/internal/errs"
-	"github.com/hashicorp/terraform-provider-aws/names"
 )
 
-// NewClient returns a new AWS SDK for Go v2 client for this service package's AWS API.
-func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*cloudhsmv2.Client, error) {
+func (p *servicePackage) withExtraOptions(_ context.Context, config map[string]any) []func(*cloudhsmv2.Options) {
 	cfg := *(config["aws_sdkv2_config"].(*aws.Config))
 
-	return cloudhsmv2.NewFromConfig(cfg,
-		cloudhsmv2.WithEndpointResolverV2(newEndpointResolverV2()),
-		withBaseEndpoint(config[names.AttrEndpoint].(string)),
+	return []func(*cloudhsmv2.Options){
 		func(o *cloudhsmv2.Options) {
 			o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(func(err error) aws.Ternary {
 				if errs.IsAErrorMessageContains[*types.CloudHsmInternalFailureException](err, "request was rejected because of an AWS CloudHSM internal failure") {
@@ -30,5 +26,5 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (
 				return aws.UnknownTernary // Delegate to configured Retryer.
 			}))
 		},
-	), nil
+	}
 }