Skip to content

Commit 5c5e128

Browse files
committed
updated integ tests enforceSSL bucket policy
1 parent 47ac4b3 commit 5c5e128

File tree

73 files changed

+939
-1048
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+939
-1048
lines changed

source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.privateApiExistingResources.expected.json

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1012,7 +1012,7 @@
10121012
"PolicyDocument": {
10131013
"Statement": [
10141014
{
1015-
"Action": "*",
1015+
"Action": "s3:*",
10161016
"Condition": {
10171017
"Bool": {
10181018
"aws:SecureTransport": "false"
@@ -1023,6 +1023,12 @@
10231023
"AWS": "*"
10241024
},
10251025
"Resource": [
1026+
{
1027+
"Fn::GetAtt": [
1028+
"existingalb0F60CC48",
1029+
"Arn"
1030+
]
1031+
},
10261032
{
10271033
"Fn::Join": [
10281034
"",
@@ -1036,15 +1042,8 @@
10361042
"/*"
10371043
]
10381044
]
1039-
},
1040-
{
1041-
"Fn::GetAtt": [
1042-
"existingalb0F60CC48",
1043-
"Arn"
1044-
]
10451045
}
1046-
],
1047-
"Sid": "HttpsOnly"
1046+
]
10481047
},
10491048
{
10501049
"Action": [

source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.privateApiNewResources.expected.json

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@
144144
"PolicyDocument": {
145145
"Statement": [
146146
{
147-
"Action": "*",
147+
"Action": "s3:*",
148148
"Condition": {
149149
"Bool": {
150150
"aws:SecureTransport": "false"
@@ -155,6 +155,12 @@
155155
"AWS": "*"
156156
},
157157
"Resource": [
158+
{
159+
"Fn::GetAtt": [
160+
"testoneE6ACFBB6",
161+
"Arn"
162+
]
163+
},
158164
{
159165
"Fn::Join": [
160166
"",
@@ -168,15 +174,8 @@
168174
"/*"
169175
]
170176
]
171-
},
172-
{
173-
"Fn::GetAtt": [
174-
"testoneE6ACFBB6",
175-
"Arn"
176-
]
177177
}
178-
],
179-
"Sid": "HttpsOnly"
178+
]
180179
},
181180
{
182181
"Action": [

source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.publicApiExistingResources.expected.json

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1012,7 +1012,7 @@
10121012
"PolicyDocument": {
10131013
"Statement": [
10141014
{
1015-
"Action": "*",
1015+
"Action": "s3:*",
10161016
"Condition": {
10171017
"Bool": {
10181018
"aws:SecureTransport": "false"
@@ -1023,6 +1023,12 @@
10231023
"AWS": "*"
10241024
},
10251025
"Resource": [
1026+
{
1027+
"Fn::GetAtt": [
1028+
"existingalb0F60CC48",
1029+
"Arn"
1030+
]
1031+
},
10261032
{
10271033
"Fn::Join": [
10281034
"",
@@ -1036,15 +1042,8 @@
10361042
"/*"
10371043
]
10381044
]
1039-
},
1040-
{
1041-
"Fn::GetAtt": [
1042-
"existingalb0F60CC48",
1043-
"Arn"
1044-
]
10451045
}
1046-
],
1047-
"Sid": "HttpsOnly"
1046+
]
10481047
},
10491048
{
10501049
"Action": [

source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.publicApiNewResources.expected.json

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@
147147
"PolicyDocument": {
148148
"Statement": [
149149
{
150-
"Action": "*",
150+
"Action": "s3:*",
151151
"Condition": {
152152
"Bool": {
153153
"aws:SecureTransport": "false"
@@ -158,6 +158,12 @@
158158
"AWS": "*"
159159
},
160160
"Resource": [
161+
{
162+
"Fn::GetAtt": [
163+
"testoneE6ACFBB6",
164+
"Arn"
165+
]
166+
},
161167
{
162168
"Fn::Join": [
163169
"",
@@ -171,15 +177,8 @@
171177
"/*"
172178
]
173179
]
174-
},
175-
{
176-
"Fn::GetAtt": [
177-
"testoneE6ACFBB6",
178-
"Arn"
179-
]
180180
}
181-
],
182-
"Sid": "HttpsOnly"
181+
]
183182
},
184183
{
185184
"Action": [

source/patterns/@aws-solutions-constructs/aws-alb-lambda/test/integ.twoTargets.expected.json

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@
147147
"PolicyDocument": {
148148
"Statement": [
149149
{
150-
"Action": "*",
150+
"Action": "s3:*",
151151
"Condition": {
152152
"Bool": {
153153
"aws:SecureTransport": "false"
@@ -158,6 +158,12 @@
158158
"AWS": "*"
159159
},
160160
"Resource": [
161+
{
162+
"Fn::GetAtt": [
163+
"testoneE6ACFBB6",
164+
"Arn"
165+
]
166+
},
161167
{
162168
"Fn::Join": [
163169
"",
@@ -171,15 +177,8 @@
171177
"/*"
172178
]
173179
]
174-
},
175-
{
176-
"Fn::GetAtt": [
177-
"testoneE6ACFBB6",
178-
"Arn"
179-
]
180180
}
181-
],
182-
"Sid": "HttpsOnly"
181+
]
183182
},
184183
{
185184
"Action": [

source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway-lambda/test/integ.customCloudfrontLoggingBucket.expected.json

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -643,7 +643,7 @@
643643
"PolicyDocument": {
644644
"Statement": [
645645
{
646-
"Action": "*",
646+
"Action": "s3:*",
647647
"Condition": {
648648
"Bool": {
649649
"aws:SecureTransport": "false"
@@ -654,6 +654,12 @@
654654
"AWS": "*"
655655
},
656656
"Resource": [
657+
{
658+
"Fn::GetAtt": [
659+
"cfapigwlambdaCloudFrontToApiGatewayCloudfrontLoggingBucket2E8E3DC2",
660+
"Arn"
661+
]
662+
},
657663
{
658664
"Fn::Join": [
659665
"",
@@ -667,15 +673,8 @@
667673
"/*"
668674
]
669675
]
670-
},
671-
{
672-
"Fn::GetAtt": [
673-
"cfapigwlambdaCloudFrontToApiGatewayCloudfrontLoggingBucket2E8E3DC2",
674-
"Arn"
675-
]
676676
}
677-
],
678-
"Sid": "HttpsOnly"
677+
]
679678
}
680679
],
681680
"Version": "2012-10-17"

source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway-lambda/test/integ.no-arguments.expected.json

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -643,7 +643,7 @@
643643
"PolicyDocument": {
644644
"Statement": [
645645
{
646-
"Action": "*",
646+
"Action": "s3:*",
647647
"Condition": {
648648
"Bool": {
649649
"aws:SecureTransport": "false"
@@ -654,6 +654,12 @@
654654
"AWS": "*"
655655
},
656656
"Resource": [
657+
{
658+
"Fn::GetAtt": [
659+
"testcloudfrontapigatewaylambdaCloudFrontToApiGatewayCloudfrontLoggingBucket7F467421",
660+
"Arn"
661+
]
662+
},
657663
{
658664
"Fn::Join": [
659665
"",
@@ -667,15 +673,8 @@
667673
"/*"
668674
]
669675
]
670-
},
671-
{
672-
"Fn::GetAtt": [
673-
"testcloudfrontapigatewaylambdaCloudFrontToApiGatewayCloudfrontLoggingBucket7F467421",
674-
"Arn"
675-
]
676676
}
677-
],
678-
"Sid": "HttpsOnly"
677+
]
679678
}
680679
],
681680
"Version": "2012-10-17"

source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway-lambda/test/integ.override-behavior.expected.json

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -604,7 +604,7 @@
604604
"PolicyDocument": {
605605
"Statement": [
606606
{
607-
"Action": "*",
607+
"Action": "s3:*",
608608
"Condition": {
609609
"Bool": {
610610
"aws:SecureTransport": "false"
@@ -615,6 +615,12 @@
615615
"AWS": "*"
616616
},
617617
"Resource": [
618+
{
619+
"Fn::GetAtt": [
620+
"cfapilambdaoverrideCloudFrontToApiGatewayCloudfrontLoggingBucket3A71B9E0",
621+
"Arn"
622+
]
623+
},
618624
{
619625
"Fn::Join": [
620626
"",
@@ -628,15 +634,8 @@
628634
"/*"
629635
]
630636
]
631-
},
632-
{
633-
"Fn::GetAtt": [
634-
"cfapilambdaoverrideCloudFrontToApiGatewayCloudfrontLoggingBucket3A71B9E0",
635-
"Arn"
636-
]
637637
}
638-
],
639-
"Sid": "HttpsOnly"
638+
]
640639
}
641640
],
642641
"Version": "2012-10-17"

source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway/test/integ.customCloudfrontLoggingBucket.expected.json

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -643,7 +643,7 @@
643643
"PolicyDocument": {
644644
"Statement": [
645645
{
646-
"Action": "*",
646+
"Action": "s3:*",
647647
"Condition": {
648648
"Bool": {
649649
"aws:SecureTransport": "false"
@@ -654,6 +654,12 @@
654654
"AWS": "*"
655655
},
656656
"Resource": [
657+
{
658+
"Fn::GetAtt": [
659+
"cfapigwCloudfrontLoggingBucket79FE4195",
660+
"Arn"
661+
]
662+
},
657663
{
658664
"Fn::Join": [
659665
"",
@@ -667,15 +673,8 @@
667673
"/*"
668674
]
669675
]
670-
},
671-
{
672-
"Fn::GetAtt": [
673-
"cfapigwCloudfrontLoggingBucket79FE4195",
674-
"Arn"
675-
]
676676
}
677-
],
678-
"Sid": "HttpsOnly"
677+
]
679678
}
680679
],
681680
"Version": "2012-10-17"

source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway/test/integ.no-arguments.expected.json

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -643,7 +643,7 @@
643643
"PolicyDocument": {
644644
"Statement": [
645645
{
646-
"Action": "*",
646+
"Action": "s3:*",
647647
"Condition": {
648648
"Bool": {
649649
"aws:SecureTransport": "false"
@@ -654,6 +654,12 @@
654654
"AWS": "*"
655655
},
656656
"Resource": [
657+
{
658+
"Fn::GetAtt": [
659+
"testcloudfrontapigatewayCloudfrontLoggingBucket9811F6E8",
660+
"Arn"
661+
]
662+
},
657663
{
658664
"Fn::Join": [
659665
"",
@@ -667,15 +673,8 @@
667673
"/*"
668674
]
669675
]
670-
},
671-
{
672-
"Fn::GetAtt": [
673-
"testcloudfrontapigatewayCloudfrontLoggingBucket9811F6E8",
674-
"Arn"
675-
]
676676
}
677-
],
678-
"Sid": "HttpsOnly"
677+
]
679678
}
680679
],
681680
"Version": "2012-10-17"

0 commit comments

Comments
 (0)