Upstream 5.85.0 (#5161)

Upgrade [terraform-provider-aws to v5.85.0](https://github.com/hashicorp/terraform-provider-aws/releases/tag/v5.85.0) #### Resources - `🟢` "aws:ec2/vpcEndpoint:VpcEndpoint": required: "serviceName" property is no longer Required #### Types - `🟢` "aws:ec2/getLaunchTemplateNetworkInterface:getLaunchTemplateNetworkInterface": required: "connectionTrackingSpecifications" property has changed to Required #### New resources: - `guardduty/memberDetectorFeature.MemberDetectorFeature` - `route53domains/domain.Domain` - `timestreamquery/scheduledQuery.ScheduledQuery` - `vpclattice/resourceConfiguration.ResourceConfiguration` - `vpclattice/serviceNetworkResourceAssociation.ServiceNetworkResourceAssociation` #### New functions: - `ec2/getVpcIpam.getVpcIpam` - `ec2/getVpcIpams.getVpcIpams`
pulumi · Feb 6, 2025 · 10b9d3f · 10b9d3f
1 parent 585aec0
commit 10b9d3f
Show file tree

Hide file tree

Showing 841 changed files with 98,993 additions and 4,864 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/0002-Add-S3-legacy-bucket-to-resources.patch b/patches/0002-Add-S3-legacy-bucket-to-resources.patch
@@ -14,7 +14,7 @@ scheme for registration: see
 https://github.com/hashicorp/terraform-provider-aws/pull/29717.
 
 diff --git a/internal/provider/provider.go b/internal/provider/provider.go
-index b048f661fe..b6521d3f55 100644
+index ae5740506d..0c1b1e86ab 100644
 --- a/internal/provider/provider.go
 +++ b/internal/provider/provider.go
 @@ -14,6 +14,8 @@ import (

diff --git a/patches/0009-Add-ECR-credentials_data_source.patch b/patches/0009-Add-ECR-credentials_data_source.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add ECR credentials_data_source
 
 
 diff --git a/internal/provider/provider.go b/internal/provider/provider.go
-index b6521d3f55..c7c3935b94 100644
+index 0c1b1e86ab..0bfc5c6e30 100644
 --- a/internal/provider/provider.go
 +++ b/internal/provider/provider.go
 @@ -14,6 +14,8 @@ import (

diff --git a/patches/0014-add-matchmaking-configuration-72.patch b/patches/0014-add-matchmaking-configuration-72.patch
@@ -10,7 +10,7 @@ Subject: [PATCH] add matchmaking configuration (#72)
 * add resource docs
 
 diff --git a/internal/provider/provider.go b/internal/provider/provider.go
-index c7c3935b94..30ebfcf0f3 100644
+index 0bfc5c6e30..bf08af0363 100644
 --- a/internal/provider/provider.go
 +++ b/internal/provider/provider.go
 @@ -16,6 +16,7 @@ import (

diff --git a/patches/0018-Change-default-descriptions-to-Managed-by-Pulumi.patch b/patches/0018-Change-default-descriptions-to-Managed-by-Pulumi.patch
@@ -309,7 +309,7 @@ index c3170d4965..f13dada174 100644
  		HostedZoneId: aws.String(zoneID),
  	}
 diff --git a/internal/service/route53/zone.go b/internal/service/route53/zone.go
-index 86b843b763..21ed69c593 100644
+index 617da5a3d6..c370331f8d 100644
 --- a/internal/service/route53/zone.go
 +++ b/internal/service/route53/zone.go
 @@ -52,7 +52,7 @@ func resourceZone() *schema.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
@@ -21,10 +21,10 @@ index 6ece15b4f4..89844a1233 100644
  	if request.Plan.Raw.IsNull() {
  		return
 diff --git a/internal/provider/fwprovider/provider.go b/internal/provider/fwprovider/provider.go
-index c6408919dd..e57aa07e8f 100644
+index b94702c6e1..7068bc7a63 100644
 --- a/internal/provider/fwprovider/provider.go
 +++ b/internal/provider/fwprovider/provider.go
-@@ -435,8 +435,8 @@ func (p *fwprovider) Resources(ctx context.Context) []func() resource.Resource {
+@@ -445,8 +445,8 @@ func (p *fwprovider) Resources(ctx context.Context) []func() resource.Resource {
  					continue
  				}
  				if v, ok := schemaResponse.Schema.Attributes[names.AttrTagsAll]; ok {

diff --git a/patches/0030-Optimize-startup-performance.patch b/patches/0030-Optimize-startup-performance.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Optimize startup performance
 
 
 diff --git a/internal/provider/provider.go b/internal/provider/provider.go
-index 30ebfcf0f3..4c83f4bb1c 100644
+index bf08af0363..8e45a8a381 100644
 --- a/internal/provider/provider.go
 +++ b/internal/provider/provider.go
 @@ -317,7 +317,7 @@ func New(ctx context.Context) (*schema.Provider, error) {

diff --git a/patches/0031-DisableTagSchemaCheck-for-PF-provider.patch b/patches/0031-DisableTagSchemaCheck-for-PF-provider.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] DisableTagSchemaCheck for PF provider
 
 
 diff --git a/internal/provider/fwprovider/provider.go b/internal/provider/fwprovider/provider.go
-index e57aa07e8f..a64bcd031d 100644
+index 7068bc7a63..2c3cc0ac15 100644
 --- a/internal/provider/fwprovider/provider.go
 +++ b/internal/provider/fwprovider/provider.go
-@@ -422,8 +422,7 @@ func (p *fwprovider) Resources(ctx context.Context) []func() resource.Resource {
+@@ -432,8 +432,7 @@ func (p *fwprovider) Resources(ctx context.Context) []func() resource.Resource {
  			if v.Tags != nil {
  				// The resource has opted in to transparent tagging.
  				// Ensure that the schema look OK.

diff --git a/patches/0033-Fail-fast-when-PF-resources-are-dropped.patch b/patches/0033-Fail-fast-when-PF-resources-are-dropped.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fail fast when PF resources are dropped
 
 
 diff --git a/internal/provider/fwprovider/provider.go b/internal/provider/fwprovider/provider.go
-index a64bcd031d..0d730c8ea4 100644
+index 2c3cc0ac15..56e6a524b8 100644
 --- a/internal/provider/fwprovider/provider.go
 +++ b/internal/provider/fwprovider/provider.go
-@@ -453,9 +453,8 @@ func (p *fwprovider) Resources(ctx context.Context) []func() resource.Resource {
+@@ -463,9 +463,8 @@ func (p *fwprovider) Resources(ctx context.Context) []func() resource.Resource {
  	}
 
  	if err := errors.Join(errs...); err != nil {

diff --git a/patches/0034-Fix-tags_all-Computed-for-PF-resources.patch b/patches/0034-Fix-tags_all-Computed-for-PF-resources.patch
@@ -18,7 +18,7 @@ index 63ab7ce64c..86339cdb90 100644
  		Blocks: map[string]schema.Block{
  			names.AttrDestination: schema.ListNestedBlock{
 diff --git a/internal/service/bedrock/custom_model.go b/internal/service/bedrock/custom_model.go
-index 7d1bbff332..0b7cdf8f23 100644
+index fba751ea25..679234fbf8 100644
 --- a/internal/service/bedrock/custom_model.go
 +++ b/internal/service/bedrock/custom_model.go
 @@ -139,7 +139,7 @@ func (r *customModelResource) Schema(ctx context.Context, request resource.Schem
@@ -27,8 +27,8 @@ index 7d1bbff332..0b7cdf8f23 100644
  			names.AttrTags:       tftags.TagsAttribute(),
 -			names.AttrTagsAll:    tftags.TagsAttributeComputedOnly(),
 +			names.AttrTagsAll:    tftags.TagsAttribute(),
- 			"training_metrics":   framework.ResourceComputedListOfObjectAttribute[trainingMetricsModel](ctx),
- 			"validation_metrics": framework.ResourceComputedListOfObjectAttribute[validatorMetricModel](ctx),
+ 			"training_metrics":   framework.ResourceComputedListOfObjectsAttribute[trainingMetricsModel](ctx),
+ 			"validation_metrics": framework.ResourceComputedListOfObjectsAttribute[validatorMetricModel](ctx),
  		},
 diff --git a/internal/service/codeguruprofiler/profiling_group.go b/internal/service/codeguruprofiler/profiling_group.go
 index d50d423d65..a5a56c6501 100644
@@ -44,7 +44,7 @@ index d50d423d65..a5a56c6501 100644
  		Blocks: map[string]schema.Block{
  			"agent_orchestration_config": schema.ListNestedBlock{
 diff --git a/internal/service/elasticache/serverless_cache.go b/internal/service/elasticache/serverless_cache.go
-index c1ffa7b5d0..28bcc89791 100644
+index 69838a90af..0b6039d971 100644
 --- a/internal/service/elasticache/serverless_cache.go
 +++ b/internal/service/elasticache/serverless_cache.go
 @@ -181,7 +181,7 @@ func (r *serverlessCacheResource) Schema(ctx context.Context, request resource.S

diff --git a/patches/0035-Disable-retry-for-KMS-access-denied-in-lambda.patch b/patches/0035-Disable-retry-for-KMS-access-denied-in-lambda.patch
@@ -45,14 +45,14 @@ index 0000000000..79867519db
 +	}
 +}
 diff --git a/internal/service/lambda/service_package_gen.go b/internal/service/lambda/service_package_gen.go
-index df09e00772..432b494788 100644
+index d05c9a6185..7a25d187fe 100644
 --- a/internal/service/lambda/service_package_gen.go
 +++ b/internal/service/lambda/service_package_gen.go
 @@ -164,6 +164,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (
- 	return lambda.NewFromConfig(cfg,
  		lambda.WithEndpointResolverV2(newEndpointResolverV2()),
  		withBaseEndpoint(config[names.AttrEndpoint].(string)),
+ 		withExtraOptions(ctx, p, config),
 +		p.pulumiCustomizeLambdaRetries(cfg),
- 	), nil
- }
+ 	}
 
+ 	return lambda.NewFromConfig(cfg, optFns...), nil
diff --git a/patches/0036-Patch-ACM-retry-to-not-retry-after-LimitExceededExce.patch b/patches/0036-Patch-ACM-retry-to-not-retry-after-LimitExceededExce.patch
@@ -33,14 +33,14 @@ index 0000000000..b432bed386
 +	}
 +}
 diff --git a/internal/service/acm/service_package_gen.go b/internal/service/acm/service_package_gen.go
-index e3f9e2724e..c827df3600 100644
+index 9bf8139df9..8f4f6f52a7 100644
 --- a/internal/service/acm/service_package_gen.go
 +++ b/internal/service/acm/service_package_gen.go
 @@ -64,6 +64,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (
- 	return acm.NewFromConfig(cfg,
  		acm.WithEndpointResolverV2(newEndpointResolverV2()),
  		withBaseEndpoint(config[names.AttrEndpoint].(string)),
+ 		withExtraOptions(ctx, p, config),
 +		p.pulumiCustomizeRetries(cfg),
- 	), nil
- }
+ 	}
 
+ 	return acm.NewFromConfig(cfg, optFns...), nil
diff --git a/patches/0037-Restore-legacy-bucket.patch b/patches/0037-Restore-legacy-bucket.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Restore legacy bucket
 
 
 diff --git a/internal/provider/provider.go b/internal/provider/provider.go
-index 4c83f4bb1c..2ec4c986be 100644
+index 8e45a8a381..95f9b0a7f6 100644
 --- a/internal/provider/provider.go
 +++ b/internal/provider/provider.go
 @@ -17,7 +17,6 @@ import (

diff --git a/patches/0052-Patch-tags-ComputedOnly-on-bedrockagent-and-other-mo.patch b/patches/0052-Patch-tags-ComputedOnly-on-bedrockagent-and-other-mo.patch
@@ -18,7 +18,7 @@ index 18133c7439..ea9f2d088f 100644
  		Blocks: map[string]schema.Block{
  			"export": schema.ListNestedBlock{
 diff --git a/internal/service/bedrockagent/agent.go b/internal/service/bedrockagent/agent.go
-index e74f1b1304..01741fcdeb 100644
+index e9c0a7e719..2b699250de 100644
 --- a/internal/service/bedrockagent/agent.go
 +++ b/internal/service/bedrockagent/agent.go
 @@ -171,7 +171,7 @@ func (r *agentResource) Schema(ctx context.Context, request resource.SchemaReque
@@ -44,11 +44,11 @@ index 1cf0f1f63b..526803d980 100644
  		Blocks: map[string]schema.Block{
  			names.AttrTimeouts: timeouts.Block(ctx, timeouts.Opts{
 diff --git a/internal/service/bedrockagent/knowledge_base.go b/internal/service/bedrockagent/knowledge_base.go
-index 8cff6125c2..15478a11bd 100644
+index 7adcf190a8..d6c5238089 100644
 --- a/internal/service/bedrockagent/knowledge_base.go
 +++ b/internal/service/bedrockagent/knowledge_base.go
 @@ -89,7 +89,7 @@ func (r *knowledgeBaseResource) Schema(ctx context.Context, request resource.Sch
- 				},
+ 				Required:   true,
  			},
  			names.AttrTags:    tftags.TagsAttribute(),
 -			names.AttrTagsAll: tftags.TagsAttributeComputedOnly(),

diff --git a/patches/0064-Adapt-gamelift-matchmaking-resources.patch b/patches/0064-Adapt-gamelift-matchmaking-resources.patch
@@ -645,10 +645,10 @@ index 4295987ae6..7554a3029c 100644
  		return nil
  	}
 diff --git a/names/data/names_data.hcl b/names/data/names_data.hcl
-index f24e067776..b877b79588 100644
+index 2d25eb67e3..45c603ac25 100644
 --- a/names/data/names_data.hcl
 +++ b/names/data/names_data.hcl
-@@ -3905,7 +3905,8 @@ service "fsx" {
+@@ -3703,7 +3703,8 @@ service "fsx" {
 
  service "gamelift" {
    sdk {

diff --git a/patches/0071-Restore-conns-factory-for-SDKv1-Go-clients-used-by-p.patch b/patches/0071-Restore-conns-factory-for-SDKv1-Go-clients-used-by-p.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Restore conns factory for SDKv1 Go clients used by patches
 
 
 diff --git a/internal/conns/awsclient_extra.go b/internal/conns/awsclient_extra.go
-index 57bf4c7c94..09b4279db3 100644
+index 57bf4c7c94..05fd0801d6 100644
 --- a/internal/conns/awsclient_extra.go
 +++ b/internal/conns/awsclient_extra.go
 @@ -5,9 +5,12 @@ package conns
@@ -48,8 +48,8 @@ index 57bf4c7c94..09b4279db3 100644
 +		}
 +	}
 +
-+	sp, ok := c.ServicePackages[servicePackageName]
-+	if !ok {
++	sp := c.ServicePackage(ctx, servicePackageName)
++	if sp == nil {
 +		var zero T
 +		return zero, fmt.Errorf("unknown service package: %s", servicePackageName)
 +	}

diff --git a/patches/0073-Restore-AWS-Go-SDK-v1-session.patch b/patches/0073-Restore-AWS-Go-SDK-v1-session.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Restore AWS Go SDK v1 session
 
 
 diff --git a/internal/conns/awsclient.go b/internal/conns/awsclient.go
-index 0d4c6c6d6c..1adf9943c4 100644
+index 932e5dff77..ff1bdc73d1 100644
 --- a/internal/conns/awsclient.go
 +++ b/internal/conns/awsclient.go
-@@ -305,6 +305,7 @@ func (c *AWSClient) apiClientConfig(ctx context.Context, servicePackageName stri
+@@ -321,6 +321,7 @@ func (c *AWSClient) apiClientConfig(ctx context.Context, servicePackageName stri
  		"aws_sdkv2_config": c.awsConfig,
  		"endpoint":         c.endpoints[servicePackageName],
  		"partition":        c.Partition(ctx),

diff --git a/patches/0078-Fix-tags_all-Computed-for-PF-resources.patch b/patches/0078-Fix-tags_all-Computed-for-PF-resources.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix tags_all Computed for PF resources
 
 
 diff --git a/internal/service/bedrock/inference_profile.go b/internal/service/bedrock/inference_profile.go
-index eb2348bc68..305435e1b7 100644
+index 184cc60639..38ec8e4c28 100644
 --- a/internal/service/bedrock/inference_profile.go
 +++ b/internal/service/bedrock/inference_profile.go
 @@ -119,7 +119,7 @@ func (r *resourceInferenceProfile) Schema(ctx context.Context, req resource.Sche

diff --git a/patches/0079-Speed-up-providerlint-by-re-using-build-cache-and-ig.patch b/patches/0079-Speed-up-providerlint-by-re-using-build-cache-and-ig.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Speed up providerlint by re-using build cache and ignoring
 
 
 diff --git a/GNUmakefile b/GNUmakefile
-index 3b52729809..87e89c7de6 100644
+index a0ccf63172..6bf7c74db7 100644
 --- a/GNUmakefile
 +++ b/GNUmakefile
 @@ -338,9 +338,10 @@ prereq-go: ## If $(GO_VER) is not installed, install it

diff --git a/patches/0081-Patch-tags-for-logs-cleanrooms-vpclattice.patch b/patches/0081-Patch-tags-for-logs-cleanrooms-vpclattice.patch
@@ -18,12 +18,12 @@ index a72d635b53..bce2d9829f 100644
  				CustomType: timetypes.RFC3339Type{},
  				Computed:   true,
 diff --git a/internal/service/logs/delivery.go b/internal/service/logs/delivery.go
-index 579c64372b..3d6f7fabee 100644
+index 8ab31eaf9e..1c1c288699 100644
 --- a/internal/service/logs/delivery.go
 +++ b/internal/service/logs/delivery.go
-@@ -91,7 +91,7 @@ func (r *deliveryResource) Schema(ctx context.Context, request resource.SchemaRe
+@@ -95,7 +95,7 @@ func (r *deliveryResource) Schema(ctx context.Context, request resource.SchemaRe
  			},
- 			"s3_delivery_configuration": framework.ResourceOptionalComputedListOfObjectAttribute[s3DeliveryConfigurationModel](ctx),
+ 			"s3_delivery_configuration": framework.ResourceOptionalComputedListOfObjectsAttribute[s3DeliveryConfigurationModel](ctx, 1, listplanmodifier.UseStateForUnknown()),
  			names.AttrTags:              tftags.TagsAttribute(),
 -			names.AttrTagsAll:           tftags.TagsAttributeComputedOnly(),
 +			names.AttrTagsAll: tftags.TagsAttribute(),
@@ -57,10 +57,10 @@ index a051dfcd0f..97d47e535d 100644
  	}
  }
 diff --git a/internal/service/vpclattice/resource_gateway.go b/internal/service/vpclattice/resource_gateway.go
-index be786deea2..6606a8a474 100644
+index 1fe2a69c2a..263af9aa7a 100644
 --- a/internal/service/vpclattice/resource_gateway.go
 +++ b/internal/service/vpclattice/resource_gateway.go
-@@ -97,7 +97,7 @@ func (r *resourceGatewayResource) Schema(ctx context.Context, request resource.S
+@@ -102,7 +102,7 @@ func (r *resourceGatewayResource) Schema(ctx context.Context, request resource.S
  				},
  			},
  			names.AttrTags:    tftags.TagsAttribute(),

diff --git a/patches/0083-Patch-tags-for-rekognition-route53domains-timestream.patch b/patches/0083-Patch-tags-for-rekognition-route53domains-timestream.patch
@@ -0,0 +1,72 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: corymhall <[email protected]>
+Date: Tue, 4 Feb 2025 09:45:36 -0500
+Subject: [PATCH] Patch tags for rekognition, route53domains, timestreamquery,
+ vpclattice
+
+
+diff --git a/internal/service/rekognition/project.go b/internal/service/rekognition/project.go
+index 4c94547e2f..7fae3e37d7 100644
+--- a/internal/service/rekognition/project.go
++++ b/internal/service/rekognition/project.go
+@@ -81,7 +81,7 @@ func (r *resourceProject) Schema(ctx context.Context, req resource.SchemaRequest
+ 				},
+ 			},
+ 			names.AttrTags:    tftags.TagsAttribute(),
+-			names.AttrTagsAll: tftags.TagsAttributeComputedOnly(),
++			names.AttrTagsAll: tftags.TagsAttribute(),
+ 		},
+ 		Blocks: map[string]schema.Block{
+ 			names.AttrTimeouts: timeouts.Block(ctx, timeouts.Opts{
+diff --git a/internal/service/route53domains/domain.go b/internal/service/route53domains/domain.go
+index 98708eda12..292fefb210 100644
+--- a/internal/service/route53domains/domain.go
++++ b/internal/service/route53domains/domain.go
+@@ -149,7 +149,7 @@ func (r *domainResource) Schema(ctx context.Context, request resource.SchemaRequ
+ 				},
+ 			},
+ 			names.AttrTags:    tftags.TagsAttribute(),
+-			names.AttrTagsAll: tftags.TagsAttributeComputedOnly(),
++			names.AttrTagsAll: tftags.TagsAttribute(),
+ 			"tech_privacy": schema.BoolAttribute{
+ 				Optional: true,
+ 				Computed: true,
+diff --git a/internal/service/timestreamquery/scheduled_query.go b/internal/service/timestreamquery/scheduled_query.go
+index 5c1b69bb1b..6adcc05130 100644
+--- a/internal/service/timestreamquery/scheduled_query.go
++++ b/internal/service/timestreamquery/scheduled_query.go
+@@ -91,7 +91,7 @@ func (r *resourceScheduledQuery) Schema(ctx context.Context, req resource.Schema
+ 				Computed:   true,
+ 			},
+ 			names.AttrTags:    tftags.TagsAttribute(),
+-			names.AttrTagsAll: tftags.TagsAttributeComputedOnly(),
++			names.AttrTagsAll: tftags.TagsAttribute(),
+ 		},
+ 		Blocks: map[string]schema.Block{
+ 			"error_report_configuration": schema.ListNestedBlock{
+diff --git a/internal/service/vpclattice/resource_configuration.go b/internal/service/vpclattice/resource_configuration.go
+index abbbefdd0e..529904a5d9 100644
+--- a/internal/service/vpclattice/resource_configuration.go
++++ b/internal/service/vpclattice/resource_configuration.go
+@@ -126,7 +126,7 @@ func (r *resourceConfigurationResource) Schema(ctx context.Context, request reso
+ 				},
+ 			},
+ 			names.AttrTags:    tftags.TagsAttribute(),
+-			names.AttrTagsAll: tftags.TagsAttributeComputedOnly(),
++			names.AttrTagsAll: tftags.TagsAttribute(),
+ 			names.AttrType: schema.StringAttribute{
+ 				CustomType: typeType,
+ 				Optional:   true,
+diff --git a/internal/service/vpclattice/service_network_resource_association.go b/internal/service/vpclattice/service_network_resource_association.go
+index 058d15aa9a..0833439e37 100644
+--- a/internal/service/vpclattice/service_network_resource_association.go
++++ b/internal/service/vpclattice/service_network_resource_association.go
+@@ -74,7 +74,7 @@ func (r *serviceNetworkResourceAssociationResource) Schema(ctx context.Context,
+ 				},
+ 			},
+ 			names.AttrTags:    tftags.TagsAttribute(),
+-			names.AttrTagsAll: tftags.TagsAttributeComputedOnly(),
++			names.AttrTagsAll: tftags.TagsAttribute(),
+ 		},
+ 		Blocks: map[string]schema.Block{
+ 			names.AttrTimeouts: timeouts.Block(ctx, timeouts.Opts{