From 3f74f21b7efbb04cf9524bb9a7253c30066686ac Mon Sep 17 00:00:00 2001 From: Peter Rifel Date: Tue, 13 Feb 2024 18:16:16 -0600 Subject: [PATCH 1/3] Update IAM Policy Principal.Service to stringorset --- pkg/model/iam/iam_builder.go | 6 +++--- pkg/model/iam/iam_builder_test.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/model/iam/iam_builder.go b/pkg/model/iam/iam_builder.go index 8e35ecfa2231e..6fee94d5fdc79 100644 --- a/pkg/model/iam/iam_builder.go +++ b/pkg/model/iam/iam_builder.go @@ -278,12 +278,12 @@ func (s *Statement) MarshalJSON() ([]byte, error) { } type Principal struct { - Federated string `json:",omitempty"` - Service string `json:",omitempty"` + Federated string `json:",omitempty"` + Service *stringorset.StringOrSet `json:",omitempty"` } func (p *Principal) IsEmpty() bool { - return *p == Principal{} + return p.Federated == "" && (p.Service == nil || p.Service.IsEmpty()) } // Equal compares two IAM Statements and returns a bool diff --git a/pkg/model/iam/iam_builder_test.go b/pkg/model/iam/iam_builder_test.go index 567d78d91664f..d7d3b2828542c 100644 --- a/pkg/model/iam/iam_builder_test.go +++ b/pkg/model/iam/iam_builder_test.go @@ -64,7 +64,7 @@ func TestRoundTrip(t *testing.T) { { IAM: &Statement{ Effect: StatementEffectDeny, - Principal: Principal{Service: "service"}, + Principal: Principal{Service: fi.PtrTo(stringorset.Of("service"))}, Condition: map[string]interface{}{ "bar": "baz", }, From 70da572ed825fd1f581d2bf6e435989d3568ea35 Mon Sep 17 00:00:00 2001 From: Peter Rifel Date: Tue, 13 Feb 2024 18:16:54 -0600 Subject: [PATCH 2/3] Use pkg/model/iam for building SQS queue policy --- pkg/model/awsmodel/nodeterminationhandler.go | 43 ++++++++++++-------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/pkg/model/awsmodel/nodeterminationhandler.go b/pkg/model/awsmodel/nodeterminationhandler.go index e78e1544afb0e..319d64bfd32b1 100644 --- a/pkg/model/awsmodel/nodeterminationhandler.go +++ b/pkg/model/awsmodel/nodeterminationhandler.go @@ -18,29 +18,20 @@ package awsmodel import ( "fmt" - "strings" "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/arn" "github.com/aws/aws-sdk-go/service/eventbridge" "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/model" + "k8s.io/kops/pkg/model/iam" + "k8s.io/kops/pkg/util/stringorset" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/awstasks" "k8s.io/kops/upup/pkg/fi/cloudup/awsup" ) const ( - NTHTemplate = `{ - "Version": "2012-10-17", - "Statement": [{ - "Effect": "Allow", - "Principal": { - "Service": ["events.amazonaws.com", "sqs.amazonaws.com"] - }, - "Action": "sqs:SendMessage", - "Resource": "arn:{{ AWS_PARTITION }}:sqs:{{ AWS_REGION }}:{{ ACCOUNT_ID }}:{{ SQS_QUEUE_NAME }}" - }] - }` DefaultMessageRetentionPeriod = 300 ) @@ -123,15 +114,33 @@ func (b *NodeTerminationHandlerBuilder) configureASG(c *fi.CloudupModelBuilderCo func (b *NodeTerminationHandlerBuilder) build(c *fi.CloudupModelBuilderContext) error { queueName := model.QueueNamePrefix(b.ClusterName()) + "-nth" - policy := strings.ReplaceAll(NTHTemplate, "{{ AWS_REGION }}", b.Region) - policy = strings.ReplaceAll(policy, "{{ AWS_PARTITION }}", b.AWSPartition) - policy = strings.ReplaceAll(policy, "{{ ACCOUNT_ID }}", b.AWSAccountID) - policy = strings.ReplaceAll(policy, "{{ SQS_QUEUE_NAME }}", queueName) + + policy := iam.NewPolicy(b.ClusterName(), b.AWSPartition) + arn := arn.ARN{ + Partition: b.AWSPartition, + Service: "sqs", + Region: b.Region, + AccountID: b.AWSAccountID, + Resource: queueName, + } + + policy.Statement = append(policy.Statement, &iam.Statement{ + Effect: iam.StatementEffectAllow, + Principal: iam.Principal{ + Service: fi.PtrTo(stringorset.Of("events.amazonaws.com", "sqs.amazonaws.com")), + }, + Action: stringorset.Of("sqs:SendMessage"), + Resource: stringorset.String(arn.String()), + }) + policyJSON, err := policy.AsJSON() + if err != nil { + return fmt.Errorf("rendering policy as json: %w", err) + } queue := &awstasks.SQS{ Name: aws.String(queueName), Lifecycle: b.Lifecycle, - Policy: fi.NewStringResource(policy), + Policy: fi.NewStringResource(policyJSON), MessageRetentionPeriod: DefaultMessageRetentionPeriod, Tags: b.CloudTags(queueName, false), } From 4edcc95c99bdb1861630b1009a13c168beebc764 Mon Sep 17 00:00:00 2001 From: Peter Rifel Date: Tue, 13 Feb 2024 18:18:28 -0600 Subject: [PATCH 3/3] ./hack/update-expected.sh --- ...e_additionalobjects-example-com-nth_policy | 25 +++++++++++-------- ...s_sqs_queue_minimal-example-com-nth_policy | 25 +++++++++++-------- ...s_sqs_queue_minimal-example-com-nth_policy | 25 +++++++++++-------- ...eue_bastionuserdata-example-com-nth_policy | 25 +++++++++++-------- ...ity-expander-custom-example-com-nth_policy | 25 +++++++++++-------- ...s-priority-expander-example-com-nth_policy | 25 +++++++++++-------- ...s_sqs_queue_complex-example-com-nth_policy | 25 +++++++++++-------- ..._sqs_queue_compress-example-com-nth_policy | 25 +++++++++++-------- ...qs_queue_containerd-example-com-nth_policy | 25 +++++++++++-------- ...qs_queue_containerd-example-com-nth_policy | 25 +++++++++++-------- .../aws_sqs_queue_123-example-com-nth_policy | 25 +++++++++++-------- ..._queue_existing-iam-example-com-nth_policy | 25 +++++++++++-------- ...qs_queue_existingsg-example-com-nth_policy | 25 +++++++++++-------- ...s_sqs_queue_minimal-example-com-nth_policy | 25 +++++++++++-------- ...s_sqs_queue_minimal-example-com-nth_policy | 25 +++++++++++-------- ...qs_queue_externallb-example-com-nth_policy | 25 +++++++++++-------- ...ue_externalpolicies-example-com-nth_policy | 25 +++++++++++-------- .../aws_sqs_queue_ha-example-com-nth_policy | 25 +++++++++++-------- ...s_sqs_queue_minimal-example-com-nth_policy | 25 +++++++++++-------- ...s_sqs_queue_minimal-example-com-nth_policy | 25 +++++++++++-------- ...s_sqs_queue_minimal-example-com-nth_policy | 25 +++++++++++-------- ...s_sqs_queue_minimal-example-com-nth_policy | 25 +++++++++++-------- ...s_sqs_queue_minimal-example-com-nth_policy | 25 +++++++++++-------- ...s_sqs_queue_minimal-example-com-nth_policy | 25 +++++++++++-------- ...s_sqs_queue_minimal-example-com-nth_policy | 25 +++++++++++-------- ...s_queue_many-addons-example-com-nth_policy | 25 +++++++++++-------- ...s_sqs_queue_minimal-example-com-nth_policy | 25 +++++++++++-------- ...s_sqs_queue_minimal-example-com-nth_policy | 25 +++++++++++-------- ...s_sqs_queue_minimal-example-com-nth_policy | 25 +++++++++++-------- ...s_sqs_queue_minimal-example-com-nth_policy | 25 +++++++++++-------- ...s_sqs_queue_minimal-example-com-nth_policy | 25 +++++++++++-------- ...s_sqs_queue_minimal-example-com-nth_policy | 25 +++++++++++-------- ...s_queue_minimal-aws-example-com-nth_policy | 25 +++++++++++-------- ...s_sqs_queue_minimal-example-com-nth_policy | 25 +++++++++++-------- ..._queue_minimal-etcd-example-com-nth_policy | 25 +++++++++++-------- ...s_sqs_queue_minimal-example-com-nth_policy | 25 +++++++++++-------- ..._queue_minimal-ipv6-example-com-nth_policy | 25 +++++++++++-------- ..._queue_minimal-ipv6-example-com-nth_policy | 25 +++++++++++-------- ..._queue_minimal-ipv6-example-com-nth_policy | 25 +++++++++++-------- ..._queue_minimal-ipv6-example-com-nth_policy | 25 +++++++++++-------- ...luster-name-minimal-example-com-nth_policy | 25 +++++++++++-------- ...ue_minimal-warmpool-example-com-nth_policy | 25 +++++++++++-------- ...aws_sqs_queue_minimal-k8s-local-nth_policy | 25 +++++++++++-------- ...aws_sqs_queue_minimal-k8s-local-nth_policy | 25 +++++++++++-------- ...ueue_mixedinstances-example-com-nth_policy | 25 +++++++++++-------- ...ueue_mixedinstances-example-com-nth_policy | 25 +++++++++++-------- ...s_sqs_queue_minimal-example-com-nth_policy | 25 +++++++++++-------- ...e_private-shared-ip-example-com-nth_policy | 25 +++++++++++-------- ...ivate-shared-subnet-example-com-nth_policy | 25 +++++++++++-------- ...queue_privatecalico-example-com-nth_policy | 25 +++++++++++-------- ..._queue_privatecanal-example-com-nth_policy | 25 +++++++++++-------- ...queue_privatecilium-example-com-nth_policy | 25 +++++++++++-------- ...queue_privatecilium-example-com-nth_policy | 25 +++++++++++-------- ...queue_privatecilium-example-com-nth_policy | 25 +++++++++++-------- ...ivateciliumadvanced-example-com-nth_policy | 25 +++++++++++-------- ...s_queue_privatedns1-example-com-nth_policy | 25 +++++++++++-------- ...s_queue_privatedns2-example-com-nth_policy | 25 +++++++++++-------- ...ueue_privateflannel-example-com-nth_policy | 25 +++++++++++-------- ...queue_privatekopeio-example-com-nth_policy | 25 +++++++++++-------- ...s_sqs_queue_minimal-example-com-nth_policy | 25 +++++++++++-------- ..._queue_sharedsubnet-example-com-nth_policy | 25 +++++++++++-------- ...sqs_queue_sharedvpc-example-com-nth_policy | 25 +++++++++++-------- ..._queue_minimal-ipv6-example-com-nth_policy | 25 +++++++++++-------- ...sqs_queue_unmanaged-example-com-nth_policy | 25 +++++++++++-------- ...s_sqs_queue_minimal-example-com-nth_policy | 25 +++++++++++-------- 65 files changed, 975 insertions(+), 650 deletions(-) diff --git a/tests/integration/update_cluster/additionalobjects/data/aws_sqs_queue_additionalobjects-example-com-nth_policy b/tests/integration/update_cluster/additionalobjects/data/aws_sqs_queue_additionalobjects-example-com-nth_policy index 2de8f4603186b..72058f7bb1d9c 100644 --- a/tests/integration/update_cluster/additionalobjects/data/aws_sqs_queue_additionalobjects-example-com-nth_policy +++ b/tests/integration/update_cluster/additionalobjects/data/aws_sqs_queue_additionalobjects-example-com-nth_policy @@ -1,11 +1,16 @@ { - "Version": "2012-10-17", - "Statement": [{ - "Effect": "Allow", - "Principal": { - "Service": ["events.amazonaws.com", "sqs.amazonaws.com"] - }, - "Action": "sqs:SendMessage", - "Resource": "arn:aws-test:sqs:us-test-1:123456789012:additionalobjects-example-com-nth" - }] - } + "Statement": [ + { + "Action": "sqs:SendMessage", + "Effect": "Allow", + "Principal": { + "Service": [ + "events.amazonaws.com", + "sqs.amazonaws.com" + ] + }, + "Resource": "arn:aws-test:sqs:us-test-1:123456789012:additionalobjects-example-com-nth" + } + ], + "Version": "2012-10-17" +} diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_sqs_queue_minimal-example-com-nth_policy b/tests/integration/update_cluster/apiservernodes/data/aws_sqs_queue_minimal-example-com-nth_policy index fece0c117db30..c5b2b25812f36 100644 --- a/tests/integration/update_cluster/apiservernodes/data/aws_sqs_queue_minimal-example-com-nth_policy +++ b/tests/integration/update_cluster/apiservernodes/data/aws_sqs_queue_minimal-example-com-nth_policy @@ -1,11 +1,16 @@ { - "Version": "2012-10-17", - "Statement": [{ - "Effect": "Allow", - "Principal": { - "Service": ["events.amazonaws.com", "sqs.amazonaws.com"] - }, - "Action": "sqs:SendMessage", - "Resource": "arn:aws-test:sqs:us-test-1:123456789012:minimal-example-com-nth" - }] - } + "Statement": [ + { + "Action": "sqs:SendMessage", + "Effect": "Allow", + "Principal": { + "Service": [ + "events.amazonaws.com", + "sqs.amazonaws.com" + ] + }, + "Resource": "arn:aws-test:sqs:us-test-1:123456789012:minimal-example-com-nth" + } + ], + "Version": "2012-10-17" +} diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_sqs_queue_minimal-example-com-nth_policy b/tests/integration/update_cluster/aws-lb-controller/data/aws_sqs_queue_minimal-example-com-nth_policy index fece0c117db30..c5b2b25812f36 100644 --- a/tests/integration/update_cluster/aws-lb-controller/data/aws_sqs_queue_minimal-example-com-nth_policy +++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_sqs_queue_minimal-example-com-nth_policy @@ -1,11 +1,16 @@ { - "Version": "2012-10-17", - "Statement": [{ - "Effect": "Allow", - "Principal": { - "Service": ["events.amazonaws.com", "sqs.amazonaws.com"] - }, - "Action": "sqs:SendMessage", - "Resource": "arn:aws-test:sqs:us-test-1:123456789012:minimal-example-com-nth" - }] - } + "Statement": [ + { + "Action": "sqs:SendMessage", + "Effect": "Allow", + "Principal": { + "Service": [ + "events.amazonaws.com", + "sqs.amazonaws.com" + ] + }, + "Resource": "arn:aws-test:sqs:us-test-1:123456789012:minimal-example-com-nth" + } + ], + "Version": "2012-10-17" +} diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_sqs_queue_bastionuserdata-example-com-nth_policy b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_sqs_queue_bastionuserdata-example-com-nth_policy index 0fbefd51f4782..bbbeae8426e11 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_sqs_queue_bastionuserdata-example-com-nth_policy +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_sqs_queue_bastionuserdata-example-com-nth_policy @@ -1,11 +1,16 @@ { - "Version": "2012-10-17", - "Statement": [{ - "Effect": "Allow", - "Principal": { - "Service": ["events.amazonaws.com", "sqs.amazonaws.com"] - }, - "Action": "sqs:SendMessage", - "Resource": "arn:aws-test:sqs:us-test-1:123456789012:bastionuserdata-example-com-nth" - }] - } + "Statement": [ + { + "Action": "sqs:SendMessage", + "Effect": "Allow", + "Principal": { + "Service": [ + "events.amazonaws.com", + "sqs.amazonaws.com" + ] + }, + "Resource": "arn:aws-test:sqs:us-test-1:123456789012:bastionuserdata-example-com-nth" + } + ], + "Version": "2012-10-17" +} diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_sqs_queue_cas-priority-expander-custom-example-com-nth_policy b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_sqs_queue_cas-priority-expander-custom-example-com-nth_policy index 89226fa3db496..8dd68c6a84055 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_sqs_queue_cas-priority-expander-custom-example-com-nth_policy +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_sqs_queue_cas-priority-expander-custom-example-com-nth_policy @@ -1,11 +1,16 @@ { - "Version": "2012-10-17", - "Statement": [{ - "Effect": "Allow", - "Principal": { - "Service": ["events.amazonaws.com", "sqs.amazonaws.com"] - }, - "Action": "sqs:SendMessage", - "Resource": "arn:aws-test:sqs:us-test-1:123456789012:cas-priority-expander-custom-example-com-nth" - }] - } + "Statement": [ + { + "Action": "sqs:SendMessage", + "Effect": "Allow", + "Principal": { + "Service": [ + "events.amazonaws.com", + "sqs.amazonaws.com" + ] + }, + "Resource": "arn:aws-test:sqs:us-test-1:123456789012:cas-priority-expander-custom-example-com-nth" + } + ], + "Version": "2012-10-17" +} diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_sqs_queue_cas-priority-expander-example-com-nth_policy b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_sqs_queue_cas-priority-expander-example-com-nth_policy index 29533ec6ffea4..f94222edf83a7 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_sqs_queue_cas-priority-expander-example-com-nth_policy +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_sqs_queue_cas-priority-expander-example-com-nth_policy @@ -1,11 +1,16 @@ { - "Version": "2012-10-17", - "Statement": [{ - "Effect": "Allow", - "Principal": { - "Service": ["events.amazonaws.com", "sqs.amazonaws.com"] - }, - "Action": "sqs:SendMessage", - "Resource": "arn:aws-test:sqs:us-test-1:123456789012:cas-priority-expander-example-com-nth" - }] - } + "Statement": [ + { + "Action": "sqs:SendMessage", + "Effect": "Allow", + "Principal": { + "Service": [ + "events.amazonaws.com", + "sqs.amazonaws.com" + ] + }, + "Resource": "arn:aws-test:sqs:us-test-1:123456789012:cas-priority-expander-example-com-nth" + } + ], + "Version": "2012-10-17" +} diff --git a/tests/integration/update_cluster/complex/data/aws_sqs_queue_complex-example-com-nth_policy b/tests/integration/update_cluster/complex/data/aws_sqs_queue_complex-example-com-nth_policy index c0ba35868ece4..6cedea72d24d0 100644 --- a/tests/integration/update_cluster/complex/data/aws_sqs_queue_complex-example-com-nth_policy +++ b/tests/integration/update_cluster/complex/data/aws_sqs_queue_complex-example-com-nth_policy @@ -1,11 +1,16 @@ { - "Version": "2012-10-17", - "Statement": [{ - "Effect": "Allow", - "Principal": { - "Service": ["events.amazonaws.com", "sqs.amazonaws.com"] - }, - "Action": "sqs:SendMessage", - "Resource": "arn:aws-test:sqs:us-test-1:123456789012:complex-example-com-nth" - }] - } + "Statement": [ + { + "Action": "sqs:SendMessage", + "Effect": "Allow", + "Principal": { + "Service": [ + "events.amazonaws.com", + "sqs.amazonaws.com" + ] + }, + "Resource": "arn:aws-test:sqs:us-test-1:123456789012:complex-example-com-nth" + } + ], + "Version": "2012-10-17" +} diff --git a/tests/integration/update_cluster/compress/data/aws_sqs_queue_compress-example-com-nth_policy b/tests/integration/update_cluster/compress/data/aws_sqs_queue_compress-example-com-nth_policy index 257126420c990..e928ec140313f 100644 --- a/tests/integration/update_cluster/compress/data/aws_sqs_queue_compress-example-com-nth_policy +++ b/tests/integration/update_cluster/compress/data/aws_sqs_queue_compress-example-com-nth_policy @@ -1,11 +1,16 @@ { - "Version": "2012-10-17", - "Statement": [{ - "Effect": "Allow", - "Principal": { - "Service": ["events.amazonaws.com", "sqs.amazonaws.com"] - }, - "Action": "sqs:SendMessage", - "Resource": "arn:aws-test:sqs:us-test-1:123456789012:compress-example-com-nth" - }] - } + "Statement": [ + { + "Action": "sqs:SendMessage", + "Effect": "Allow", + "Principal": { + "Service": [ + "events.amazonaws.com", + "sqs.amazonaws.com" + ] + }, + "Resource": "arn:aws-test:sqs:us-test-1:123456789012:compress-example-com-nth" + } + ], + "Version": "2012-10-17" +} diff --git a/tests/integration/update_cluster/containerd-custom/data/aws_sqs_queue_containerd-example-com-nth_policy b/tests/integration/update_cluster/containerd-custom/data/aws_sqs_queue_containerd-example-com-nth_policy index b74fdbcc40129..d728c5358cbe6 100644 --- a/tests/integration/update_cluster/containerd-custom/data/aws_sqs_queue_containerd-example-com-nth_policy +++ b/tests/integration/update_cluster/containerd-custom/data/aws_sqs_queue_containerd-example-com-nth_policy @@ -1,11 +1,16 @@ { - "Version": "2012-10-17", - "Statement": [{ - "Effect": "Allow", - "Principal": { - "Service": ["events.amazonaws.com", "sqs.amazonaws.com"] - }, - "Action": "sqs:SendMessage", - "Resource": "arn:aws-test:sqs:us-test-1:123456789012:containerd-example-com-nth" - }] - } + "Statement": [ + { + "Action": "sqs:SendMessage", + "Effect": "Allow", + "Principal": { + "Service": [ + "events.amazonaws.com", + "sqs.amazonaws.com" + ] + }, + "Resource": "arn:aws-test:sqs:us-test-1:123456789012:containerd-example-com-nth" + } + ], + "Version": "2012-10-17" +} diff --git a/tests/integration/update_cluster/containerd/data/aws_sqs_queue_containerd-example-com-nth_policy b/tests/integration/update_cluster/containerd/data/aws_sqs_queue_containerd-example-com-nth_policy index b74fdbcc40129..d728c5358cbe6 100644 --- a/tests/integration/update_cluster/containerd/data/aws_sqs_queue_containerd-example-com-nth_policy +++ b/tests/integration/update_cluster/containerd/data/aws_sqs_queue_containerd-example-com-nth_policy @@ -1,11 +1,16 @@ { - "Version": "2012-10-17", - "Statement": [{ - "Effect": "Allow", - "Principal": { - "Service": ["events.amazonaws.com", "sqs.amazonaws.com"] - }, - "Action": "sqs:SendMessage", - "Resource": "arn:aws-test:sqs:us-test-1:123456789012:containerd-example-com-nth" - }] - } + "Statement": [ + { + "Action": "sqs:SendMessage", + "Effect": "Allow", + "Principal": { + "Service": [ + "events.amazonaws.com", + "sqs.amazonaws.com" + ] + }, + "Resource": "arn:aws-test:sqs:us-test-1:123456789012:containerd-example-com-nth" + } + ], + "Version": "2012-10-17" +} diff --git a/tests/integration/update_cluster/digit/data/aws_sqs_queue_123-example-com-nth_policy b/tests/integration/update_cluster/digit/data/aws_sqs_queue_123-example-com-nth_policy index 6c22bfb7569cb..8daa864b4a2b6 100644 --- a/tests/integration/update_cluster/digit/data/aws_sqs_queue_123-example-com-nth_policy +++ b/tests/integration/update_cluster/digit/data/aws_sqs_queue_123-example-com-nth_policy @@ -1,11 +1,16 @@ { - "Version": "2012-10-17", - "Statement": [{ - "Effect": "Allow", - "Principal": { - "Service": ["events.amazonaws.com", "sqs.amazonaws.com"] - }, - "Action": "sqs:SendMessage", - "Resource": "arn:aws-test:sqs:us-test-1:123456789012:123-example-com-nth" - }] - } + "Statement": [ + { + "Action": "sqs:SendMessage", + "Effect": "Allow", + "Principal": { + "Service": [ + "events.amazonaws.com", + "sqs.amazonaws.com" + ] + }, + "Resource": "arn:aws-test:sqs:us-test-1:123456789012:123-example-com-nth" + } + ], + "Version": "2012-10-17" +} diff --git a/tests/integration/update_cluster/existing_iam/data/aws_sqs_queue_existing-iam-example-com-nth_policy b/tests/integration/update_cluster/existing_iam/data/aws_sqs_queue_existing-iam-example-com-nth_policy index 4fdefdc1d139f..ea346d3d59e21 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_sqs_queue_existing-iam-example-com-nth_policy +++ b/tests/integration/update_cluster/existing_iam/data/aws_sqs_queue_existing-iam-example-com-nth_policy @@ -1,11 +1,16 @@ { - "Version": "2012-10-17", - "Statement": [{ - "Effect": "Allow", - "Principal": { - "Service": ["events.amazonaws.com", "sqs.amazonaws.com"] - }, - "Action": "sqs:SendMessage", - "Resource": "arn:aws-test:sqs:us-test-1:123456789012:existing-iam-example-com-nth" - }] - } + "Statement": [ + { + "Action": "sqs:SendMessage", + "Effect": "Allow", + "Principal": { + "Service": [ + "events.amazonaws.com", + "sqs.amazonaws.com" + ] + }, + "Resource": "arn:aws-test:sqs:us-test-1:123456789012:existing-iam-example-com-nth" + } + ], + "Version": "2012-10-17" +} diff --git a/tests/integration/update_cluster/existing_sg/data/aws_sqs_queue_existingsg-example-com-nth_policy b/tests/integration/update_cluster/existing_sg/data/aws_sqs_queue_existingsg-example-com-nth_policy index ea22a69349e41..bd94e2ca63ad7 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_sqs_queue_existingsg-example-com-nth_policy +++ b/tests/integration/update_cluster/existing_sg/data/aws_sqs_queue_existingsg-example-com-nth_policy @@ -1,11 +1,16 @@ { - "Version": "2012-10-17", - "Statement": [{ - "Effect": "Allow", - "Principal": { - "Service": ["events.amazonaws.com", "sqs.amazonaws.com"] - }, - "Action": "sqs:SendMessage", - "Resource": "arn:aws-test:sqs:us-test-1:123456789012:existingsg-example-com-nth" - }] - } + "Statement": [ + { + "Action": "sqs:SendMessage", + "Effect": "Allow", + "Principal": { + "Service": [ + "events.amazonaws.com", + "sqs.amazonaws.com" + ] + }, + "Resource": "arn:aws-test:sqs:us-test-1:123456789012:existingsg-example-com-nth" + } + ], + "Version": "2012-10-17" +} diff --git a/tests/integration/update_cluster/external_dns/data/aws_sqs_queue_minimal-example-com-nth_policy b/tests/integration/update_cluster/external_dns/data/aws_sqs_queue_minimal-example-com-nth_policy index fece0c117db30..c5b2b25812f36 100644 --- a/tests/integration/update_cluster/external_dns/data/aws_sqs_queue_minimal-example-com-nth_policy +++ b/tests/integration/update_cluster/external_dns/data/aws_sqs_queue_minimal-example-com-nth_policy @@ -1,11 +1,16 @@ { - "Version": "2012-10-17", - "Statement": [{ - "Effect": "Allow", - "Principal": { - "Service": ["events.amazonaws.com", "sqs.amazonaws.com"] - }, - "Action": "sqs:SendMessage", - "Resource": "arn:aws-test:sqs:us-test-1:123456789012:minimal-example-com-nth" - }] - } + "Statement": [ + { + "Action": "sqs:SendMessage", + "Effect": "Allow", + "Principal": { + "Service": [ + "events.amazonaws.com", + "sqs.amazonaws.com" + ] + }, + "Resource": "arn:aws-test:sqs:us-test-1:123456789012:minimal-example-com-nth" + } + ], + "Version": "2012-10-17" +} diff --git a/tests/integration/update_cluster/external_dns_irsa/data/aws_sqs_queue_minimal-example-com-nth_policy b/tests/integration/update_cluster/external_dns_irsa/data/aws_sqs_queue_minimal-example-com-nth_policy index fece0c117db30..c5b2b25812f36 100644 --- a/tests/integration/update_cluster/external_dns_irsa/data/aws_sqs_queue_minimal-example-com-nth_policy +++ b/tests/integration/update_cluster/external_dns_irsa/data/aws_sqs_queue_minimal-example-com-nth_policy @@ -1,11 +1,16 @@ { - "Version": "2012-10-17", - "Statement": [{ - "Effect": "Allow", - "Principal": { - "Service": ["events.amazonaws.com", "sqs.amazonaws.com"] - }, - "Action": "sqs:SendMessage", - "Resource": "arn:aws-test:sqs:us-test-1:123456789012:minimal-example-com-nth" - }] - } + "Statement": [ + { + "Action": "sqs:SendMessage", + "Effect": "Allow", + "Principal": { + "Service": [ + "events.amazonaws.com", + "sqs.amazonaws.com" + ] + }, + "Resource": "arn:aws-test:sqs:us-test-1:123456789012:minimal-example-com-nth" + } + ], + "Version": "2012-10-17" +} diff --git a/tests/integration/update_cluster/externallb/data/aws_sqs_queue_externallb-example-com-nth_policy b/tests/integration/update_cluster/externallb/data/aws_sqs_queue_externallb-example-com-nth_policy index eb465ba1caf59..7a43c0f229a72 100644 --- a/tests/integration/update_cluster/externallb/data/aws_sqs_queue_externallb-example-com-nth_policy +++ b/tests/integration/update_cluster/externallb/data/aws_sqs_queue_externallb-example-com-nth_policy @@ -1,11 +1,16 @@ { - "Version": "2012-10-17", - "Statement": [{ - "Effect": "Allow", - "Principal": { - "Service": ["events.amazonaws.com", "sqs.amazonaws.com"] - }, - "Action": "sqs:SendMessage", - "Resource": "arn:aws-test:sqs:us-test-1:123456789012:externallb-example-com-nth" - }] - } + "Statement": [ + { + "Action": "sqs:SendMessage", + "Effect": "Allow", + "Principal": { + "Service": [ + "events.amazonaws.com", + "sqs.amazonaws.com" + ] + }, + "Resource": "arn:aws-test:sqs:us-test-1:123456789012:externallb-example-com-nth" + } + ], + "Version": "2012-10-17" +} diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_sqs_queue_externalpolicies-example-com-nth_policy b/tests/integration/update_cluster/externalpolicies/data/aws_sqs_queue_externalpolicies-example-com-nth_policy index 546bc4d25e99b..37b70155098bd 100644 --- a/tests/integration/update_cluster/externalpolicies/data/aws_sqs_queue_externalpolicies-example-com-nth_policy +++ b/tests/integration/update_cluster/externalpolicies/data/aws_sqs_queue_externalpolicies-example-com-nth_policy @@ -1,11 +1,16 @@ { - "Version": "2012-10-17", - "Statement": [{ - "Effect": "Allow", - "Principal": { - "Service": ["events.amazonaws.com", "sqs.amazonaws.com"] - }, - "Action": "sqs:SendMessage", - "Resource": "arn:aws-test:sqs:us-test-1:123456789012:externalpolicies-example-com-nth" - }] - } + "Statement": [ + { + "Action": "sqs:SendMessage", + "Effect": "Allow", + "Principal": { + "Service": [ + "events.amazonaws.com", + "sqs.amazonaws.com" + ] + }, + "Resource": "arn:aws-test:sqs:us-test-1:123456789012:externalpolicies-example-com-nth" + } + ], + "Version": "2012-10-17" +} diff --git a/tests/integration/update_cluster/ha/data/aws_sqs_queue_ha-example-com-nth_policy b/tests/integration/update_cluster/ha/data/aws_sqs_queue_ha-example-com-nth_policy index df34214e1eb7d..50fc3d161dc57 100644 --- a/tests/integration/update_cluster/ha/data/aws_sqs_queue_ha-example-com-nth_policy +++ b/tests/integration/update_cluster/ha/data/aws_sqs_queue_ha-example-com-nth_policy @@ -1,11 +1,16 @@ { - "Version": "2012-10-17", - "Statement": [{ - "Effect": "Allow", - "Principal": { - "Service": ["events.amazonaws.com", "sqs.amazonaws.com"] - }, - "Action": "sqs:SendMessage", - "Resource": "arn:aws-test:sqs:us-test-1:123456789012:ha-example-com-nth" - }] - } + "Statement": [ + { + "Action": "sqs:SendMessage", + "Effect": "Allow", + "Principal": { + "Service": [ + "events.amazonaws.com", + "sqs.amazonaws.com" + ] + }, + "Resource": "arn:aws-test:sqs:us-test-1:123456789012:ha-example-com-nth" + } + ], + "Version": "2012-10-17" +} diff --git a/tests/integration/update_cluster/irsa/data/aws_sqs_queue_minimal-example-com-nth_policy b/tests/integration/update_cluster/irsa/data/aws_sqs_queue_minimal-example-com-nth_policy index fece0c117db30..c5b2b25812f36 100644 --- a/tests/integration/update_cluster/irsa/data/aws_sqs_queue_minimal-example-com-nth_policy +++ b/tests/integration/update_cluster/irsa/data/aws_sqs_queue_minimal-example-com-nth_policy @@ -1,11 +1,16 @@ { - "Version": "2012-10-17", - "Statement": [{ - "Effect": "Allow", - "Principal": { - "Service": ["events.amazonaws.com", "sqs.amazonaws.com"] - }, - "Action": "sqs:SendMessage", - "Resource": "arn:aws-test:sqs:us-test-1:123456789012:minimal-example-com-nth" - }] - } + "Statement": [ + { + "Action": "sqs:SendMessage", + "Effect": "Allow", + "Principal": { + "Service": [ + "events.amazonaws.com", + "sqs.amazonaws.com" + ] + }, + "Resource": "arn:aws-test:sqs:us-test-1:123456789012:minimal-example-com-nth" + } + ], + "Version": "2012-10-17" +} diff --git a/tests/integration/update_cluster/karpenter/data/aws_sqs_queue_minimal-example-com-nth_policy b/tests/integration/update_cluster/karpenter/data/aws_sqs_queue_minimal-example-com-nth_policy index fece0c117db30..c5b2b25812f36 100644 --- a/tests/integration/update_cluster/karpenter/data/aws_sqs_queue_minimal-example-com-nth_policy +++ b/tests/integration/update_cluster/karpenter/data/aws_sqs_queue_minimal-example-com-nth_policy @@ -1,11 +1,16 @@ { - "Version": "2012-10-17", - "Statement": [{ - "Effect": "Allow", - "Principal": { - "Service": ["events.amazonaws.com", "sqs.amazonaws.com"] - }, - "Action": "sqs:SendMessage", - "Resource": "arn:aws-test:sqs:us-test-1:123456789012:minimal-example-com-nth" - }] - } + "Statement": [ + { + "Action": "sqs:SendMessage", + "Effect": "Allow", + "Principal": { + "Service": [ + "events.amazonaws.com", + "sqs.amazonaws.com" + ] + }, + "Resource": "arn:aws-test:sqs:us-test-1:123456789012:minimal-example-com-nth" + } + ], + "Version": "2012-10-17" +} diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_sqs_queue_minimal-example-com-nth_policy b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_sqs_queue_minimal-example-com-nth_policy index fece0c117db30..c5b2b25812f36 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_sqs_queue_minimal-example-com-nth_policy +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_sqs_queue_minimal-example-com-nth_policy @@ -1,11 +1,16 @@ { - "Version": "2012-10-17", - "Statement": [{ - "Effect": "Allow", - "Principal": { - "Service": ["events.amazonaws.com", "sqs.amazonaws.com"] - }, - "Action": "sqs:SendMessage", - "Resource": "arn:aws-test:sqs:us-test-1:123456789012:minimal-example-com-nth" - }] - } + "Statement": [ + { + "Action": "sqs:SendMessage", + "Effect": "Allow", + "Principal": { + "Service": [ + "events.amazonaws.com", + "sqs.amazonaws.com" + ] + }, + "Resource": "arn:aws-test:sqs:us-test-1:123456789012:minimal-example-com-nth" + } + ], + "Version": "2012-10-17" +} diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_sqs_queue_minimal-example-com-nth_policy b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_sqs_queue_minimal-example-com-nth_policy index fece0c117db30..c5b2b25812f36 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_sqs_queue_minimal-example-com-nth_policy +++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_sqs_queue_minimal-example-com-nth_policy @@ -1,11 +1,16 @@ { - "Version": "2012-10-17", - "Statement": [{ - "Effect": "Allow", - "Principal": { - "Service": ["events.amazonaws.com", "sqs.amazonaws.com"] - }, - "Action": "sqs:SendMessage", - "Resource": "arn:aws-test:sqs:us-test-1:123456789012:minimal-example-com-nth" - }] - } + "Statement": [ + { + "Action": "sqs:SendMessage", + "Effect": "Allow", + "Principal": { + "Service": [ + "events.amazonaws.com", + "sqs.amazonaws.com" + ] + }, + "Resource": "arn:aws-test:sqs:us-test-1:123456789012:minimal-example-com-nth" + } + ], + "Version": "2012-10-17" +} diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_sqs_queue_minimal-example-com-nth_policy b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_sqs_queue_minimal-example-com-nth_policy index fece0c117db30..c5b2b25812f36 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_sqs_queue_minimal-example-com-nth_policy +++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_sqs_queue_minimal-example-com-nth_policy @@ -1,11 +1,16 @@ { - "Version": "2012-10-17", - "Statement": [{ - "Effect": "Allow", - "Principal": { - "Service": ["events.amazonaws.com", "sqs.amazonaws.com"] - }, - "Action": "sqs:SendMessage", - "Resource": "arn:aws-test:sqs:us-test-1:123456789012:minimal-example-com-nth" - }] - } + "Statement": [ + { + "Action": "sqs:SendMessage", + "Effect": "Allow", + "Principal": { + "Service": [ + "events.amazonaws.com", + "sqs.amazonaws.com" + ] + }, + "Resource": "arn:aws-test:sqs:us-test-1:123456789012:minimal-example-com-nth" + } + ], + "Version": "2012-10-17" +} diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_sqs_queue_minimal-example-com-nth_policy b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_sqs_queue_minimal-example-com-nth_policy index fece0c117db30..c5b2b25812f36 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_sqs_queue_minimal-example-com-nth_policy +++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_sqs_queue_minimal-example-com-nth_policy @@ -1,11 +1,16 @@ { - "Version": "2012-10-17", - "Statement": [{ - "Effect": "Allow", - "Principal": { - "Service": ["events.amazonaws.com", "sqs.amazonaws.com"] - }, - "Action": "sqs:SendMessage", - "Resource": "arn:aws-test:sqs:us-test-1:123456789012:minimal-example-com-nth" - }] - } + "Statement": [ + { + "Action": "sqs:SendMessage", + "Effect": "Allow", + "Principal": { + "Service": [ + "events.amazonaws.com", + "sqs.amazonaws.com" + ] + }, + "Resource": "arn:aws-test:sqs:us-test-1:123456789012:minimal-example-com-nth" + } + ], + "Version": "2012-10-17" +} diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_sqs_queue_minimal-example-com-nth_policy b/tests/integration/update_cluster/many-addons-ccm/data/aws_sqs_queue_minimal-example-com-nth_policy index fece0c117db30..c5b2b25812f36 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_sqs_queue_minimal-example-com-nth_policy +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_sqs_queue_minimal-example-com-nth_policy @@ -1,11 +1,16 @@ { - "Version": "2012-10-17", - "Statement": [{ - "Effect": "Allow", - "Principal": { - "Service": ["events.amazonaws.com", "sqs.amazonaws.com"] - }, - "Action": "sqs:SendMessage", - "Resource": "arn:aws-test:sqs:us-test-1:123456789012:minimal-example-com-nth" - }] - } + "Statement": [ + { + "Action": "sqs:SendMessage", + "Effect": "Allow", + "Principal": { + "Service": [ + "events.amazonaws.com", + "sqs.amazonaws.com" + ] + }, + "Resource": "arn:aws-test:sqs:us-test-1:123456789012:minimal-example-com-nth" + } + ], + "Version": "2012-10-17" +} diff --git a/tests/integration/update_cluster/many-addons/data/aws_sqs_queue_many-addons-example-com-nth_policy b/tests/integration/update_cluster/many-addons/data/aws_sqs_queue_many-addons-example-com-nth_policy index 855805c712416..3e2b2915bf4af 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_sqs_queue_many-addons-example-com-nth_policy +++ b/tests/integration/update_cluster/many-addons/data/aws_sqs_queue_many-addons-example-com-nth_policy @@ -1,11 +1,16 @@ { - "Version": "2012-10-17", - "Statement": [{ - "Effect": "Allow", - "Principal": { - "Service": ["events.amazonaws.com", "sqs.amazonaws.com"] - }, - "Action": "sqs:SendMessage", - "Resource": "arn:aws-test:sqs:us-test-1:123456789012:many-addons-example-com-nth" - }] - } + "Statement": [ + { + "Action": "sqs:SendMessage", + "Effect": "Allow", + "Principal": { + "Service": [ + "events.amazonaws.com", + "sqs.amazonaws.com" + ] + }, + "Resource": "arn:aws-test:sqs:us-test-1:123456789012:many-addons-example-com-nth" + } + ], + "Version": "2012-10-17" +} diff --git a/tests/integration/update_cluster/minimal-1.24/data/aws_sqs_queue_minimal-example-com-nth_policy b/tests/integration/update_cluster/minimal-1.24/data/aws_sqs_queue_minimal-example-com-nth_policy index fece0c117db30..c5b2b25812f36 100644 --- a/tests/integration/update_cluster/minimal-1.24/data/aws_sqs_queue_minimal-example-com-nth_policy +++ b/tests/integration/update_cluster/minimal-1.24/data/aws_sqs_queue_minimal-example-com-nth_policy @@ -1,11 +1,16 @@ { - "Version": "2012-10-17", - "Statement": [{ - "Effect": "Allow", - "Principal": { - "Service": ["events.amazonaws.com", "sqs.amazonaws.com"] - }, - "Action": "sqs:SendMessage", - "Resource": "arn:aws-test:sqs:us-test-1:123456789012:minimal-example-com-nth" - }] - } + "Statement": [ + { + "Action": "sqs:SendMessage", + "Effect": "Allow", + "Principal": { + "Service": [ + "events.amazonaws.com", + "sqs.amazonaws.com" + ] + }, + "Resource": "arn:aws-test:sqs:us-test-1:123456789012:minimal-example-com-nth" + } + ], + "Version": "2012-10-17" +} diff --git a/tests/integration/update_cluster/minimal-1.25/data/aws_sqs_queue_minimal-example-com-nth_policy b/tests/integration/update_cluster/minimal-1.25/data/aws_sqs_queue_minimal-example-com-nth_policy index fece0c117db30..c5b2b25812f36 100644 --- a/tests/integration/update_cluster/minimal-1.25/data/aws_sqs_queue_minimal-example-com-nth_policy +++ b/tests/integration/update_cluster/minimal-1.25/data/aws_sqs_queue_minimal-example-com-nth_policy @@ -1,11 +1,16 @@ { - "Version": "2012-10-17", - "Statement": [{ - "Effect": "Allow", - "Principal": { - "Service": ["events.amazonaws.com", "sqs.amazonaws.com"] - }, - "Action": "sqs:SendMessage", - "Resource": "arn:aws-test:sqs:us-test-1:123456789012:minimal-example-com-nth" - }] - } + "Statement": [ + { + "Action": "sqs:SendMessage", + "Effect": "Allow", + "Principal": { + "Service": [ + "events.amazonaws.com", + "sqs.amazonaws.com" + ] + }, + "Resource": "arn:aws-test:sqs:us-test-1:123456789012:minimal-example-com-nth" + } + ], + "Version": "2012-10-17" +} diff --git a/tests/integration/update_cluster/minimal-1.26/data/aws_sqs_queue_minimal-example-com-nth_policy b/tests/integration/update_cluster/minimal-1.26/data/aws_sqs_queue_minimal-example-com-nth_policy index fece0c117db30..c5b2b25812f36 100644 --- a/tests/integration/update_cluster/minimal-1.26/data/aws_sqs_queue_minimal-example-com-nth_policy +++ b/tests/integration/update_cluster/minimal-1.26/data/aws_sqs_queue_minimal-example-com-nth_policy @@ -1,11 +1,16 @@ { - "Version": "2012-10-17", - "Statement": [{ - "Effect": "Allow", - "Principal": { - "Service": ["events.amazonaws.com", "sqs.amazonaws.com"] - }, - "Action": "sqs:SendMessage", - "Resource": "arn:aws-test:sqs:us-test-1:123456789012:minimal-example-com-nth" - }] - } + "Statement": [ + { + "Action": "sqs:SendMessage", + "Effect": "Allow", + "Principal": { + "Service": [ + "events.amazonaws.com", + "sqs.amazonaws.com" + ] + }, + "Resource": "arn:aws-test:sqs:us-test-1:123456789012:minimal-example-com-nth" + } + ], + "Version": "2012-10-17" +} diff --git a/tests/integration/update_cluster/minimal-1.27/data/aws_sqs_queue_minimal-example-com-nth_policy b/tests/integration/update_cluster/minimal-1.27/data/aws_sqs_queue_minimal-example-com-nth_policy index fece0c117db30..c5b2b25812f36 100644 --- a/tests/integration/update_cluster/minimal-1.27/data/aws_sqs_queue_minimal-example-com-nth_policy +++ b/tests/integration/update_cluster/minimal-1.27/data/aws_sqs_queue_minimal-example-com-nth_policy @@ -1,11 +1,16 @@ { - "Version": "2012-10-17", - "Statement": [{ - "Effect": "Allow", - "Principal": { - "Service": ["events.amazonaws.com", "sqs.amazonaws.com"] - }, - "Action": "sqs:SendMessage", - "Resource": "arn:aws-test:sqs:us-test-1:123456789012:minimal-example-com-nth" - }] - } + "Statement": [ + { + "Action": "sqs:SendMessage", + "Effect": "Allow", + "Principal": { + "Service": [ + "events.amazonaws.com", + "sqs.amazonaws.com" + ] + }, + "Resource": "arn:aws-test:sqs:us-test-1:123456789012:minimal-example-com-nth" + } + ], + "Version": "2012-10-17" +} diff --git a/tests/integration/update_cluster/minimal-1.28/data/aws_sqs_queue_minimal-example-com-nth_policy b/tests/integration/update_cluster/minimal-1.28/data/aws_sqs_queue_minimal-example-com-nth_policy index fece0c117db30..c5b2b25812f36 100644 --- a/tests/integration/update_cluster/minimal-1.28/data/aws_sqs_queue_minimal-example-com-nth_policy +++ b/tests/integration/update_cluster/minimal-1.28/data/aws_sqs_queue_minimal-example-com-nth_policy @@ -1,11 +1,16 @@ { - "Version": "2012-10-17", - "Statement": [{ - "Effect": "Allow", - "Principal": { - "Service": ["events.amazonaws.com", "sqs.amazonaws.com"] - }, - "Action": "sqs:SendMessage", - "Resource": "arn:aws-test:sqs:us-test-1:123456789012:minimal-example-com-nth" - }] - } + "Statement": [ + { + "Action": "sqs:SendMessage", + "Effect": "Allow", + "Principal": { + "Service": [ + "events.amazonaws.com", + "sqs.amazonaws.com" + ] + }, + "Resource": "arn:aws-test:sqs:us-test-1:123456789012:minimal-example-com-nth" + } + ], + "Version": "2012-10-17" +} diff --git a/tests/integration/update_cluster/minimal-1.29/data/aws_sqs_queue_minimal-example-com-nth_policy b/tests/integration/update_cluster/minimal-1.29/data/aws_sqs_queue_minimal-example-com-nth_policy index fece0c117db30..c5b2b25812f36 100644 --- a/tests/integration/update_cluster/minimal-1.29/data/aws_sqs_queue_minimal-example-com-nth_policy +++ b/tests/integration/update_cluster/minimal-1.29/data/aws_sqs_queue_minimal-example-com-nth_policy @@ -1,11 +1,16 @@ { - "Version": "2012-10-17", - "Statement": [{ - "Effect": "Allow", - "Principal": { - "Service": ["events.amazonaws.com", "sqs.amazonaws.com"] - }, - "Action": "sqs:SendMessage", - "Resource": "arn:aws-test:sqs:us-test-1:123456789012:minimal-example-com-nth" - }] - } + "Statement": [ + { + "Action": "sqs:SendMessage", + "Effect": "Allow", + "Principal": { + "Service": [ + "events.amazonaws.com", + "sqs.amazonaws.com" + ] + }, + "Resource": "arn:aws-test:sqs:us-test-1:123456789012:minimal-example-com-nth" + } + ], + "Version": "2012-10-17" +} diff --git a/tests/integration/update_cluster/minimal-aws/data/aws_sqs_queue_minimal-aws-example-com-nth_policy b/tests/integration/update_cluster/minimal-aws/data/aws_sqs_queue_minimal-aws-example-com-nth_policy index cd719f8953e71..43d70fe0b03b1 100644 --- a/tests/integration/update_cluster/minimal-aws/data/aws_sqs_queue_minimal-aws-example-com-nth_policy +++ b/tests/integration/update_cluster/minimal-aws/data/aws_sqs_queue_minimal-aws-example-com-nth_policy @@ -1,11 +1,16 @@ { - "Version": "2012-10-17", - "Statement": [{ - "Effect": "Allow", - "Principal": { - "Service": ["events.amazonaws.com", "sqs.amazonaws.com"] - }, - "Action": "sqs:SendMessage", - "Resource": "arn:aws-test:sqs:us-test-1:123456789012:minimal-aws-example-com-nth" - }] - } + "Statement": [ + { + "Action": "sqs:SendMessage", + "Effect": "Allow", + "Principal": { + "Service": [ + "events.amazonaws.com", + "sqs.amazonaws.com" + ] + }, + "Resource": "arn:aws-test:sqs:us-test-1:123456789012:minimal-aws-example-com-nth" + } + ], + "Version": "2012-10-17" +} diff --git a/tests/integration/update_cluster/minimal-dns-none/data/aws_sqs_queue_minimal-example-com-nth_policy b/tests/integration/update_cluster/minimal-dns-none/data/aws_sqs_queue_minimal-example-com-nth_policy index fece0c117db30..c5b2b25812f36 100644 --- a/tests/integration/update_cluster/minimal-dns-none/data/aws_sqs_queue_minimal-example-com-nth_policy +++ b/tests/integration/update_cluster/minimal-dns-none/data/aws_sqs_queue_minimal-example-com-nth_policy @@ -1,11 +1,16 @@ { - "Version": "2012-10-17", - "Statement": [{ - "Effect": "Allow", - "Principal": { - "Service": ["events.amazonaws.com", "sqs.amazonaws.com"] - }, - "Action": "sqs:SendMessage", - "Resource": "arn:aws-test:sqs:us-test-1:123456789012:minimal-example-com-nth" - }] - } + "Statement": [ + { + "Action": "sqs:SendMessage", + "Effect": "Allow", + "Principal": { + "Service": [ + "events.amazonaws.com", + "sqs.amazonaws.com" + ] + }, + "Resource": "arn:aws-test:sqs:us-test-1:123456789012:minimal-example-com-nth" + } + ], + "Version": "2012-10-17" +} diff --git a/tests/integration/update_cluster/minimal-etcd/data/aws_sqs_queue_minimal-etcd-example-com-nth_policy b/tests/integration/update_cluster/minimal-etcd/data/aws_sqs_queue_minimal-etcd-example-com-nth_policy index be6574bcc74fb..28c1769b2f666 100644 --- a/tests/integration/update_cluster/minimal-etcd/data/aws_sqs_queue_minimal-etcd-example-com-nth_policy +++ b/tests/integration/update_cluster/minimal-etcd/data/aws_sqs_queue_minimal-etcd-example-com-nth_policy @@ -1,11 +1,16 @@ { - "Version": "2012-10-17", - "Statement": [{ - "Effect": "Allow", - "Principal": { - "Service": ["events.amazonaws.com", "sqs.amazonaws.com"] - }, - "Action": "sqs:SendMessage", - "Resource": "arn:aws-test:sqs:us-test-1:123456789012:minimal-etcd-example-com-nth" - }] - } + "Statement": [ + { + "Action": "sqs:SendMessage", + "Effect": "Allow", + "Principal": { + "Service": [ + "events.amazonaws.com", + "sqs.amazonaws.com" + ] + }, + "Resource": "arn:aws-test:sqs:us-test-1:123456789012:minimal-etcd-example-com-nth" + } + ], + "Version": "2012-10-17" +} diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_sqs_queue_minimal-example-com-nth_policy b/tests/integration/update_cluster/minimal-gp3/data/aws_sqs_queue_minimal-example-com-nth_policy index fece0c117db30..c5b2b25812f36 100644 --- a/tests/integration/update_cluster/minimal-gp3/data/aws_sqs_queue_minimal-example-com-nth_policy +++ b/tests/integration/update_cluster/minimal-gp3/data/aws_sqs_queue_minimal-example-com-nth_policy @@ -1,11 +1,16 @@ { - "Version": "2012-10-17", - "Statement": [{ - "Effect": "Allow", - "Principal": { - "Service": ["events.amazonaws.com", "sqs.amazonaws.com"] - }, - "Action": "sqs:SendMessage", - "Resource": "arn:aws-test:sqs:us-test-1:123456789012:minimal-example-com-nth" - }] - } + "Statement": [ + { + "Action": "sqs:SendMessage", + "Effect": "Allow", + "Principal": { + "Service": [ + "events.amazonaws.com", + "sqs.amazonaws.com" + ] + }, + "Resource": "arn:aws-test:sqs:us-test-1:123456789012:minimal-example-com-nth" + } + ], + "Version": "2012-10-17" +} diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_sqs_queue_minimal-ipv6-example-com-nth_policy b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_sqs_queue_minimal-ipv6-example-com-nth_policy index fde6878c6193d..79e46eb4932b9 100644 --- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_sqs_queue_minimal-ipv6-example-com-nth_policy +++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_sqs_queue_minimal-ipv6-example-com-nth_policy @@ -1,11 +1,16 @@ { - "Version": "2012-10-17", - "Statement": [{ - "Effect": "Allow", - "Principal": { - "Service": ["events.amazonaws.com", "sqs.amazonaws.com"] - }, - "Action": "sqs:SendMessage", - "Resource": "arn:aws-test:sqs:us-test-1:123456789012:minimal-ipv6-example-com-nth" - }] - } + "Statement": [ + { + "Action": "sqs:SendMessage", + "Effect": "Allow", + "Principal": { + "Service": [ + "events.amazonaws.com", + "sqs.amazonaws.com" + ] + }, + "Resource": "arn:aws-test:sqs:us-test-1:123456789012:minimal-ipv6-example-com-nth" + } + ], + "Version": "2012-10-17" +} diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_sqs_queue_minimal-ipv6-example-com-nth_policy b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_sqs_queue_minimal-ipv6-example-com-nth_policy index fde6878c6193d..79e46eb4932b9 100644 --- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_sqs_queue_minimal-ipv6-example-com-nth_policy +++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_sqs_queue_minimal-ipv6-example-com-nth_policy @@ -1,11 +1,16 @@ { - "Version": "2012-10-17", - "Statement": [{ - "Effect": "Allow", - "Principal": { - "Service": ["events.amazonaws.com", "sqs.amazonaws.com"] - }, - "Action": "sqs:SendMessage", - "Resource": "arn:aws-test:sqs:us-test-1:123456789012:minimal-ipv6-example-com-nth" - }] - } + "Statement": [ + { + "Action": "sqs:SendMessage", + "Effect": "Allow", + "Principal": { + "Service": [ + "events.amazonaws.com", + "sqs.amazonaws.com" + ] + }, + "Resource": "arn:aws-test:sqs:us-test-1:123456789012:minimal-ipv6-example-com-nth" + } + ], + "Version": "2012-10-17" +} diff --git a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_sqs_queue_minimal-ipv6-example-com-nth_policy b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_sqs_queue_minimal-ipv6-example-com-nth_policy index fde6878c6193d..79e46eb4932b9 100644 --- a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_sqs_queue_minimal-ipv6-example-com-nth_policy +++ b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_sqs_queue_minimal-ipv6-example-com-nth_policy @@ -1,11 +1,16 @@ { - "Version": "2012-10-17", - "Statement": [{ - "Effect": "Allow", - "Principal": { - "Service": ["events.amazonaws.com", "sqs.amazonaws.com"] - }, - "Action": "sqs:SendMessage", - "Resource": "arn:aws-test:sqs:us-test-1:123456789012:minimal-ipv6-example-com-nth" - }] - } + "Statement": [ + { + "Action": "sqs:SendMessage", + "Effect": "Allow", + "Principal": { + "Service": [ + "events.amazonaws.com", + "sqs.amazonaws.com" + ] + }, + "Resource": "arn:aws-test:sqs:us-test-1:123456789012:minimal-ipv6-example-com-nth" + } + ], + "Version": "2012-10-17" +} diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_sqs_queue_minimal-ipv6-example-com-nth_policy b/tests/integration/update_cluster/minimal-ipv6/data/aws_sqs_queue_minimal-ipv6-example-com-nth_policy index fde6878c6193d..79e46eb4932b9 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_sqs_queue_minimal-ipv6-example-com-nth_policy +++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_sqs_queue_minimal-ipv6-example-com-nth_policy @@ -1,11 +1,16 @@ { - "Version": "2012-10-17", - "Statement": [{ - "Effect": "Allow", - "Principal": { - "Service": ["events.amazonaws.com", "sqs.amazonaws.com"] - }, - "Action": "sqs:SendMessage", - "Resource": "arn:aws-test:sqs:us-test-1:123456789012:minimal-ipv6-example-com-nth" - }] - } + "Statement": [ + { + "Action": "sqs:SendMessage", + "Effect": "Allow", + "Principal": { + "Service": [ + "events.amazonaws.com", + "sqs.amazonaws.com" + ] + }, + "Resource": "arn:aws-test:sqs:us-test-1:123456789012:minimal-ipv6-example-com-nth" + } + ], + "Version": "2012-10-17" +} diff --git a/tests/integration/update_cluster/minimal-longclustername/data/aws_sqs_queue_this-is-truly-a-really-really-long-cluster-name-minimal-example-com-nth_policy b/tests/integration/update_cluster/minimal-longclustername/data/aws_sqs_queue_this-is-truly-a-really-really-long-cluster-name-minimal-example-com-nth_policy index 2070c975786fa..db3fdf72f2236 100644 --- a/tests/integration/update_cluster/minimal-longclustername/data/aws_sqs_queue_this-is-truly-a-really-really-long-cluster-name-minimal-example-com-nth_policy +++ b/tests/integration/update_cluster/minimal-longclustername/data/aws_sqs_queue_this-is-truly-a-really-really-long-cluster-name-minimal-example-com-nth_policy @@ -1,11 +1,16 @@ { - "Version": "2012-10-17", - "Statement": [{ - "Effect": "Allow", - "Principal": { - "Service": ["events.amazonaws.com", "sqs.amazonaws.com"] - }, - "Action": "sqs:SendMessage", - "Resource": "arn:aws-test:sqs:us-test-1:123456789012:this-is-truly-a-really-really-long-cluster-name-minimal-example-com-nth" - }] - } + "Statement": [ + { + "Action": "sqs:SendMessage", + "Effect": "Allow", + "Principal": { + "Service": [ + "events.amazonaws.com", + "sqs.amazonaws.com" + ] + }, + "Resource": "arn:aws-test:sqs:us-test-1:123456789012:this-is-truly-a-really-really-long-cluster-name-minimal-example-com-nth" + } + ], + "Version": "2012-10-17" +} diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_sqs_queue_minimal-warmpool-example-com-nth_policy b/tests/integration/update_cluster/minimal-warmpool/data/aws_sqs_queue_minimal-warmpool-example-com-nth_policy index f5a311bd03c39..5073196e042cd 100644 --- a/tests/integration/update_cluster/minimal-warmpool/data/aws_sqs_queue_minimal-warmpool-example-com-nth_policy +++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_sqs_queue_minimal-warmpool-example-com-nth_policy @@ -1,11 +1,16 @@ { - "Version": "2012-10-17", - "Statement": [{ - "Effect": "Allow", - "Principal": { - "Service": ["events.amazonaws.com", "sqs.amazonaws.com"] - }, - "Action": "sqs:SendMessage", - "Resource": "arn:aws-test:sqs:us-test-1:123456789012:minimal-warmpool-example-com-nth" - }] - } + "Statement": [ + { + "Action": "sqs:SendMessage", + "Effect": "Allow", + "Principal": { + "Service": [ + "events.amazonaws.com", + "sqs.amazonaws.com" + ] + }, + "Resource": "arn:aws-test:sqs:us-test-1:123456789012:minimal-warmpool-example-com-nth" + } + ], + "Version": "2012-10-17" +} diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_sqs_queue_minimal-k8s-local-nth_policy b/tests/integration/update_cluster/minimal_gossip/data/aws_sqs_queue_minimal-k8s-local-nth_policy index b4001ce3a6bc2..ec06255343cfa 100644 --- a/tests/integration/update_cluster/minimal_gossip/data/aws_sqs_queue_minimal-k8s-local-nth_policy +++ b/tests/integration/update_cluster/minimal_gossip/data/aws_sqs_queue_minimal-k8s-local-nth_policy @@ -1,11 +1,16 @@ { - "Version": "2012-10-17", - "Statement": [{ - "Effect": "Allow", - "Principal": { - "Service": ["events.amazonaws.com", "sqs.amazonaws.com"] - }, - "Action": "sqs:SendMessage", - "Resource": "arn:aws-test:sqs:us-test-1:123456789012:minimal-k8s-local-nth" - }] - } + "Statement": [ + { + "Action": "sqs:SendMessage", + "Effect": "Allow", + "Principal": { + "Service": [ + "events.amazonaws.com", + "sqs.amazonaws.com" + ] + }, + "Resource": "arn:aws-test:sqs:us-test-1:123456789012:minimal-k8s-local-nth" + } + ], + "Version": "2012-10-17" +} diff --git a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_sqs_queue_minimal-k8s-local-nth_policy b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_sqs_queue_minimal-k8s-local-nth_policy index b4001ce3a6bc2..ec06255343cfa 100644 --- a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_sqs_queue_minimal-k8s-local-nth_policy +++ b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_sqs_queue_minimal-k8s-local-nth_policy @@ -1,11 +1,16 @@ { - "Version": "2012-10-17", - "Statement": [{ - "Effect": "Allow", - "Principal": { - "Service": ["events.amazonaws.com", "sqs.amazonaws.com"] - }, - "Action": "sqs:SendMessage", - "Resource": "arn:aws-test:sqs:us-test-1:123456789012:minimal-k8s-local-nth" - }] - } + "Statement": [ + { + "Action": "sqs:SendMessage", + "Effect": "Allow", + "Principal": { + "Service": [ + "events.amazonaws.com", + "sqs.amazonaws.com" + ] + }, + "Resource": "arn:aws-test:sqs:us-test-1:123456789012:minimal-k8s-local-nth" + } + ], + "Version": "2012-10-17" +} diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_sqs_queue_mixedinstances-example-com-nth_policy b/tests/integration/update_cluster/mixed_instances/data/aws_sqs_queue_mixedinstances-example-com-nth_policy index 98cf4d671fcd3..9b4edbb15fb0c 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_sqs_queue_mixedinstances-example-com-nth_policy +++ b/tests/integration/update_cluster/mixed_instances/data/aws_sqs_queue_mixedinstances-example-com-nth_policy @@ -1,11 +1,16 @@ { - "Version": "2012-10-17", - "Statement": [{ - "Effect": "Allow", - "Principal": { - "Service": ["events.amazonaws.com", "sqs.amazonaws.com"] - }, - "Action": "sqs:SendMessage", - "Resource": "arn:aws-test:sqs:us-test-1:123456789012:mixedinstances-example-com-nth" - }] - } + "Statement": [ + { + "Action": "sqs:SendMessage", + "Effect": "Allow", + "Principal": { + "Service": [ + "events.amazonaws.com", + "sqs.amazonaws.com" + ] + }, + "Resource": "arn:aws-test:sqs:us-test-1:123456789012:mixedinstances-example-com-nth" + } + ], + "Version": "2012-10-17" +} diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_sqs_queue_mixedinstances-example-com-nth_policy b/tests/integration/update_cluster/mixed_instances_spot/data/aws_sqs_queue_mixedinstances-example-com-nth_policy index 98cf4d671fcd3..9b4edbb15fb0c 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_sqs_queue_mixedinstances-example-com-nth_policy +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_sqs_queue_mixedinstances-example-com-nth_policy @@ -1,11 +1,16 @@ { - "Version": "2012-10-17", - "Statement": [{ - "Effect": "Allow", - "Principal": { - "Service": ["events.amazonaws.com", "sqs.amazonaws.com"] - }, - "Action": "sqs:SendMessage", - "Resource": "arn:aws-test:sqs:us-test-1:123456789012:mixedinstances-example-com-nth" - }] - } + "Statement": [ + { + "Action": "sqs:SendMessage", + "Effect": "Allow", + "Principal": { + "Service": [ + "events.amazonaws.com", + "sqs.amazonaws.com" + ] + }, + "Resource": "arn:aws-test:sqs:us-test-1:123456789012:mixedinstances-example-com-nth" + } + ], + "Version": "2012-10-17" +} diff --git a/tests/integration/update_cluster/nvidia/data/aws_sqs_queue_minimal-example-com-nth_policy b/tests/integration/update_cluster/nvidia/data/aws_sqs_queue_minimal-example-com-nth_policy index fece0c117db30..c5b2b25812f36 100644 --- a/tests/integration/update_cluster/nvidia/data/aws_sqs_queue_minimal-example-com-nth_policy +++ b/tests/integration/update_cluster/nvidia/data/aws_sqs_queue_minimal-example-com-nth_policy @@ -1,11 +1,16 @@ { - "Version": "2012-10-17", - "Statement": [{ - "Effect": "Allow", - "Principal": { - "Service": ["events.amazonaws.com", "sqs.amazonaws.com"] - }, - "Action": "sqs:SendMessage", - "Resource": "arn:aws-test:sqs:us-test-1:123456789012:minimal-example-com-nth" - }] - } + "Statement": [ + { + "Action": "sqs:SendMessage", + "Effect": "Allow", + "Principal": { + "Service": [ + "events.amazonaws.com", + "sqs.amazonaws.com" + ] + }, + "Resource": "arn:aws-test:sqs:us-test-1:123456789012:minimal-example-com-nth" + } + ], + "Version": "2012-10-17" +} diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_sqs_queue_private-shared-ip-example-com-nth_policy b/tests/integration/update_cluster/private-shared-ip/data/aws_sqs_queue_private-shared-ip-example-com-nth_policy index 88e0976f23817..f52e61203f8f0 100644 --- a/tests/integration/update_cluster/private-shared-ip/data/aws_sqs_queue_private-shared-ip-example-com-nth_policy +++ b/tests/integration/update_cluster/private-shared-ip/data/aws_sqs_queue_private-shared-ip-example-com-nth_policy @@ -1,11 +1,16 @@ { - "Version": "2012-10-17", - "Statement": [{ - "Effect": "Allow", - "Principal": { - "Service": ["events.amazonaws.com", "sqs.amazonaws.com"] - }, - "Action": "sqs:SendMessage", - "Resource": "arn:aws-test:sqs:us-test-1:123456789012:private-shared-ip-example-com-nth" - }] - } + "Statement": [ + { + "Action": "sqs:SendMessage", + "Effect": "Allow", + "Principal": { + "Service": [ + "events.amazonaws.com", + "sqs.amazonaws.com" + ] + }, + "Resource": "arn:aws-test:sqs:us-test-1:123456789012:private-shared-ip-example-com-nth" + } + ], + "Version": "2012-10-17" +} diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_sqs_queue_private-shared-subnet-example-com-nth_policy b/tests/integration/update_cluster/private-shared-subnet/data/aws_sqs_queue_private-shared-subnet-example-com-nth_policy index 22d48bd0f86a3..f21fd80394142 100644 --- a/tests/integration/update_cluster/private-shared-subnet/data/aws_sqs_queue_private-shared-subnet-example-com-nth_policy +++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_sqs_queue_private-shared-subnet-example-com-nth_policy @@ -1,11 +1,16 @@ { - "Version": "2012-10-17", - "Statement": [{ - "Effect": "Allow", - "Principal": { - "Service": ["events.amazonaws.com", "sqs.amazonaws.com"] - }, - "Action": "sqs:SendMessage", - "Resource": "arn:aws-test:sqs:us-test-1:123456789012:private-shared-subnet-example-com-nth" - }] - } + "Statement": [ + { + "Action": "sqs:SendMessage", + "Effect": "Allow", + "Principal": { + "Service": [ + "events.amazonaws.com", + "sqs.amazonaws.com" + ] + }, + "Resource": "arn:aws-test:sqs:us-test-1:123456789012:private-shared-subnet-example-com-nth" + } + ], + "Version": "2012-10-17" +} diff --git a/tests/integration/update_cluster/privatecalico/data/aws_sqs_queue_privatecalico-example-com-nth_policy b/tests/integration/update_cluster/privatecalico/data/aws_sqs_queue_privatecalico-example-com-nth_policy index c2811a83f7599..7c57e9e5b76ad 100644 --- a/tests/integration/update_cluster/privatecalico/data/aws_sqs_queue_privatecalico-example-com-nth_policy +++ b/tests/integration/update_cluster/privatecalico/data/aws_sqs_queue_privatecalico-example-com-nth_policy @@ -1,11 +1,16 @@ { - "Version": "2012-10-17", - "Statement": [{ - "Effect": "Allow", - "Principal": { - "Service": ["events.amazonaws.com", "sqs.amazonaws.com"] - }, - "Action": "sqs:SendMessage", - "Resource": "arn:aws-test:sqs:us-test-1:123456789012:privatecalico-example-com-nth" - }] - } + "Statement": [ + { + "Action": "sqs:SendMessage", + "Effect": "Allow", + "Principal": { + "Service": [ + "events.amazonaws.com", + "sqs.amazonaws.com" + ] + }, + "Resource": "arn:aws-test:sqs:us-test-1:123456789012:privatecalico-example-com-nth" + } + ], + "Version": "2012-10-17" +} diff --git a/tests/integration/update_cluster/privatecanal/data/aws_sqs_queue_privatecanal-example-com-nth_policy b/tests/integration/update_cluster/privatecanal/data/aws_sqs_queue_privatecanal-example-com-nth_policy index ae5d23b2e3b11..eda203bd8117b 100644 --- a/tests/integration/update_cluster/privatecanal/data/aws_sqs_queue_privatecanal-example-com-nth_policy +++ b/tests/integration/update_cluster/privatecanal/data/aws_sqs_queue_privatecanal-example-com-nth_policy @@ -1,11 +1,16 @@ { - "Version": "2012-10-17", - "Statement": [{ - "Effect": "Allow", - "Principal": { - "Service": ["events.amazonaws.com", "sqs.amazonaws.com"] - }, - "Action": "sqs:SendMessage", - "Resource": "arn:aws-test:sqs:us-test-1:123456789012:privatecanal-example-com-nth" - }] - } + "Statement": [ + { + "Action": "sqs:SendMessage", + "Effect": "Allow", + "Principal": { + "Service": [ + "events.amazonaws.com", + "sqs.amazonaws.com" + ] + }, + "Resource": "arn:aws-test:sqs:us-test-1:123456789012:privatecanal-example-com-nth" + } + ], + "Version": "2012-10-17" +} diff --git a/tests/integration/update_cluster/privatecilium-eni/data/aws_sqs_queue_privatecilium-example-com-nth_policy b/tests/integration/update_cluster/privatecilium-eni/data/aws_sqs_queue_privatecilium-example-com-nth_policy index 4ce1e5518d6d0..fd7fc27935e82 100644 --- a/tests/integration/update_cluster/privatecilium-eni/data/aws_sqs_queue_privatecilium-example-com-nth_policy +++ b/tests/integration/update_cluster/privatecilium-eni/data/aws_sqs_queue_privatecilium-example-com-nth_policy @@ -1,11 +1,16 @@ { - "Version": "2012-10-17", - "Statement": [{ - "Effect": "Allow", - "Principal": { - "Service": ["events.amazonaws.com", "sqs.amazonaws.com"] - }, - "Action": "sqs:SendMessage", - "Resource": "arn:aws-test:sqs:us-test-1:123456789012:privatecilium-example-com-nth" - }] - } + "Statement": [ + { + "Action": "sqs:SendMessage", + "Effect": "Allow", + "Principal": { + "Service": [ + "events.amazonaws.com", + "sqs.amazonaws.com" + ] + }, + "Resource": "arn:aws-test:sqs:us-test-1:123456789012:privatecilium-example-com-nth" + } + ], + "Version": "2012-10-17" +} diff --git a/tests/integration/update_cluster/privatecilium/data/aws_sqs_queue_privatecilium-example-com-nth_policy b/tests/integration/update_cluster/privatecilium/data/aws_sqs_queue_privatecilium-example-com-nth_policy index 4ce1e5518d6d0..fd7fc27935e82 100644 --- a/tests/integration/update_cluster/privatecilium/data/aws_sqs_queue_privatecilium-example-com-nth_policy +++ b/tests/integration/update_cluster/privatecilium/data/aws_sqs_queue_privatecilium-example-com-nth_policy @@ -1,11 +1,16 @@ { - "Version": "2012-10-17", - "Statement": [{ - "Effect": "Allow", - "Principal": { - "Service": ["events.amazonaws.com", "sqs.amazonaws.com"] - }, - "Action": "sqs:SendMessage", - "Resource": "arn:aws-test:sqs:us-test-1:123456789012:privatecilium-example-com-nth" - }] - } + "Statement": [ + { + "Action": "sqs:SendMessage", + "Effect": "Allow", + "Principal": { + "Service": [ + "events.amazonaws.com", + "sqs.amazonaws.com" + ] + }, + "Resource": "arn:aws-test:sqs:us-test-1:123456789012:privatecilium-example-com-nth" + } + ], + "Version": "2012-10-17" +} diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_sqs_queue_privatecilium-example-com-nth_policy b/tests/integration/update_cluster/privatecilium2/data/aws_sqs_queue_privatecilium-example-com-nth_policy index 4ce1e5518d6d0..fd7fc27935e82 100644 --- a/tests/integration/update_cluster/privatecilium2/data/aws_sqs_queue_privatecilium-example-com-nth_policy +++ b/tests/integration/update_cluster/privatecilium2/data/aws_sqs_queue_privatecilium-example-com-nth_policy @@ -1,11 +1,16 @@ { - "Version": "2012-10-17", - "Statement": [{ - "Effect": "Allow", - "Principal": { - "Service": ["events.amazonaws.com", "sqs.amazonaws.com"] - }, - "Action": "sqs:SendMessage", - "Resource": "arn:aws-test:sqs:us-test-1:123456789012:privatecilium-example-com-nth" - }] - } + "Statement": [ + { + "Action": "sqs:SendMessage", + "Effect": "Allow", + "Principal": { + "Service": [ + "events.amazonaws.com", + "sqs.amazonaws.com" + ] + }, + "Resource": "arn:aws-test:sqs:us-test-1:123456789012:privatecilium-example-com-nth" + } + ], + "Version": "2012-10-17" +} diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_sqs_queue_privateciliumadvanced-example-com-nth_policy b/tests/integration/update_cluster/privateciliumadvanced/data/aws_sqs_queue_privateciliumadvanced-example-com-nth_policy index c40beae5736e7..577d955d2afcc 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_sqs_queue_privateciliumadvanced-example-com-nth_policy +++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_sqs_queue_privateciliumadvanced-example-com-nth_policy @@ -1,11 +1,16 @@ { - "Version": "2012-10-17", - "Statement": [{ - "Effect": "Allow", - "Principal": { - "Service": ["events.amazonaws.com", "sqs.amazonaws.com"] - }, - "Action": "sqs:SendMessage", - "Resource": "arn:aws-test:sqs:us-test-1:123456789012:privateciliumadvanced-example-com-nth" - }] - } + "Statement": [ + { + "Action": "sqs:SendMessage", + "Effect": "Allow", + "Principal": { + "Service": [ + "events.amazonaws.com", + "sqs.amazonaws.com" + ] + }, + "Resource": "arn:aws-test:sqs:us-test-1:123456789012:privateciliumadvanced-example-com-nth" + } + ], + "Version": "2012-10-17" +} diff --git a/tests/integration/update_cluster/privatedns1/data/aws_sqs_queue_privatedns1-example-com-nth_policy b/tests/integration/update_cluster/privatedns1/data/aws_sqs_queue_privatedns1-example-com-nth_policy index 0c81eeb5b7793..746474167ea6f 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_sqs_queue_privatedns1-example-com-nth_policy +++ b/tests/integration/update_cluster/privatedns1/data/aws_sqs_queue_privatedns1-example-com-nth_policy @@ -1,11 +1,16 @@ { - "Version": "2012-10-17", - "Statement": [{ - "Effect": "Allow", - "Principal": { - "Service": ["events.amazonaws.com", "sqs.amazonaws.com"] - }, - "Action": "sqs:SendMessage", - "Resource": "arn:aws-test:sqs:us-test-1:123456789012:privatedns1-example-com-nth" - }] - } + "Statement": [ + { + "Action": "sqs:SendMessage", + "Effect": "Allow", + "Principal": { + "Service": [ + "events.amazonaws.com", + "sqs.amazonaws.com" + ] + }, + "Resource": "arn:aws-test:sqs:us-test-1:123456789012:privatedns1-example-com-nth" + } + ], + "Version": "2012-10-17" +} diff --git a/tests/integration/update_cluster/privatedns2/data/aws_sqs_queue_privatedns2-example-com-nth_policy b/tests/integration/update_cluster/privatedns2/data/aws_sqs_queue_privatedns2-example-com-nth_policy index 83292cbc6c835..835c18ea5365a 100644 --- a/tests/integration/update_cluster/privatedns2/data/aws_sqs_queue_privatedns2-example-com-nth_policy +++ b/tests/integration/update_cluster/privatedns2/data/aws_sqs_queue_privatedns2-example-com-nth_policy @@ -1,11 +1,16 @@ { - "Version": "2012-10-17", - "Statement": [{ - "Effect": "Allow", - "Principal": { - "Service": ["events.amazonaws.com", "sqs.amazonaws.com"] - }, - "Action": "sqs:SendMessage", - "Resource": "arn:aws-test:sqs:us-test-1:123456789012:privatedns2-example-com-nth" - }] - } + "Statement": [ + { + "Action": "sqs:SendMessage", + "Effect": "Allow", + "Principal": { + "Service": [ + "events.amazonaws.com", + "sqs.amazonaws.com" + ] + }, + "Resource": "arn:aws-test:sqs:us-test-1:123456789012:privatedns2-example-com-nth" + } + ], + "Version": "2012-10-17" +} diff --git a/tests/integration/update_cluster/privateflannel/data/aws_sqs_queue_privateflannel-example-com-nth_policy b/tests/integration/update_cluster/privateflannel/data/aws_sqs_queue_privateflannel-example-com-nth_policy index fcc916e986bae..e57b8f7c4b7bc 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_sqs_queue_privateflannel-example-com-nth_policy +++ b/tests/integration/update_cluster/privateflannel/data/aws_sqs_queue_privateflannel-example-com-nth_policy @@ -1,11 +1,16 @@ { - "Version": "2012-10-17", - "Statement": [{ - "Effect": "Allow", - "Principal": { - "Service": ["events.amazonaws.com", "sqs.amazonaws.com"] - }, - "Action": "sqs:SendMessage", - "Resource": "arn:aws-test:sqs:us-test-1:123456789012:privateflannel-example-com-nth" - }] - } + "Statement": [ + { + "Action": "sqs:SendMessage", + "Effect": "Allow", + "Principal": { + "Service": [ + "events.amazonaws.com", + "sqs.amazonaws.com" + ] + }, + "Resource": "arn:aws-test:sqs:us-test-1:123456789012:privateflannel-example-com-nth" + } + ], + "Version": "2012-10-17" +} diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_sqs_queue_privatekopeio-example-com-nth_policy b/tests/integration/update_cluster/privatekopeio/data/aws_sqs_queue_privatekopeio-example-com-nth_policy index d506f43e4f245..31bf6f9deaed4 100644 --- a/tests/integration/update_cluster/privatekopeio/data/aws_sqs_queue_privatekopeio-example-com-nth_policy +++ b/tests/integration/update_cluster/privatekopeio/data/aws_sqs_queue_privatekopeio-example-com-nth_policy @@ -1,11 +1,16 @@ { - "Version": "2012-10-17", - "Statement": [{ - "Effect": "Allow", - "Principal": { - "Service": ["events.amazonaws.com", "sqs.amazonaws.com"] - }, - "Action": "sqs:SendMessage", - "Resource": "arn:aws-test:sqs:us-test-1:123456789012:privatekopeio-example-com-nth" - }] - } + "Statement": [ + { + "Action": "sqs:SendMessage", + "Effect": "Allow", + "Principal": { + "Service": [ + "events.amazonaws.com", + "sqs.amazonaws.com" + ] + }, + "Resource": "arn:aws-test:sqs:us-test-1:123456789012:privatekopeio-example-com-nth" + } + ], + "Version": "2012-10-17" +} diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_sqs_queue_minimal-example-com-nth_policy b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_sqs_queue_minimal-example-com-nth_policy index fece0c117db30..c5b2b25812f36 100644 --- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_sqs_queue_minimal-example-com-nth_policy +++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_sqs_queue_minimal-example-com-nth_policy @@ -1,11 +1,16 @@ { - "Version": "2012-10-17", - "Statement": [{ - "Effect": "Allow", - "Principal": { - "Service": ["events.amazonaws.com", "sqs.amazonaws.com"] - }, - "Action": "sqs:SendMessage", - "Resource": "arn:aws-test:sqs:us-test-1:123456789012:minimal-example-com-nth" - }] - } + "Statement": [ + { + "Action": "sqs:SendMessage", + "Effect": "Allow", + "Principal": { + "Service": [ + "events.amazonaws.com", + "sqs.amazonaws.com" + ] + }, + "Resource": "arn:aws-test:sqs:us-test-1:123456789012:minimal-example-com-nth" + } + ], + "Version": "2012-10-17" +} diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_sqs_queue_sharedsubnet-example-com-nth_policy b/tests/integration/update_cluster/shared_subnet/data/aws_sqs_queue_sharedsubnet-example-com-nth_policy index 865c28e37c744..a18c8bb8e337d 100644 --- a/tests/integration/update_cluster/shared_subnet/data/aws_sqs_queue_sharedsubnet-example-com-nth_policy +++ b/tests/integration/update_cluster/shared_subnet/data/aws_sqs_queue_sharedsubnet-example-com-nth_policy @@ -1,11 +1,16 @@ { - "Version": "2012-10-17", - "Statement": [{ - "Effect": "Allow", - "Principal": { - "Service": ["events.amazonaws.com", "sqs.amazonaws.com"] - }, - "Action": "sqs:SendMessage", - "Resource": "arn:aws-test:sqs:us-test-1:123456789012:sharedsubnet-example-com-nth" - }] - } + "Statement": [ + { + "Action": "sqs:SendMessage", + "Effect": "Allow", + "Principal": { + "Service": [ + "events.amazonaws.com", + "sqs.amazonaws.com" + ] + }, + "Resource": "arn:aws-test:sqs:us-test-1:123456789012:sharedsubnet-example-com-nth" + } + ], + "Version": "2012-10-17" +} diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_sqs_queue_sharedvpc-example-com-nth_policy b/tests/integration/update_cluster/shared_vpc/data/aws_sqs_queue_sharedvpc-example-com-nth_policy index a146c50b51e0e..cef8c7ea1cf21 100644 --- a/tests/integration/update_cluster/shared_vpc/data/aws_sqs_queue_sharedvpc-example-com-nth_policy +++ b/tests/integration/update_cluster/shared_vpc/data/aws_sqs_queue_sharedvpc-example-com-nth_policy @@ -1,11 +1,16 @@ { - "Version": "2012-10-17", - "Statement": [{ - "Effect": "Allow", - "Principal": { - "Service": ["events.amazonaws.com", "sqs.amazonaws.com"] - }, - "Action": "sqs:SendMessage", - "Resource": "arn:aws-test:sqs:us-test-1:123456789012:sharedvpc-example-com-nth" - }] - } + "Statement": [ + { + "Action": "sqs:SendMessage", + "Effect": "Allow", + "Principal": { + "Service": [ + "events.amazonaws.com", + "sqs.amazonaws.com" + ] + }, + "Resource": "arn:aws-test:sqs:us-test-1:123456789012:sharedvpc-example-com-nth" + } + ], + "Version": "2012-10-17" +} diff --git a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_sqs_queue_minimal-ipv6-example-com-nth_policy b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_sqs_queue_minimal-ipv6-example-com-nth_policy index fde6878c6193d..79e46eb4932b9 100644 --- a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_sqs_queue_minimal-ipv6-example-com-nth_policy +++ b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_sqs_queue_minimal-ipv6-example-com-nth_policy @@ -1,11 +1,16 @@ { - "Version": "2012-10-17", - "Statement": [{ - "Effect": "Allow", - "Principal": { - "Service": ["events.amazonaws.com", "sqs.amazonaws.com"] - }, - "Action": "sqs:SendMessage", - "Resource": "arn:aws-test:sqs:us-test-1:123456789012:minimal-ipv6-example-com-nth" - }] - } + "Statement": [ + { + "Action": "sqs:SendMessage", + "Effect": "Allow", + "Principal": { + "Service": [ + "events.amazonaws.com", + "sqs.amazonaws.com" + ] + }, + "Resource": "arn:aws-test:sqs:us-test-1:123456789012:minimal-ipv6-example-com-nth" + } + ], + "Version": "2012-10-17" +} diff --git a/tests/integration/update_cluster/unmanaged/data/aws_sqs_queue_unmanaged-example-com-nth_policy b/tests/integration/update_cluster/unmanaged/data/aws_sqs_queue_unmanaged-example-com-nth_policy index 5ade98bcdfcbd..b6d885b28bd83 100644 --- a/tests/integration/update_cluster/unmanaged/data/aws_sqs_queue_unmanaged-example-com-nth_policy +++ b/tests/integration/update_cluster/unmanaged/data/aws_sqs_queue_unmanaged-example-com-nth_policy @@ -1,11 +1,16 @@ { - "Version": "2012-10-17", - "Statement": [{ - "Effect": "Allow", - "Principal": { - "Service": ["events.amazonaws.com", "sqs.amazonaws.com"] - }, - "Action": "sqs:SendMessage", - "Resource": "arn:aws-test:sqs:us-test-1:123456789012:unmanaged-example-com-nth" - }] - } + "Statement": [ + { + "Action": "sqs:SendMessage", + "Effect": "Allow", + "Principal": { + "Service": [ + "events.amazonaws.com", + "sqs.amazonaws.com" + ] + }, + "Resource": "arn:aws-test:sqs:us-test-1:123456789012:unmanaged-example-com-nth" + } + ], + "Version": "2012-10-17" +} diff --git a/tests/integration/update_cluster/vfs-said/data/aws_sqs_queue_minimal-example-com-nth_policy b/tests/integration/update_cluster/vfs-said/data/aws_sqs_queue_minimal-example-com-nth_policy index fece0c117db30..c5b2b25812f36 100644 --- a/tests/integration/update_cluster/vfs-said/data/aws_sqs_queue_minimal-example-com-nth_policy +++ b/tests/integration/update_cluster/vfs-said/data/aws_sqs_queue_minimal-example-com-nth_policy @@ -1,11 +1,16 @@ { - "Version": "2012-10-17", - "Statement": [{ - "Effect": "Allow", - "Principal": { - "Service": ["events.amazonaws.com", "sqs.amazonaws.com"] - }, - "Action": "sqs:SendMessage", - "Resource": "arn:aws-test:sqs:us-test-1:123456789012:minimal-example-com-nth" - }] - } + "Statement": [ + { + "Action": "sqs:SendMessage", + "Effect": "Allow", + "Principal": { + "Service": [ + "events.amazonaws.com", + "sqs.amazonaws.com" + ] + }, + "Resource": "arn:aws-test:sqs:us-test-1:123456789012:minimal-example-com-nth" + } + ], + "Version": "2012-10-17" +}