From 380ade9c9f39672c91ce4a0dbd1c8080990020b3 Mon Sep 17 00:00:00 2001 From: James Forcier Date: Mon, 11 Nov 2024 16:21:25 -0500 Subject: [PATCH] Fix redrive_allow_policy JSON diff in upstream provider --- ...s-JSON-diff-for-redrive_allow_policy.patch | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 patches/0077-Fix-spurious-JSON-diff-for-redrive_allow_policy.patch diff --git a/patches/0077-Fix-spurious-JSON-diff-for-redrive_allow_policy.patch b/patches/0077-Fix-spurious-JSON-diff-for-redrive_allow_policy.patch new file mode 100644 index 0000000000..fabde2f9f3 --- /dev/null +++ b/patches/0077-Fix-spurious-JSON-diff-for-redrive_allow_policy.patch @@ -0,0 +1,26 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: James Forcier +Date: Mon, 11 Nov 2024 16:12:57 -0500 +Subject: [PATCH] Fix spurious JSON diff for redrive_allow_policy + +This applies the same fix found in #2529 to the RedriveAllowPolicy +resource, which needs the same treatment. + +diff --git a/internal/service/sqs/queue_redrive_allow_policy.go b/internal/service/sqs/queue_redrive_allow_policy.go +index 7e3c390e50..789bb04619 100644 +--- a/internal/service/sqs/queue_redrive_allow_policy.go ++++ b/internal/service/sqs/queue_redrive_allow_policy.go +@@ -32,9 +32,10 @@ func resourceQueueRedriveAllowPolicy() *schema.Resource { + ForceNew: true, + }, + "redrive_allow_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