Upstream v5.50.0 (#3959)

closes #3956 **Patches that I had to fix** - [0006-Workaround-SSM-Parameter-tier-bug.patch](https://github.com/pulumi/pulumi-aws/pull/3959/files#diff-bc50fd3a52055507b304bc3c145e15ba0cce91f2ee336b74317e9f440dd2be2b) - I think we've lost the context on this patch, but it looks like the only change that was needed here was some types changing. - [patches/0041-Revert-Merge-pull-request-35671-from-hashicorp-b-lb-.patch](https://github.com/pulumi/pulumi-aws/pull/3959/files#diff-baabdef52cd795a1b106c14e1e022e073348bb0cd394ba46424e8628c71486c6) - New types were introduced for values - [0042-Allow-creating-lambdas-without-code-related-properti.patch](https://github.com/pulumi/pulumi-aws/pull/3959/files#diff-bb6c556bcbddec7104b20932017312788d85ee8854da2ca9b4e1eaabb7b0abaf) - New types were introduced for values - [patches/0046-Revert-rds-engine_version-Fix-bugs-with-default-only.patch](https://github.com/pulumi/pulumi-aws/pull/3959/files#diff-a2e48d68daadb073990320386c98a66170ff35059dbccb6bcc89a2b88886f9c9) - updates to revert patches are very difficult to reason about.
pulumi · May 21, 2024 · f07ba4f · f07ba4f
1 parent c0d57d4
commit f07ba4f
Show file tree

Hide file tree

Showing 309 changed files with 7,385 additions and 3,954 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 a459ad5da6..c1c1f3d9ee 100644
+index d60d3f21b4..650a8e25fb 100644
 --- a/internal/provider/provider.go
 +++ b/internal/provider/provider.go
 @@ -13,6 +13,8 @@ import (

diff --git a/patches/0004-De-deprecate-bucket_object.patch b/patches/0004-De-deprecate-bucket_object.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] De-deprecate bucket_object
 
 
 diff --git a/internal/service/s3/bucket_object.go b/internal/service/s3/bucket_object.go
-index 36c4378a5a..18307157af 100644
+index 506fe1cc26..e6d4e3b3d2 100644
 --- a/internal/service/s3/bucket_object.go
 +++ b/internal/service/s3/bucket_object.go
 @@ -68,7 +68,7 @@ func resourceBucketObject() *schema.Resource {

diff --git a/patches/0005-Remove-lakeformation-catalog_resource-default.patch b/patches/0005-Remove-lakeformation-catalog_resource-default.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Remove lakeformation catalog_resource default
 
 
 diff --git a/internal/service/lakeformation/permissions.go b/internal/service/lakeformation/permissions.go
-index 6d4243be8a..cada2dfb17 100644
+index cb641c005b..c7a4d8aeb2 100644
 --- a/internal/service/lakeformation/permissions.go
 +++ b/internal/service/lakeformation/permissions.go
 @@ -43,8 +43,8 @@ func ResourcePermissions() *schema.Resource {

diff --git a/patches/0006-Workaround-SSM-Parameter-tier-bug.patch b/patches/0006-Workaround-SSM-Parameter-tier-bug.patch
@@ -1,55 +1,52 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Daniel Bradley <daniel@pulumi.com>
-Date: Fri, 4 Nov 2022 17:24:42 +0000
+From: corymhall <[email protected].com>
+Date: Fri, 17 May 2024 13:41:45 -0400
 Subject: [PATCH] Workaround SSM Parameter tier bug
 
 - Disable "computed".
 - Disable diff suppression & counteractions
 
 diff --git a/internal/service/ssm/parameter.go b/internal/service/ssm/parameter.go
-index e63aea86d0..9ea46bb099 100644
+index 7fd23f6b57..5a24c9641a 100644
 --- a/internal/service/ssm/parameter.go
 +++ b/internal/service/ssm/parameter.go
-@@ -95,15 +95,17 @@ func ResourceParameter() *schema.Resource {
+@@ -92,15 +92,17 @@ func resourceParameter() *schema.Resource {
  			names.AttrTags:    tftags.TagsSchema(),
  			names.AttrTagsAll: tftags.TagsSchemaComputed(),
  			"tier": {
--				Type:         schema.TypeString,
--				Optional:     true,
--				Computed:     true,
+-				Type:             schema.TypeString,
+-				Optional:         true,
+-				Computed:         true,
 +				Type:     schema.TypeString,
 +				Optional: true,
 +				//Computed:     true,
-+				Default:      ssm.ParameterTierStandard,
- 				ValidateFunc: validation.StringInSlice(ssm.ParameterTier_Values(), false),
++				Default:          awstypes.ParameterTierStandard,
+ 				ValidateDiagFunc: enum.Validate[awstypes.ParameterTier](),
  				DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool {
 -					if old != "" {
--						return new == ssm.ParameterTierIntelligentTiering
+-						return awstypes.ParameterTier(new) == awstypes.ParameterTierIntelligentTiering
 -					}
 -					return false
-+					return d.Get("tier").(string) == ssm.ParameterTierIntelligentTiering
++					return awstypes.ParameterTier(d.Get("tier").(string)) == awstypes.ParameterTierIntelligentTiering
 +					//if old != "" {
 +					//	return new == ssm.ParameterTierIntelligentTiering
 +					//}
 +					//return false
  				},
  			},
  			names.AttrType: {
-@@ -319,11 +321,13 @@ func resourceParameterUpdate(ctx context.Context, d *schema.ResourceData, meta i
- 			AllowedPattern: aws.String(d.Get("allowed_pattern").(string)),
+@@ -297,6 +299,14 @@ func resourceParameterUpdate(ctx context.Context, d *schema.ResourceData, meta i
+ 			Value:          aws.String(value),
  		}
 
 +		// FORK: Stack72 to undo this Tier comment out below when associated bridge issue is solved
 +
- 		// Retrieve the value set in the config directly to counteract the DiffSuppressFunc above
--		tier := d.GetRawConfig().GetAttr("tier")
--		if tier.IsKnown() && !tier.IsNull() {
--			paramInput.Tier = aws.String(tier.AsString())
--		}
++		// Retrieve the value set in the config directly to counteract the DiffSuppressFunc above
 +		//tier := d.GetRawConfig().GetAttr("tier")
 +		//if tier.IsKnown() && !tier.IsNull() {
 +		//	paramInput.Tier = aws.String(tier.AsString())
 +		//}
- 
++
  		if d.HasChange("data_type") {
- 			paramInput.DataType = aws.String(d.Get("data_type").(string))
+ 			input.DataType = aws.String(d.Get("data_type").(string))
+ 		}
diff --git a/patches/0007-Add-EKS-cluster-certificate_authorities-plural.patch b/patches/0007-Add-EKS-cluster-certificate_authorities-plural.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add EKS cluster certificate_authorities (plural)
 
 
 diff --git a/internal/service/eks/cluster.go b/internal/service/eks/cluster.go
-index 2826bc48f2..6a9b729b3b 100644
+index e9ab6aa1e2..2c47e7398f 100644
 --- a/internal/service/eks/cluster.go
 +++ b/internal/service/eks/cluster.go
 @@ -83,9 +83,24 @@ func resourceCluster() *schema.Resource {

diff --git a/patches/0008-Workaround-Autoscaling-launch_configuration-associat.patch b/patches/0008-Workaround-Autoscaling-launch_configuration-associat.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Workaround Autoscaling launch_configuration
 - Disable computation of property until fixed.
 
 diff --git a/internal/service/autoscaling/launch_configuration.go b/internal/service/autoscaling/launch_configuration.go
-index 5070e8bde4..48008f0b18 100644
+index a5f4e2b0e5..da6cab137a 100644
 --- a/internal/service/autoscaling/launch_configuration.go
 +++ b/internal/service/autoscaling/launch_configuration.go
 @@ -51,7 +51,8 @@ func resourceLaunchConfiguration() *schema.Resource {

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 c1c1f3d9ee..190777f4e0 100644
+index 650a8e25fb..81babf4a9c 100644
 --- a/internal/provider/provider.go
 +++ b/internal/provider/provider.go
 @@ -13,6 +13,8 @@ import (

diff --git a/patches/0012-Revert-WAF-schema-changes.patch b/patches/0012-Revert-WAF-schema-changes.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Revert WAF schema changes
 - This causes far too many types to be generated downstream.
 
 diff --git a/internal/service/wafv2/schemas.go b/internal/service/wafv2/schemas.go
-index 2487eee5f3..e5c68fd5e9 100644
+index d7bc4a6e51..1482c458bd 100644
 --- a/internal/service/wafv2/schemas.go
 +++ b/internal/service/wafv2/schemas.go
 @@ -54,14 +54,14 @@ func ruleGroupRootStatementSchema(level int) *schema.Schema {

diff --git a/patches/0013-Catch-cty-panic-in-new-resourceTopicSubscriptionCust.patch b/patches/0013-Catch-cty-panic-in-new-resourceTopicSubscriptionCust.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Catch cty panic in new
 The root cause is not fully understood yet but this might unblock us.
 
 diff --git a/internal/service/sns/topic_subscription.go b/internal/service/sns/topic_subscription.go
-index 0bfae0a063..4ccb818aba 100644
+index 048654b937..0664e05d84 100644
 --- a/internal/service/sns/topic_subscription.go
 +++ b/internal/service/sns/topic_subscription.go
 @@ -540,9 +540,11 @@ func normalizeTopicSubscriptionDeliveryPolicy(policy string) ([]byte, error) {

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 190777f4e0..2dc3e9a509 100644
+index 81babf4a9c..92763850ac 100644
 --- a/internal/provider/provider.go
 +++ b/internal/provider/provider.go
 @@ -15,6 +15,7 @@ import (

diff --git a/patches/0016-Revert-Update-endpointHashIPAddress.patch b/patches/0016-Revert-Update-endpointHashIPAddress.patch
@@ -9,7 +9,7 @@ This commit causes never-converging diffs due to incorrect use of
 a computed property in hashing.
 
 diff --git a/internal/service/route53resolver/endpoint.go b/internal/service/route53resolver/endpoint.go
-index 7866fd640c..a95a97ed5b 100644
+index 2531180774..68f1b30fb1 100644
 --- a/internal/service/route53resolver/endpoint.go
 +++ b/internal/service/route53resolver/endpoint.go
 @@ -430,7 +430,7 @@ func waitEndpointDeleted(ctx context.Context, conn *route53resolver.Route53Resol

diff --git a/patches/0018-Change-default-descriptions-to-Managed-by-Pulumi.patch b/patches/0018-Change-default-descriptions-to-Managed-by-Pulumi.patch
@@ -44,7 +44,7 @@ index 837e79c057..8fc8280900 100644
  			},
  			"etag": {
 diff --git a/internal/service/docdb/cluster_parameter_group.go b/internal/service/docdb/cluster_parameter_group.go
-index 959a97abd7..f7587ff9ab 100644
+index 31466da183..d36339e1dc 100644
 --- a/internal/service/docdb/cluster_parameter_group.go
 +++ b/internal/service/docdb/cluster_parameter_group.go
 @@ -48,7 +48,7 @@ func ResourceClusterParameterGroup() *schema.Resource {
@@ -54,7 +54,7 @@ index 959a97abd7..f7587ff9ab 100644
 -				Default:  "Managed by Terraform",
 +				Default:  "Managed by Pulumi",
  			},
- 			"family": {
+ 			names.AttrFamily: {
  				Type:     schema.TypeString,
 diff --git a/internal/service/docdb/subnet_group.go b/internal/service/docdb/subnet_group.go
 index 333fe4befa..b706339eea 100644
@@ -83,7 +83,7 @@ index d2f71a3305..c650bee4bf 100644
  			},
  			"egress":  securityGroupRuleSetNestedBlock,
 diff --git a/internal/service/elasticache/parameter_group.go b/internal/service/elasticache/parameter_group.go
-index efd59ed47e..dfe5a0f410 100644
+index 28dbb026be..15decf8ed9 100644
 --- a/internal/service/elasticache/parameter_group.go
 +++ b/internal/service/elasticache/parameter_group.go
 @@ -49,7 +49,7 @@ func resourceParameterGroup() *schema.Resource {
@@ -93,7 +93,7 @@ index efd59ed47e..dfe5a0f410 100644
 -				Default:  "Managed by Terraform",
 +				Default:  "Managed by Pulumi",
  			},
- 			"family": {
+ 			names.AttrFamily: {
  				Type:     schema.TypeString,
 diff --git a/internal/service/elasticache/security_group.go b/internal/service/elasticache/security_group.go
 new file mode 100644
@@ -242,7 +242,7 @@ index b00bb973e4..daa2df4791 100644
  			names.AttrName: {
  				Type:     schema.TypeString,
 diff --git a/internal/service/mediapackage/channel.go b/internal/service/mediapackage/channel.go
-index cec42b0ab5..e1ce46856e 100644
+index 961d1f0438..710fd0b998 100644
 --- a/internal/service/mediapackage/channel.go
 +++ b/internal/service/mediapackage/channel.go
 @@ -51,7 +51,7 @@ func ResourceChannel() *schema.Resource {
@@ -255,7 +255,7 @@ index cec42b0ab5..e1ce46856e 100644
  			"hls_ingest": {
  				Type:     schema.TypeList,
 diff --git a/internal/service/memorydb/cluster.go b/internal/service/memorydb/cluster.go
-index 55d3637a4e..465e394512 100644
+index fe65b679fa..2a31c3f3ce 100644
 --- a/internal/service/memorydb/cluster.go
 +++ b/internal/service/memorydb/cluster.go
 @@ -73,7 +73,7 @@ func ResourceCluster() *schema.Resource {
@@ -268,7 +268,7 @@ index 55d3637a4e..465e394512 100644
  			"engine_patch_version": {
  				Type:     schema.TypeString,
 diff --git a/internal/service/memorydb/parameter_group.go b/internal/service/memorydb/parameter_group.go
-index 877c845404..5be6fa78a8 100644
+index ca5f2daae9..ae4c0946b3 100644
 --- a/internal/service/memorydb/parameter_group.go
 +++ b/internal/service/memorydb/parameter_group.go
 @@ -51,7 +51,7 @@ func ResourceParameterGroup() *schema.Resource {
@@ -278,7 +278,7 @@ index 877c845404..5be6fa78a8 100644
 -				Default:  "Managed by Terraform",
 +				Default:  "Managed by Pulumi",
  			},
- 			"family": {
+ 			names.AttrFamily: {
  				Type:     schema.TypeString,
 diff --git a/internal/service/memorydb/subnet_group.go b/internal/service/memorydb/subnet_group.go
 index 314802c87e..9bd9633a92 100644
@@ -294,7 +294,7 @@ index 314802c87e..9bd9633a92 100644
  			names.AttrName: {
  				Type:          schema.TypeString,
 diff --git a/internal/service/neptune/cluster_parameter_group.go b/internal/service/neptune/cluster_parameter_group.go
-index 2807e14fea..18be05a952 100644
+index e87f859edf..23da80a091 100644
 --- a/internal/service/neptune/cluster_parameter_group.go
 +++ b/internal/service/neptune/cluster_parameter_group.go
 @@ -48,7 +48,7 @@ func ResourceClusterParameterGroup() *schema.Resource {
@@ -304,10 +304,10 @@ index 2807e14fea..18be05a952 100644
 -				Default:  "Managed by Terraform",
 +				Default:  "Managed by Pulumi",
  			},
- 			"family": {
+ 			names.AttrFamily: {
  				Type:     schema.TypeString,
 diff --git a/internal/service/neptune/parameter_group.go b/internal/service/neptune/parameter_group.go
-index e438ed4cb6..95d1b3f345 100644
+index 1850017051..963b73dbbd 100644
 --- a/internal/service/neptune/parameter_group.go
 +++ b/internal/service/neptune/parameter_group.go
 @@ -52,7 +52,7 @@ func ResourceParameterGroup() *schema.Resource {
@@ -317,7 +317,7 @@ index e438ed4cb6..95d1b3f345 100644
 -				Default:  "Managed by Terraform",
 +				Default:  "Managed by Pulumi",
  			},
- 			"family": {
+ 			names.AttrFamily: {
  				Type:     schema.TypeString,
 diff --git a/internal/service/neptune/subnet_group.go b/internal/service/neptune/subnet_group.go
 index fc60010e7d..0b213b1bf7 100644
@@ -333,7 +333,7 @@ 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 f116ad37e4..c8b59e9363 100644
+index ee5f978ef7..a9a5d5d082 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 {
@@ -343,7 +343,7 @@ index f116ad37e4..c8b59e9363 100644
 -				Default:  "Managed by Terraform",
 +				Default:  "Managed by Pulumi",
  			},
- 			"family": {
+ 			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
@@ -359,7 +359,7 @@ 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 546903e074..fcdea229c6 100644
+index 1495ef44cf..82d6784aba 100644
 --- a/internal/service/rds/parameter_group.go
 +++ b/internal/service/rds/parameter_group.go
 @@ -51,7 +51,7 @@ func ResourceParameterGroup() *schema.Resource {
@@ -369,7 +369,7 @@ index 546903e074..fcdea229c6 100644
 -				Default:  "Managed by Terraform",
 +				Default:  "Managed by Pulumi",
  			},
- 			"family": {
+ 			names.AttrFamily: {
  				Type:     schema.TypeString,
 diff --git a/internal/service/rds/security_group.go b/internal/service/rds/security_group.go
 new file mode 100644
@@ -707,7 +707,7 @@ index dfc4040034..e044b6a8cf 100644
  			names.AttrName: {
  				Type:          schema.TypeString,
 diff --git a/internal/service/redshift/parameter_group.go b/internal/service/redshift/parameter_group.go
-index 32c6f92b44..aa4eda9830 100644
+index 1a1a3536eb..8901974885 100644
 --- a/internal/service/redshift/parameter_group.go
 +++ b/internal/service/redshift/parameter_group.go
 @@ -50,7 +50,7 @@ func resourceParameterGroup() *schema.Resource {
@@ -717,7 +717,7 @@ index 32c6f92b44..aa4eda9830 100644
 -				Default:  "Managed by Terraform",
 +				Default:  "Managed by Pulumi",
  			},
- 			"family": {
+ 			names.AttrFamily: {
  				Type:     schema.TypeString,
 diff --git a/internal/service/redshift/security_group.go b/internal/service/redshift/security_group.go
 new file mode 100644
@@ -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 c46f2480be..99b65c9466 100644
+index b11895007a..99e20aa518 100644
 --- a/internal/service/route53/record.go
 +++ b/internal/service/route53/record.go
 @@ -361,7 +361,7 @@ func resourceRecordCreate(ctx context.Context, d *schema.ResourceData, meta inte
@@ -1061,11 +1061,11 @@ index c46f2480be..99b65c9466 100644
  			{
  				Action:            aws.String(route53.ChangeActionDelete),
 diff --git a/internal/service/route53/zone.go b/internal/service/route53/zone.go
-index 3ffc464eae..55d4aa852c 100644
+index 188382487b..27b22fbad1 100644
 --- a/internal/service/route53/zone.go
 +++ b/internal/service/route53/zone.go
 @@ -59,7 +59,7 @@ func ResourceZone() *schema.Resource {
- 			"comment": {
+ 			names.AttrComment: {
  				Type:         schema.TypeString,
  				Optional:     true,
 -				Default:      "Managed by Terraform",

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,7 +5,7 @@ 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 44c9641bce..f5c2ba0fdb 100644
+index f8d73d27da..1ad640468b 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

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 da71bbcb51..408e309eb3 100644
+index 9baddcf224..e291c29b74 100644
 --- a/internal/conns/awsclient.go
 +++ b/internal/conns/awsclient.go
 @@ -22,6 +22,7 @@ import (