upstream v5.53.0 (#4055)

pulumi · Jun 12, 2024 · a586abd · a586abd
1 parent b1eae8a
commit a586abd
Show file tree

Hide file tree

Showing 179 changed files with 12,766 additions and 1,466 deletions.
diff --git a/examples/go.mod b/examples/go.mod
diff --git a/examples/go.sum b/examples/go.sum
diff --git a/patches/0006-Workaround-SSM-Parameter-tier-bug.patch b/patches/0006-Workaround-SSM-Parameter-tier-bug.patch
@@ -7,10 +7,10 @@ Subject: [PATCH] Workaround SSM Parameter tier bug
 - Disable diff suppression & counteractions
 
 diff --git a/internal/service/ssm/parameter.go b/internal/service/ssm/parameter.go
-index 7fd23f6b57..5a24c9641a 100644
+index 082353da5e..8ef6a77013 100644
 --- a/internal/service/ssm/parameter.go
 +++ b/internal/service/ssm/parameter.go
-@@ -92,15 +92,17 @@ func resourceParameter() *schema.Resource {
+@@ -93,15 +93,17 @@ func resourceParameter() *schema.Resource {
  			names.AttrTags:    tftags.TagsSchema(),
  			names.AttrTagsAll: tftags.TagsSchemaComputed(),
  			"tier": {
@@ -35,7 +35,7 @@ index 7fd23f6b57..5a24c9641a 100644
  				},
  			},
  			names.AttrType: {
-@@ -297,6 +299,14 @@ func resourceParameterUpdate(ctx context.Context, d *schema.ResourceData, meta i
+@@ -298,6 +300,14 @@ func resourceParameterUpdate(ctx context.Context, d *schema.ResourceData, meta i
  			Value:          aws.String(value),
  		}
 

diff --git a/patches/0018-Change-default-descriptions-to-Managed-by-Pulumi.patch b/patches/0018-Change-default-descriptions-to-Managed-by-Pulumi.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Change default descriptions to "Managed by Pulumi"
 
 
 diff --git a/internal/service/apigateway/api_key.go b/internal/service/apigateway/api_key.go
-index f68c242fe0..c7be2c51b7 100644
+index abc31f0d40..ebf1de5fb3 100644
 --- a/internal/service/apigateway/api_key.go
 +++ b/internal/service/apigateway/api_key.go
-@@ -55,7 +55,7 @@ func resourceAPIKey() *schema.Resource {
+@@ -56,7 +56,7 @@ func resourceAPIKey() *schema.Resource {
  			names.AttrDescription: {
  				Type:     schema.TypeString,
  				Optional: true,
@@ -70,10 +70,10 @@ index 333fe4befa..b706339eea 100644
  			names.AttrName: {
  				Type:          schema.TypeString,
 diff --git a/internal/service/ec2/vpc_security_group.go b/internal/service/ec2/vpc_security_group.go
-index d2f71a3305..c650bee4bf 100644
+index 0cf7358bf1..cc30ed661f 100644
 --- a/internal/service/ec2/vpc_security_group.go
 +++ b/internal/service/ec2/vpc_security_group.go
-@@ -66,7 +66,7 @@ func ResourceSecurityGroup() *schema.Resource {
+@@ -68,7 +68,7 @@ func ResourceSecurityGroup() *schema.Resource {
  				Type:         schema.TypeString,
  				Optional:     true,
  				ForceNew:     true,
@@ -333,10 +333,10 @@ index fc60010e7d..0b213b1bf7 100644
  			names.AttrName: {
  				Type:          schema.TypeString,
 diff --git a/internal/service/rds/cluster_parameter_group.go b/internal/service/rds/cluster_parameter_group.go
-index ee5f978ef7..a9a5d5d082 100644
+index 257bbb50ea..104bc29a5d 100644
 --- a/internal/service/rds/cluster_parameter_group.go
 +++ b/internal/service/rds/cluster_parameter_group.go
-@@ -50,7 +50,7 @@ func ResourceClusterParameterGroup() *schema.Resource {
+@@ -51,7 +51,7 @@ func ResourceClusterParameterGroup() *schema.Resource {
  				Type:     schema.TypeString,
  				Optional: true,
  				ForceNew: true,
@@ -346,10 +346,10 @@ index ee5f978ef7..a9a5d5d082 100644
  			names.AttrFamily: {
  				Type:     schema.TypeString,
 diff --git a/internal/service/rds/option_group.go b/internal/service/rds/option_group.go
-index 76678ca094..774986d77b 100644
+index 0eba392459..397bac3d54 100644
 --- a/internal/service/rds/option_group.go
 +++ b/internal/service/rds/option_group.go
-@@ -123,7 +123,7 @@ func ResourceOptionGroup() *schema.Resource {
+@@ -124,7 +124,7 @@ func ResourceOptionGroup() *schema.Resource {
  				Type:     schema.TypeString,
  				Optional: true,
  				ForceNew: true,
@@ -359,10 +359,10 @@ index 76678ca094..774986d77b 100644
  			names.AttrTags:    tftags.TagsSchema(),
  			names.AttrTagsAll: tftags.TagsSchemaComputed(),
 diff --git a/internal/service/rds/parameter_group.go b/internal/service/rds/parameter_group.go
-index 1495ef44cf..82d6784aba 100644
+index 56d433437d..a5fa723e39 100644
 --- a/internal/service/rds/parameter_group.go
 +++ b/internal/service/rds/parameter_group.go
-@@ -51,7 +51,7 @@ func ResourceParameterGroup() *schema.Resource {
+@@ -52,7 +52,7 @@ func ResourceParameterGroup() *schema.Resource {
  				Type:     schema.TypeString,
  				Optional: true,
  				ForceNew: true,
@@ -694,10 +694,10 @@ index 0000000000..54d4e61495
 +	return create.StringHashcode(buf.String())
 +}
 diff --git a/internal/service/rds/subnet_group.go b/internal/service/rds/subnet_group.go
-index dfc4040034..e044b6a8cf 100644
+index 7cd49d3455..beeb9a4301 100644
 --- a/internal/service/rds/subnet_group.go
 +++ b/internal/service/rds/subnet_group.go
-@@ -47,7 +47,7 @@ func resourceSubnetGroup() *schema.Resource {
+@@ -48,7 +48,7 @@ func resourceSubnetGroup() *schema.Resource {
  			names.AttrDescription: {
  				Type:     schema.TypeString,
  				Optional: true,
@@ -1030,7 +1030,7 @@ index 2d1a8f8bcb..47c939f356 100644
  			names.AttrName: {
  				Type:     schema.TypeString,
 diff --git a/internal/service/route53/record.go b/internal/service/route53/record.go
-index 5362a975a8..36ec6ae24a 100644
+index aeef59b958..abac8702c5 100644
 --- a/internal/service/route53/record.go
 +++ b/internal/service/route53/record.go
 @@ -360,7 +360,7 @@ func resourceRecordCreate(ctx context.Context, d *schema.ResourceData, meta inte

diff --git a/patches/0021-Fix-elbv2-target-group-read-to-workaround-2517.patch b/patches/0021-Fix-elbv2-target-group-read-to-workaround-2517.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix elbv2 target group read to workaround #2517
 
 
 diff --git a/internal/service/elbv2/target_group.go b/internal/service/elbv2/target_group.go
-index f8d73d27da..1ad640468b 100644
+index 87c7a782d5..bda4aa1e80 100644
 --- a/internal/service/elbv2/target_group.go
 +++ b/internal/service/elbv2/target_group.go
-@@ -568,15 +568,15 @@ func resourceTargetGroupRead(ctx context.Context, d *schema.ResourceData, meta i
+@@ -570,15 +570,15 @@ func resourceTargetGroupRead(ctx context.Context, d *schema.ResourceData, meta i
  		return sdkdiag.AppendErrorf(diags, "reading ELBv2 Target Group (%s) attributes: %s", d.Id(), err)
  	}
 
@@ -27,7 +27,7 @@ index f8d73d27da..1ad640468b 100644
  		return sdkdiag.AppendErrorf(diags, "setting target_health_state: %s", err)
  	}
 
-@@ -1346,3 +1346,13 @@ func targetGroupRuntimeValidation(d *schema.ResourceData, diags *diag.Diagnostic
+@@ -1348,3 +1348,13 @@ func targetGroupRuntimeValidation(d *schema.ResourceData, diags *diag.Diagnostic
  		}
  	}
  }

diff --git a/patches/0026-Restore-S3ConnURICleaningDisabled.patch b/patches/0026-Restore-S3ConnURICleaningDisabled.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Restore S3ConnURICleaningDisabled
 
 
 diff --git a/internal/conns/awsclient.go b/internal/conns/awsclient.go
-index 9baddcf224..e291c29b74 100644
+index 47fd6e02ed..ad3431ff35 100644
 --- a/internal/conns/awsclient.go
 +++ b/internal/conns/awsclient.go
 @@ -22,6 +22,7 @@ import (
@@ -14,9 +14,9 @@ index 9baddcf224..e291c29b74 100644
  	rds_sdkv1 "github.com/aws/aws-sdk-go/service/rds"
 +	s3_sdkv1 "github.com/aws/aws-sdk-go/service/s3"
  	baselogging "github.com/hashicorp/aws-sdk-go-base/v2/logging"
+ 	"github.com/hashicorp/terraform-plugin-log/tflog"
  	"github.com/hashicorp/terraform-provider-aws/internal/errs"
- 	tftags "github.com/hashicorp/terraform-provider-aws/internal/tags"
-@@ -144,6 +145,13 @@ func (c *AWSClient) S3UsePathStyle(context.Context) bool {
+@@ -145,6 +146,13 @@ func (c *AWSClient) S3UsePathStyle(context.Context) bool {
  	return c.s3UsePathStyle
  }
 
@@ -30,7 +30,7 @@ index 9baddcf224..e291c29b74 100644
  // SetHTTPClient sets the http.Client used for AWS API calls.
  // To have effect it must be called before the AWS SDK v1 Session is created.
  func (c *AWSClient) SetHTTPClient(_ context.Context, httpClient *http.Client) {
-@@ -209,7 +217,7 @@ func (c *AWSClient) DefaultKMSKeyPolicy(context.Context) string {
+@@ -210,7 +218,7 @@ func (c *AWSClient) DefaultKMSKeyPolicy(context.Context) string {
  			"Resource": "*"
  		}
  	]

diff --git a/patches/0027-Do-not-compute-tags_all-at-TF-level.patch b/patches/0027-Do-not-compute-tags_all-at-TF-level.patch
@@ -36,7 +36,7 @@ index 6415ce2355..c80c01b8d1 100644
  					}
  				} else {
 diff --git a/internal/service/appconfig/environment.go b/internal/service/appconfig/environment.go
-index eae4367349..0c61e9cfd6 100644
+index facee5530d..faa7d62e28 100644
 --- a/internal/service/appconfig/environment.go
 +++ b/internal/service/appconfig/environment.go
 @@ -104,7 +104,7 @@ func (r *resourceEnvironment) Schema(ctx context.Context, request resource.Schem
@@ -114,10 +114,10 @@ index e8e1a272eb..a4a1625554 100644
  		Blocks: map[string]schema.Block{
  			names.AttrTimeouts: timeouts.Block(ctx, timeouts.Opts{
 diff --git a/internal/service/ec2/ec2_instance_connect_endpoint.go b/internal/service/ec2/ec2_instance_connect_endpoint.go
-index 06ac90e481..088c7dcf98 100644
+index f1a198c2d9..25016470af 100644
 --- a/internal/service/ec2/ec2_instance_connect_endpoint.go
 +++ b/internal/service/ec2/ec2_instance_connect_endpoint.go
-@@ -117,7 +117,7 @@ func (r *instanceConnectEndpointResource) Schema(ctx context.Context, req resour
+@@ -118,7 +118,7 @@ func (r *instanceConnectEndpointResource) Schema(ctx context.Context, req resour
  				},
  			},
  			names.AttrTags:    tftags.TagsAttribute(),
@@ -127,10 +127,10 @@ index 06ac90e481..088c7dcf98 100644
  				Computed: true,
  				PlanModifiers: []planmodifier.String{
 diff --git a/internal/service/ec2/vpc_security_group_ingress_rule.go b/internal/service/ec2/vpc_security_group_ingress_rule.go
-index f126ed2755..f093404590 100644
+index 9d5de83433..f9d99d2663 100644
 --- a/internal/service/ec2/vpc_security_group_ingress_rule.go
 +++ b/internal/service/ec2/vpc_security_group_ingress_rule.go
-@@ -225,7 +225,7 @@ func (r *securityGroupRuleResource) Schema(ctx context.Context, request resource
+@@ -226,7 +226,7 @@ func (r *securityGroupRuleResource) Schema(ctx context.Context, request resource
  				},
  			},
  			names.AttrTags:    tftags.TagsAttribute(),

diff --git a/patches/0035-Fix-tags_all-Computed-for-PF-resources.patch b/patches/0035-Fix-tags_all-Computed-for-PF-resources.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix tags_all Computed for PF resources
 
 
 diff --git a/internal/service/amp/scraper.go b/internal/service/amp/scraper.go
-index fa7e06ae5e..a3b7c9b40a 100644
+index 7af155285d..1d4ecd0a99 100644
 --- a/internal/service/amp/scraper.go
 +++ b/internal/service/amp/scraper.go
-@@ -83,7 +83,7 @@ func (r *scraperResource) Schema(ctx context.Context, req resource.SchemaRequest
+@@ -84,7 +84,7 @@ func (r *scraperResource) Schema(ctx context.Context, req resource.SchemaRequest
  				},
  			},
  			names.AttrTags:    tftags.TagsAttribute(),
@@ -70,7 +70,7 @@ index 0c1741f00e..7e1945e19a 100644
  	}
 
 diff --git a/internal/service/securityhub/automation_rule.go b/internal/service/securityhub/automation_rule.go
-index 03094f50e4..07db1312be 100644
+index 69d6b912ac..6323d7c399 100644
 --- a/internal/service/securityhub/automation_rule.go
 +++ b/internal/service/securityhub/automation_rule.go
 @@ -75,7 +75,7 @@ func (r *automationRuleResource) Schema(ctx context.Context, request resource.Sc
@@ -81,7 +81,7 @@ index 03094f50e4..07db1312be 100644
 +			names.AttrTagsAll: tftags.TagsAttribute(),
  		},
  		Blocks: map[string]schema.Block{
- 			"actions": schema.SetNestedBlock{
+ 			names.AttrActions: schema.SetNestedBlock{
 diff --git a/internal/service/securitylake/data_lake.go b/internal/service/securitylake/data_lake.go
 index 9ff71fe5d7..faba601773 100644
 --- a/internal/service/securitylake/data_lake.go

diff --git a/patches/0036-Disable-retry-for-KMS-access-denied-in-lambda.patch b/patches/0036-Disable-retry-for-KMS-access-denied-in-lambda.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Disable retry for KMS access denied in lambda
 
 diff --git a/internal/service/lambda/service_package_extra.go b/internal/service/lambda/service_package_extra.go
 new file mode 100644
-index 0000000000..54f6aac15a
+index 0000000000..4625f9e31c
 --- /dev/null
 +++ b/internal/service/lambda/service_package_extra.go
-@@ -0,0 +1,39 @@
+@@ -0,0 +1,48 @@
 +package lambda
 +
 +import (
@@ -19,6 +19,7 @@ index 0000000000..54f6aac15a
 +	retry_sdkv2 "github.com/aws/aws-sdk-go-v2/aws/retry"
 +	lambda_sdkv2 "github.com/aws/aws-sdk-go-v2/service/lambda"
 +	tfawserr_sdkv2 "github.com/hashicorp/aws-sdk-go-base/v2/tfawserr"
++	"github.com/hashicorp/terraform-plugin-log/tflog"
 +	"github.com/hashicorp/terraform-provider-aws/internal/conns"
 +	"github.com/hashicorp/terraform-provider-aws/names"
 +)
@@ -44,25 +45,34 @@ index 0000000000..54f6aac15a
 +	})
 +	return lambda_sdkv2.NewFromConfig(cfg, func(o *lambda_sdkv2.Options) {
 +		if endpoint := config[names.AttrEndpoint].(string); endpoint != "" {
++			tflog.Debug(ctx, "setting endpoint", map[string]any{
++				"tf_aws.endpoint": endpoint,
++			})
 +			o.BaseEndpoint = aws_sdkv2.String(endpoint)
++
++			if o.EndpointOptions.UseFIPSEndpoint == aws_sdkv2.FIPSEndpointStateEnabled {
++				tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting")
++				o.EndpointOptions.UseFIPSEndpoint = aws_sdkv2.FIPSEndpointStateDisabled
++			}
 +		}
 +		o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws_sdkv2.RetryerV2), retry)
 +	}), nil
 +}
 diff --git a/internal/service/lambda/service_package_gen.go b/internal/service/lambda/service_package_gen.go
-index 568123bfdb..72d8c48672 100644
+index 6b8ecf2c57..72d8c48672 100644
 --- a/internal/service/lambda/service_package_gen.go
 +++ b/internal/service/lambda/service_package_gen.go
-@@ -5,8 +5,6 @@ package lambda
+@@ -5,9 +5,6 @@ package lambda
  import (
  	"context"
 
 -	aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws"
 -	lambda_sdkv2 "github.com/aws/aws-sdk-go-v2/service/lambda"
+-	"github.com/hashicorp/terraform-plugin-log/tflog"
  	"github.com/hashicorp/terraform-provider-aws/internal/conns"
  	"github.com/hashicorp/terraform-provider-aws/internal/types"
  	"github.com/hashicorp/terraform-provider-aws/names"
-@@ -134,17 +132,6 @@ func (p *servicePackage) ServicePackageName() string {
+@@ -135,25 +132,6 @@ func (p *servicePackage) ServicePackageName() string {
  	return names.Lambda
  }
 
@@ -72,7 +82,15 @@ index 568123bfdb..72d8c48672 100644
 -
 -	return lambda_sdkv2.NewFromConfig(cfg, func(o *lambda_sdkv2.Options) {
 -		if endpoint := config[names.AttrEndpoint].(string); endpoint != "" {
+-			tflog.Debug(ctx, "setting endpoint", map[string]any{
+-				"tf_aws.endpoint": endpoint,
+-			})
 -			o.BaseEndpoint = aws_sdkv2.String(endpoint)
+-
+-			if o.EndpointOptions.UseFIPSEndpoint == aws_sdkv2.FIPSEndpointStateEnabled {
+-				tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting")
+-				o.EndpointOptions.UseFIPSEndpoint = aws_sdkv2.FIPSEndpointStateDisabled
+-			}
 -		}
 -	}), nil
 -}
@@ -81,15 +99,15 @@ index 568123bfdb..72d8c48672 100644
  	return &servicePackage{}
  }
 diff --git a/names/data/names_data.csv b/names/data/names_data.csv
-index 4ca204809d..950bad4ddf 100644
+index da7ff7f983..fefa624383 100644
 --- a/names/data/names_data.csv
 +++ b/names/data/names_data.csv
 @@ -218,7 +218,7 @@ kinesis-video-media,kinesisvideomedia,kinesisvideomedia,kinesisvideomedia,,kines
- kinesis-video-signaling,kinesisvideosignaling,kinesisvideosignalingchannels,kinesisvideosignaling,,kinesisvideosignaling,,kinesisvideosignalingchannels,KinesisVideoSignaling,KinesisVideoSignalingChannels,,1,,,aws_kinesisvideosignaling_,,kinesisvideosignaling_,Kinesis Video Signaling,Amazon,,x,,,,,Kinesis Video Signaling,,,
- kms,kms,kms,kms,,kms,,,KMS,KMS,,,2,,aws_kms_,,kms_,KMS (Key Management),AWS,,,,,,,KMS,ListKeys,,
- lakeformation,lakeformation,lakeformation,lakeformation,,lakeformation,,,LakeFormation,LakeFormation,,,2,,aws_lakeformation_,,lakeformation_,Lake Formation,AWS,,,,,,,LakeFormation,ListResources,,
--lambda,lambda,lambda,lambda,,lambda,,,Lambda,Lambda,,,2,,aws_lambda_,,lambda_,Lambda,AWS,,,,,,,Lambda,ListFunctions,,
-+lambda,lambda,lambda,lambda,,lambda,,,Lambda,Lambda,x,,2,,aws_lambda_,,lambda_,Lambda,AWS,,,,,,,Lambda,ListFunctions,,
- launch-wizard,launchwizard,launchwizard,launchwizard,,launchwizard,,,LaunchWizard,LaunchWizard,,,2,,aws_launchwizard_,,launchwizard_,Launch Wizard,AWS,,,,,,,Launch Wizard,ListWorkloads,,
- lex-models,lexmodels,lexmodelbuildingservice,lexmodelbuildingservice,,lexmodels,,lexmodelbuilding;lexmodelbuildingservice;lex,LexModels,LexModelBuildingService,,1,,aws_lex_,aws_lexmodels_,,lex_,Lex Model Building,Amazon,,,,,,,Lex Model Building Service,GetBots,,
- lexv2-models,lexv2models,lexmodelsv2,lexmodelsv2,,lexv2models,,lexmodelsv2,LexV2Models,LexModelsV2,,,2,,aws_lexv2models_,,lexv2models_,Lex V2 Models,Amazon,,,,,,,Lex Models V2,ListBots,,
+ kinesis-video-signaling,kinesisvideosignaling,kinesisvideosignalingchannels,kinesisvideosignaling,,kinesisvideosignaling,,kinesisvideosignalingchannels,KinesisVideoSignaling,KinesisVideoSignalingChannels,,1,,,aws_kinesisvideosignaling_,,kinesisvideosignaling_,Kinesis Video Signaling,Amazon,,x,,,,,Kinesis Video Signaling,,,,
+ kms,kms,kms,kms,,kms,,,KMS,KMS,,,2,,aws_kms_,,kms_,KMS (Key Management),AWS,,,,,,,KMS,ListKeys,,,
+ lakeformation,lakeformation,lakeformation,lakeformation,,lakeformation,,,LakeFormation,LakeFormation,,,2,,aws_lakeformation_,,lakeformation_,Lake Formation,AWS,,,,,,,LakeFormation,ListResources,,,
+-lambda,lambda,lambda,lambda,,lambda,,,Lambda,Lambda,,,2,,aws_lambda_,,lambda_,Lambda,AWS,,,,,,,Lambda,ListFunctions,,,
++lambda,lambda,lambda,lambda,,lambda,,,Lambda,Lambda,x,,2,,aws_lambda_,,lambda_,Lambda,AWS,,,,,,,Lambda,ListFunctions,,,
+ launch-wizard,launchwizard,launchwizard,launchwizard,,launchwizard,,,LaunchWizard,LaunchWizard,,,2,,aws_launchwizard_,,launchwizard_,Launch Wizard,AWS,,,,,,,Launch Wizard,ListWorkloads,,,
+ lex-models,lexmodels,lexmodelbuildingservice,lexmodelbuildingservice,,lexmodels,,lexmodelbuilding;lexmodelbuildingservice;lex,LexModels,LexModelBuildingService,,1,,aws_lex_,aws_lexmodels_,,lex_,Lex Model Building,Amazon,,,,,,,Lex Model Building Service,GetBots,,,
+ lexv2-models,lexv2models,lexmodelsv2,lexmodelsv2,,lexv2models,,lexmodelsv2,LexV2Models,LexModelsV2,,,2,,aws_lexv2models_,,lexv2models_,Lex V2 Models,Amazon,,,,,,,Lex Models V2,ListBots,,,
diff --git a/patches/0037-Patch-ACM-retry-to-not-retry-after-LimitExceededExce.patch b/patches/0037-Patch-ACM-retry-to-not-retry-after-LimitExceededExce.patch
@@ -6,22 +6,23 @@ Subject: [PATCH] Patch ACM retry to not retry after LimitExceededException
 
 
 diff --git a/internal/service/acm/service_package_gen.go b/internal/service/acm/service_package_gen.go
-index b75c973f68..91dd8f2621 100644
+index 7ca15d3ae4..85744c2eee 100644
 --- a/internal/service/acm/service_package_gen.go
 +++ b/internal/service/acm/service_package_gen.go
-@@ -6,7 +6,9 @@ import (
+@@ -6,8 +6,10 @@ import (
  	"context"
 
  	aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws"
 +	retry_sdkv2 "github.com/aws/aws-sdk-go-v2/aws/retry"
  	acm_sdkv2 "github.com/aws/aws-sdk-go-v2/service/acm"
+ 	"github.com/hashicorp/terraform-plugin-log/tflog"
 +	tfawserr_sdkv2 "github.com/hashicorp/aws-sdk-go-base/v2/tfawserr"
  	"github.com/hashicorp/terraform-provider-aws/internal/conns"
  	"github.com/hashicorp/terraform-provider-aws/internal/types"
  	"github.com/hashicorp/terraform-provider-aws/names"
-@@ -60,6 +62,14 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (
- 		if endpoint := config[names.AttrEndpoint].(string); endpoint != "" {
- 			o.BaseEndpoint = aws_sdkv2.String(endpoint)
+@@ -69,6 +71,14 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (
+ 				o.EndpointOptions.UseFIPSEndpoint = aws_sdkv2.FIPSEndpointStateDisabled
+ 			}
  		}
 +
 +		o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws_sdkv2.RetryerV2), retry_sdkv2.IsErrorRetryableFunc(func(err error) aws_sdkv2.Ternary {