Update upstream to include fix json diff for redrivePolicy (#2529)

rquitales · web-flow · commit f29b23258140 · 2023-05-19T09:19:08.000-07:00
* Point upstream folder to head of patched-v4.67.0 Head for patched-v4.67.0 contains a fix for the JSON diff in redrive_policy. pulumi/terraform-provider-aws@a82c36c * Update list of patches
diff --git a/upstream b/upstream
@@ -1 +1 @@
-Subproject commit 4f6474d2a1e3fae800ac433e367956811951f1e7
+Subproject commit a82c36c5556e2b8de91ba2a82a24bcd6074345be
diff --git a/upstream-patches/0001-Add-TagsSchemaTrulyComputed-definition.patch b/upstream-patches/0001-Add-TagsSchemaTrulyComputed-definition.patch
@@ -1,7 +1,7 @@
 From 3df2e1142a8c675ef7a5ea5dda02dbd67a8677f0 Mon Sep 17 00:00:00 2001
 From: Daniel Bradley <daniel@pulumi.com>
 Date: Fri, 4 Nov 2022 16:49:08 +0000
-Subject: [PATCH 01/28] Add TagsSchemaTrulyComputed definition
+Subject: [PATCH 01/29] Add TagsSchemaTrulyComputed definition
 
 ---
  internal/tags/tags.go | 8 ++++++++
diff --git a/upstream-patches/0002-Conns-user-agent.patch b/upstream-patches/0002-Conns-user-agent.patch
@@ -1,7 +1,7 @@
 From d51bc817155ea38ceffa9089e1164c7fd9da6f50 Mon Sep 17 00:00:00 2001
 From: Daniel Bradley <daniel@pulumi.com>
 Date: Fri, 4 Nov 2022 17:03:31 +0000
-Subject: [PATCH 02/28] Conns user agent
+Subject: [PATCH 02/29] Conns user agent
 
 Replace the useragent used for AWS client connections with a
 Pulumi-flavoured one.
diff --git a/upstream-patches/0003-Add-S3-legacy-bucket-to-resources.patch b/upstream-patches/0003-Add-S3-legacy-bucket-to-resources.patch
@@ -1,7 +1,7 @@
 From 0e4273c577190cca8dd29bd0624e37ac446972a6 Mon Sep 17 00:00:00 2001
 From: Daniel Bradley <daniel@pulumi.com>
 Date: Fri, 4 Nov 2022 17:05:11 +0000
-Subject: [PATCH 03/28] Add S3 legacy bucket to resources
+Subject: [PATCH 03/29] Add S3 legacy bucket to resources
 
 This preserves the old S3 Resource in the SDK, by duplicating the code
 as a new service (in internal/service/s3legacy), and making an explicit
diff --git a/upstream-patches/0004-Marks-SSE-Configuration-as-Computed-for-Legacy-S3-Bu.patch b/upstream-patches/0004-Marks-SSE-Configuration-as-Computed-for-Legacy-S3-Bu.patch
@@ -1,7 +1,7 @@
 From 8171d74b3ed2e40a76d2de7fa923124b2bfd75c0 Mon Sep 17 00:00:00 2001
 From: Kyle Pitzen <kpitzen@pulumi.com>
 Date: Thu, 9 Mar 2023 09:47:49 -0600
-Subject: [PATCH 04/28] Marks SSE Configuration as Computed for Legacy S3
+Subject: [PATCH 04/29] Marks SSE Configuration as Computed for Legacy S3
  Bucket
 
 In January, AWS enabled SSE by default for all new S3 buckets.
diff --git a/upstream-patches/0005-De-deprecate-bucket_object.patch b/upstream-patches/0005-De-deprecate-bucket_object.patch
@@ -1,7 +1,7 @@
 From ab24f5f14290f866a4dad10a01335050190a68a8 Mon Sep 17 00:00:00 2001
 From: Daniel Bradley <daniel@pulumi.com>
 Date: Fri, 4 Nov 2022 17:06:11 +0000
-Subject: [PATCH 05/28] De-deprecate bucket_object
+Subject: [PATCH 05/29] De-deprecate bucket_object
 
 ---
  internal/service/s3/bucket_object.go | 4 ++--
diff --git a/upstream-patches/0006-Remove-lakeformation-catalog_resource-default.patch b/upstream-patches/0006-Remove-lakeformation-catalog_resource-default.patch
@@ -1,7 +1,7 @@
 From 020c73a3f641d94a6d40570b670ccb83d27a0172 Mon Sep 17 00:00:00 2001
 From: Daniel Bradley <daniel@pulumi.com>
 Date: Fri, 4 Nov 2022 17:08:23 +0000
-Subject: [PATCH 06/28] Remove lakeformation catalog_resource default
+Subject: [PATCH 06/29] Remove lakeformation catalog_resource default
 
 ---
  internal/service/lakeformation/permissions.go | 4 ++--
diff --git a/upstream-patches/0007-Workaround-SSM-Parameter-tier-bug.patch b/upstream-patches/0007-Workaround-SSM-Parameter-tier-bug.patch
@@ -1,7 +1,7 @@
 From 5367aa3507217845325a307a1347176cd4e66932 Mon Sep 17 00:00:00 2001
 From: Daniel Bradley <daniel@pulumi.com>
 Date: Fri, 4 Nov 2022 17:24:42 +0000
-Subject: [PATCH 07/28] Workaround SSM Parameter tier bug
+Subject: [PATCH 07/29] Workaround SSM Parameter tier bug
 
 - Disable "computed".
 - Disable diff suppression & counteractions
diff --git a/upstream-patches/0008-Add-EKS-cluster-default_addons_to_remove.patch b/upstream-patches/0008-Add-EKS-cluster-default_addons_to_remove.patch
@@ -1,7 +1,7 @@
 From 59d4b280e3580802cf260142c4af0060415007dc Mon Sep 17 00:00:00 2001
 From: Daniel Bradley <daniel@pulumi.com>
 Date: Fri, 4 Nov 2022 17:31:27 +0000
-Subject: [PATCH 08/28] Add EKS cluster default_addons_to_remove
+Subject: [PATCH 08/29] Add EKS cluster default_addons_to_remove
 
 ---
  internal/service/eks/cluster.go               |   7 +
diff --git a/upstream-patches/0009-Add-EKS-cluster-certificate_authorities-plural.patch b/upstream-patches/0009-Add-EKS-cluster-certificate_authorities-plural.patch
@@ -1,7 +1,7 @@
 From 73f06ce561f0995e3125c331b6d54f115f570e1b Mon Sep 17 00:00:00 2001
 From: Daniel Bradley <daniel@pulumi.com>
 Date: Fri, 4 Nov 2022 17:32:49 +0000
-Subject: [PATCH 09/28] Add EKS cluster certificate_authorities (plural)
+Subject: [PATCH 09/29] Add EKS cluster certificate_authorities (plural)
 
 ---
  internal/service/eks/cluster.go | 22 ++++++++++++++++++++++
diff --git a/upstream-patches/0010-Workaround-Autoscaling-launch_configuration-associat.patch b/upstream-patches/0010-Workaround-Autoscaling-launch_configuration-associat.patch
@@ -1,7 +1,7 @@
 From 550a8f6fe20558228784b6effab8a4982cb2804d Mon Sep 17 00:00:00 2001
 From: Daniel Bradley <daniel@pulumi.com>
 Date: Fri, 4 Nov 2022 17:34:56 +0000
-Subject: [PATCH 10/28] Workaround Autoscaling launch_configuration
+Subject: [PATCH 10/29] Workaround Autoscaling launch_configuration
  associate_public_ip_address
 
 - Disable computation of property until fixed.
diff --git a/upstream-patches/0011-Add-ECR-credentials_data_source.patch b/upstream-patches/0011-Add-ECR-credentials_data_source.patch
@@ -1,7 +1,7 @@
 From 8ec4e7860622e832ccee359b73144b49a06f8ad8 Mon Sep 17 00:00:00 2001
 From: Daniel Bradley <daniel@pulumi.com>
 Date: Fri, 4 Nov 2022 17:36:34 +0000
-Subject: [PATCH 11/28] Add ECR credentials_data_source
+Subject: [PATCH 11/29] Add ECR credentials_data_source
 
 ---
  internal/provider/provider.go                 |  6 +-
diff --git a/upstream-patches/0012-Revert-framework-conversions.patch b/upstream-patches/0012-Revert-framework-conversions.patch
@@ -1,7 +1,7 @@
 From 8c615ed64cfd6b95694acdf42483d347cc43bbc9 Mon Sep 17 00:00:00 2001
 From: Daniel Bradley <daniel@pulumi.com>
 Date: Fri, 4 Nov 2022 17:42:19 +0000
-Subject: [PATCH 12/28] Revert framework conversions
+Subject: [PATCH 12/29] Revert framework conversions
 
 This commit reverts resources and data sources that were ported to the
 plugin framework, back to their previous implementation. The upstream
diff --git a/upstream-patches/0013-Add-custom-appautoscaling-examples.patch b/upstream-patches/0013-Add-custom-appautoscaling-examples.patch
@@ -1,7 +1,7 @@
 From 32c1611f331b9dae69bf199ed0f2f950721c73d1 Mon Sep 17 00:00:00 2001
 From: Daniel Bradley <daniel@pulumi.com>
 Date: Wed, 9 Nov 2022 17:37:35 +0000
-Subject: [PATCH 13/28] Add custom appautoscaling examples
+Subject: [PATCH 13/29] Add custom appautoscaling examples
 
 ---
  .../r/appautoscaling_policy.html.markdown     | 28 +++++++++++++++++++
diff --git a/upstream-patches/0014-Add-dedicated_host-docs.patch b/upstream-patches/0014-Add-dedicated_host-docs.patch
@@ -1,7 +1,7 @@
 From eb521bffe146e9c3b4874709e42550c949c4281c Mon Sep 17 00:00:00 2001
 From: Daniel Bradley <daniel@pulumi.com>
 Date: Tue, 15 Nov 2022 10:08:05 +0000
-Subject: [PATCH 14/28] Add dedicated_host docs
+Subject: [PATCH 14/29] Add dedicated_host docs
 
 ---
  website/docs/d/dedicated_host.html.markdown | 75 +++++++++++++++++++++
diff --git a/upstream-patches/0015-Revert-WAF-schema-changes.patch b/upstream-patches/0015-Revert-WAF-schema-changes.patch
@@ -1,7 +1,7 @@
 From f3d4ee60bc40130f2ab9e93337a46c6228699bc3 Mon Sep 17 00:00:00 2001
 From: Daniel Bradley <daniel@pulumi.com>
 Date: Tue, 15 Nov 2022 13:59:57 +0000
-Subject: [PATCH 15/28] Revert WAF schema changes
+Subject: [PATCH 15/29] Revert WAF schema changes
 
 - This causes far too many types to be generated downstream.
 ---
diff --git a/upstream-patches/0016-Un-deprecate-RDS-instance-name.patch b/upstream-patches/0016-Un-deprecate-RDS-instance-name.patch
@@ -1,7 +1,7 @@
 From 4c2a4481f558cd1f0037482050338c28c09da8b9 Mon Sep 17 00:00:00 2001
 From: Daniel Bradley <daniel@pulumi.com>
 Date: Thu, 17 Nov 2022 09:55:46 +0000
-Subject: [PATCH 16/28] Un-deprecate RDS instance name
+Subject: [PATCH 16/29] Un-deprecate RDS instance name
 
 We don't have a good migration story yet so this just adds noise for users.
 
diff --git a/upstream-patches/0017-Catch-cty-panic-in-new-resourceTopicSubscriptionCust.patch b/upstream-patches/0017-Catch-cty-panic-in-new-resourceTopicSubscriptionCust.patch
@@ -1,7 +1,7 @@
 From 522a4e7c12ffd63261a06141b4e3480784e398a2 Mon Sep 17 00:00:00 2001
 From: Thomas Kappler <tkappler@gmail.com>
 Date: Thu, 1 Dec 2022 10:56:32 -0800
-Subject: [PATCH 17/28] Catch cty panic in new
+Subject: [PATCH 17/29] Catch cty panic in new
  resourceTopicSubscriptionCustomizeDiff.
 
 The root cause is not fully understood yet but this might unblock us.
diff --git a/upstream-patches/0018-add-matchmaking-configuration-72.patch b/upstream-patches/0018-add-matchmaking-configuration-72.patch
@@ -1,7 +1,7 @@
 From eeb2132cb072dadb31aa0f14531bdeb814c13276 Mon Sep 17 00:00:00 2001
 From: Lee Briggs <jaxxstorm@users.noreply.github.com>
 Date: Wed, 21 Dec 2022 12:23:59 -0800
-Subject: [PATCH 18/28] add matchmaking configuration (#72)
+Subject: [PATCH 18/29] add matchmaking configuration (#72)
 
 * add matchmaking configuration
 * add matchmaking rule set
diff --git a/upstream-patches/0019-fix-Adding-back-in-removeAddons.patch b/upstream-patches/0019-fix-Adding-back-in-removeAddons.patch
@@ -1,7 +1,7 @@
 From dd11f5457c405abc74a0a0e781492f9f2a0eee04 Mon Sep 17 00:00:00 2001
 From: Richard Shade <richard@pulumi.com>
 Date: Fri, 6 Jan 2023 15:31:22 -0600
-Subject: [PATCH 19/28] fix: Adding back in removeAddons
+Subject: [PATCH 19/29] fix: Adding back in removeAddons
 
 ---
  internal/service/eks/cluster.go | 4 ++++
diff --git a/upstream-patches/0020-Reverts-patches-to-S3BucketLegacy-and-GameLift.patch b/upstream-patches/0020-Reverts-patches-to-S3BucketLegacy-and-GameLift.patch
@@ -1,7 +1,7 @@
 From 4593987f6d6288bebdfa38c447e7a771cd0afb63 Mon Sep 17 00:00:00 2001
 From: Kyle Pitzen <kpitzen@pulumi.com>
 Date: Fri, 27 Jan 2023 09:37:43 -0600
-Subject: [PATCH 20/28] Reverts patches to S3BucketLegacy and GameLift
+Subject: [PATCH 20/29] Reverts patches to S3BucketLegacy and GameLift
 
 Previously, we were pulling along patches which removed a few simplifications
 to waiters in AWS GameLift, and a newer patch which plumbed through context.Context
diff --git a/upstream-patches/0021-Revert-Update-endpointHashIPAddress.patch b/upstream-patches/0021-Revert-Update-endpointHashIPAddress.patch
@@ -1,7 +1,7 @@
 From 4aa915dd508daebd0a87d7c1ee834a6fcdcc63b4 Mon Sep 17 00:00:00 2001
 From: Thomas Kappler <tkappler@pulumi.com>
 Date: Fri, 3 Feb 2023 17:31:18 -0800
-Subject: [PATCH 21/28] Revert "Update endpointHashIPAddress"
+Subject: [PATCH 21/29] Revert "Update endpointHashIPAddress"
 
 This reverts commit 2197a6c2c7a0ff306cec3432acb9f5680866f034.
 
diff --git a/upstream-patches/0022-Fixup-eks-formatting.patch b/upstream-patches/0022-Fixup-eks-formatting.patch
@@ -1,7 +1,7 @@
 From cf22aebd3b395e24a0dadbbcb735bc93c77ede32 Mon Sep 17 00:00:00 2001
 From: Daniel Bradley <daniel@pulumi.com>
 Date: Thu, 9 Mar 2023 14:50:36 +0000
-Subject: [PATCH 22/28] Fixup eks formatting
+Subject: [PATCH 22/29] Fixup eks formatting
 
 ---
  internal/service/eks/wait.go | 6 +++---
diff --git a/upstream-patches/0023-Fixup-gamelift-context.patch b/upstream-patches/0023-Fixup-gamelift-context.patch
@@ -1,7 +1,7 @@
 From c5f22aa4cf708198ab27036ddbf42aa3b1c90131 Mon Sep 17 00:00:00 2001
 From: Daniel Bradley <daniel@pulumi.com>
 Date: Thu, 9 Mar 2023 14:50:51 +0000
-Subject: [PATCH 23/28] Fixup gamelift context
+Subject: [PATCH 23/29] Fixup gamelift context
 
 ---
  internal/service/gamelift/matchmaking_configuration.go | 2 +-
diff --git a/upstream-patches/0024-Change-default-descriptions-to-Managed-by-Pulumi.patch b/upstream-patches/0024-Change-default-descriptions-to-Managed-by-Pulumi.patch
@@ -1,7 +1,7 @@
 From 42e925f4c29a6fd1fa4951db4865c855a5f2b4a9 Mon Sep 17 00:00:00 2001
 From: Daniel Bradley <daniel@pulumi.com>
 Date: Tue, 28 Feb 2023 15:19:24 +0000
-Subject: [PATCH 24/28] Change default descriptions to "Managed by Pulumi"
+Subject: [PATCH 24/29] Change default descriptions to "Managed by Pulumi"
 
 ---
  internal/service/apigateway/api_key.go               | 2 +-
diff --git a/upstream-patches/0025-remove-required-elements-from-schema-and-fix-tests-7.patch b/upstream-patches/0025-remove-required-elements-from-schema-and-fix-tests-7.patch
@@ -1,7 +1,7 @@
 From 31ce3e680fea68d5822d3a2070aae87692f39ce7 Mon Sep 17 00:00:00 2001
 From: Daniel Bradley <daniel.dbphoto@gmail.com>
 Date: Tue, 28 Mar 2023 19:54:00 +0100
-Subject: [PATCH 25/28] remove required elements from schema and fix tests
+Subject: [PATCH 25/29] remove required elements from schema and fix tests
  (#77)
 
 Co-authored-by: Lee Briggs <lee@leebriggs.co.uk>
diff --git a/upstream-patches/0026-Revert-Framework-conversions.patch b/upstream-patches/0026-Revert-Framework-conversions.patch
@@ -1,7 +1,7 @@
 From eb0002b3efd5584c9b5e92855522c5c6472cfdfd Mon Sep 17 00:00:00 2001
 From: Thomas Kappler <tkappler@pulumi.com>
 Date: Tue, 28 Mar 2023 15:09:00 -0700
-Subject: [PATCH 26/28] Revert Framework conversions
+Subject: [PATCH 26/29] Revert Framework conversions
 
 https://github.com/hashicorp/terraform-provider-aws/tree/main/internal/service/cognitoidp
 
diff --git a/upstream-patches/0027-Temp-remove-cognito_identity_pool_roles_attachment-e.patch b/upstream-patches/0027-Temp-remove-cognito_identity_pool_roles_attachment-e.patch
@@ -1,7 +1,7 @@
 From ff487f95c40c5631dc78c65317d08b1a08e9553b Mon Sep 17 00:00:00 2001
 From: Anton Tayanovskyy <anton@pulumi.com>
 Date: Mon, 24 Apr 2023 10:36:36 -0400
-Subject: [PATCH 27/28] Temp remove cognito_identity_pool_roles_attachment
+Subject: [PATCH 27/29] Temp remove cognito_identity_pool_roles_attachment
  example beacuse of flaky translation
 
 ---
diff --git a/upstream-patches/0028-Fix-elbv2-target-group-read.patch b/upstream-patches/0028-Fix-elbv2-target-group-read.patch
@@ -1,7 +1,7 @@
 From 4f6474d2a1e3fae800ac433e367956811951f1e7 Mon Sep 17 00:00:00 2001
 From: Daniel Bradley <daniel@pulumi.com>
 Date: Fri, 12 May 2023 10:55:42 +0100
-Subject: [PATCH 28/28] Fix elbv2 target group read
+Subject: [PATCH 28/29] Fix elbv2 target group read
 
 Workaround for https://github.com/pulumi/pulumi-aws/issues/2517
 Don't return single empty map. Return empty list instead.
diff --git a/upstream-patches/0029-Fix-spurrious-json-diff-for-redrive_policy.patch b/upstream-patches/0029-Fix-spurrious-json-diff-for-redrive_policy.patch
@@ -0,0 +1,39 @@
+From a82c36c5556e2b8de91ba2a82a24bcd6074345be Mon Sep 17 00:00:00 2001
+From: Ramon Quitales <ramon@pulumi.com>
+Date: Thu, 18 May 2023 15:21:33 -0700
+Subject: [PATCH 29/29] Fix spurrious json diff for redrive_policy
+
+We need to normalize the json input to compare agasint the one stored
+in state.
+
+Fix for https://github.com/pulumi/pulumi-aws/issues/2307.
+---
+ internal/service/sqs/queue_redrive_policy.go | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/internal/service/sqs/queue_redrive_policy.go b/internal/service/sqs/queue_redrive_policy.go
+index 9f93ea1090..5b9842dad6 100644
+--- a/internal/service/sqs/queue_redrive_policy.go
++++ b/internal/service/sqs/queue_redrive_policy.go
+@@ -5,6 +5,7 @@ import (
+ 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+ 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/structure"
+ 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
++	"github.com/hashicorp/terraform-provider-aws/internal/verify"
+ )
+ 
+ // @SDKResource("aws_sqs_queue_redrive_policy")
+@@ -28,9 +29,10 @@ func ResourceQueueRedrivePolicy() *schema.Resource {
+ 				ForceNew: true,
+ 			},
+ 			"redrive_policy": {
+-				Type:         schema.TypeString,
+-				Required:     true,
+-				ValidateFunc: validation.StringIsJSON,
++				Type:             schema.TypeString,
++				Required:         true,
++				ValidateFunc:     validation.StringIsJSON,
++				DiffSuppressFunc: verify.SuppressEquivalentJSONDiffs,
+ 				StateFunc: func(v interface{}) string {
+ 					json, _ := structure.NormalizeJsonString(v)
+ 					return json
