Skip to content

Commit da61bfa

Browse files
ericquinonesericquinones
authored
Merge branch 'main' into feature/aws-iot-sqs
2 parents c48af21 + 4bfa188 commit da61bfa

File tree

170 files changed

+4277
-1079
lines changed

Some content is hidden

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

170 files changed

+4277
-1079
lines changed

‎.viperlightignore

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ source/patterns/@aws-solutions-constructs/core/test/step-function-helper.test.ts
1515
source/patterns/@aws-solutions-constructs/aws-kinesisstreams-gluejob/test/test.kinesisstream-gluejob.test.ts:126
1616
source/patterns/@aws-solutions-constructs/aws-lambda-sqs/test/integ.deployFunction.expected.json:112
1717
source/patterns/@aws-solutions-constructs/aws-lambda-sqs/test/integ.existingFunction.expected.json:112
18-
source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/integ.apigateway-sqs-crud.expected.json:197
18+
source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/integ.apigateway-sqs-crud.expected.json:201
1919
source/tools/cdk-integ-tools/package-lock.json:373
2020
source/patterns/@aws-solutions-constructs/core/test/step-function-helper.test.js:115
2121
source/patterns/@aws-solutions-constructs/core/test/lambda-helper.test.ts:297
@@ -24,7 +24,8 @@ source/patterns/@aws-solutions-constructs/aws-iot-lambda-dynamodb/test/iot-lambd
2424
source/patterns/@aws-solutions-constructs/aws-lambda-dynamodb/test/lambda-dynamodb.test.ts:186
2525
source/patterns/@aws-solutions-constructs/aws-lambda-sqs-lambda/test/lambda-sqs-lambda.test.ts:66
2626
source/patterns/@aws-solutions-constructs/aws-lambda-step-function/test/lambda-step-function.test.ts:129
27-
source/patterns/@aws-solutions-constructs/aws-events-rule-sns/test/events-rule-sns-topic.test.ts:241
27+
source/patterns/@aws-solutions-constructs/aws-lambda-stepfunctions/test/lambda-stepfunctions.test.ts:129
28+
source/patterns/@aws-solutions-constructs/aws-events-rule-sns/test/events-rule-sns-topic.test.ts:243
2829
source/patterns/@aws-solutions-constructs/aws-events-rule-sqs/test/events-rule-sqs-queue.test.ts:131
2930
source/patterns/@aws-solutions-constructs/aws-dynamodb-stream-lambda/test/dynamodb-stream-lambda.test.ts:105
3031
source/patterns/@aws-solutions-constructs/aws-apigateway-iot/README.md:39
@@ -33,7 +34,7 @@ source/patterns/@aws-solutions-constructs/aws-apigateway-iot/test/integ.override
3334
source/patterns/@aws-solutions-constructs/aws-apigateway-iot/test/test.apigateway-iot.test.ts:29
3435
source/patterns/@aws-solutions-constructs/aws-apigateway-iot/test/integ.override_auth_api_keys.expected.json:267
3536
source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/test.cloudfront-s3.test.ts:111
36-
source/patterns/@aws-solutions-constructs/core/test/cloudfront-distribution-s3-helper.test.ts:169
37+
source/patterns/@aws-solutions-constructs/core/test/cloudfront-distribution-s3-helper.test.ts:171
3738
source/patterns/@aws-solutions-constructs/aws-s3-sqs/test/test.s3-sqs.test.ts:251
3839
source/use_cases/aws-custom-glue-etl/stream-producer/generate_data.py:86
3940
source/use_cases/aws-custom-glue-etl/stream-producer/generate_data.py:87

‎CHANGELOG.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,30 @@
22

33
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
44

5+
## [1.114.0](https://github.com/awslabs/aws-solutions-constructs/compare/v1.113.0...v1.114.0) (2021-07-27)
6+
7+
### Changed
8+
9+
* Upgraded all patterns to CDK v1.114.0
10+
11+
## [1.113.0](https://github.com/awslabs/aws-solutions-constructs/compare/v1.112.0...v1.113.0) (2021-07-27)
12+
13+
### Changed
14+
15+
* Upgraded all patterns to CDK v1.113.0
16+
* Added keywords to each construct to appear as tags in NPM registry [278](https://github.com/awslabs/aws-solutions-constructs/issues/278)
17+
18+
## [1.112.0](https://github.com/awslabs/aws-solutions-constructs/compare/v1.111.0...v1.112.0) (2021-07-24)
19+
20+
### Changed
21+
22+
* Upgraded all patterns to CDK v1.112.0
23+
* Correct rules_to_suppress error in utils.ts [273](https://github.com/awslabs/aws-solutions-constructs/issues/273)
24+
25+
### ⚠ BREAKING CHANGES
26+
27+
* Use cloudfront function instead of lambda@edge for response security headers . [233](https://github.com/awslabs/aws-solutions-constructs/issues/233). The construct property edgeLambdaFunctionVersion is replaced by cloudFrontFunction, only stacks that reference that property will be affected.
28+
529
## [1.111.0](https://github.com/awslabs/aws-solutions-constructs/compare/v1.110.1...v1.111.0) (2021-07-19)
630

731
### Changed

‎integ.config.yaml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
testMatch:
2+
- "integ.*.js"
3+
regions:
4+
- "us-east-1"
5+
- "us-east-2"
6+
- "us-west-1"
7+
- "us-west-2"
8+
- "ca-central-1"
9+
- "sa-east-1"
10+
- "eu-central-1"
11+
- "eu-west-1"
12+
- "eu-west-2"
13+
- "eu-west-3"
14+
- "eu-north-1"
15+
- "eu-south-1"
16+
- "ap-northeast-1"
17+
- "ap-northeast-2"
18+
- "ap-southeast-1"
19+
- "ap-southeast-2"
20+
- "ap-south-1"

‎source/lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
"./patterns/@aws-solutions-constructs/*"
77
],
88
"rejectCycles": "true",
9-
"version": "1.111.0"
9+
"version": "1.114.0"
1010
}

‎source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/package.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,5 +88,13 @@
8888
"@aws-solutions-constructs/core": "0.0.0",
8989
"constructs": "^3.2.0",
9090
"@aws-cdk/aws-logs": "0.0.0"
91-
}
91+
},
92+
"keywords": [
93+
"aws",
94+
"cdk",
95+
"awscdk",
96+
"AWS Solutions Constructs",
97+
"Amazon API Gateway",
98+
"Amazon DynamoDB"
99+
]
92100
}

‎source/patterns/@aws-solutions-constructs/aws-apigateway-iot/package.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,5 +86,13 @@
8686
"@aws-solutions-constructs/core": "0.0.0",
8787
"constructs": "^3.2.0",
8888
"@aws-cdk/aws-iam": "0.0.0"
89-
}
89+
},
90+
"keywords": [
91+
"aws",
92+
"cdk",
93+
"awscdk",
94+
"AWS Solutions Constructs",
95+
"Amazon API Gateway",
96+
"AWS IoT"
97+
]
9098
}

‎source/patterns/@aws-solutions-constructs/aws-apigateway-kinesisstreams/package.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,5 +88,13 @@
8888
"@aws-solutions-constructs/core": "0.0.0",
8989
"constructs": "^3.2.0",
9090
"@aws-cdk/aws-logs": "0.0.0"
91-
}
91+
},
92+
"keywords": [
93+
"aws",
94+
"cdk",
95+
"awscdk",
96+
"AWS Solutions Constructs",
97+
"Amazon API Gateway",
98+
"Amazon Kinesis Data Streams"
99+
]
92100
}

‎source/patterns/@aws-solutions-constructs/aws-apigateway-lambda/package.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,5 +88,13 @@
8888
"@aws-solutions-constructs/core": "0.0.0",
8989
"constructs": "^3.2.0",
9090
"@aws-cdk/aws-iam": "0.0.0"
91-
}
91+
},
92+
"keywords": [
93+
"aws",
94+
"cdk",
95+
"awscdk",
96+
"AWS Solutions Constructs",
97+
"Amazon API Gateway",
98+
"AWS Lambda"
99+
]
92100
}

‎source/patterns/@aws-solutions-constructs/aws-apigateway-sagemakerendpoint/package.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,5 +86,13 @@
8686
"@aws-solutions-constructs/core": "0.0.0",
8787
"constructs": "^3.2.0",
8888
"@aws-cdk/aws-logs": "0.0.0"
89-
}
89+
},
90+
"keywords": [
91+
"aws",
92+
"cdk",
93+
"awscdk",
94+
"AWS Solutions Constructs",
95+
"Amazon API Gateway",
96+
"Amazon Sagemaker"
97+
]
9098
}

‎source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/package.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,5 +90,13 @@
9090
"@aws-solutions-constructs/core": "0.0.0",
9191
"constructs": "^3.2.0",
9292
"@aws-cdk/aws-logs": "0.0.0"
93-
}
93+
},
94+
"keywords": [
95+
"aws",
96+
"cdk",
97+
"awscdk",
98+
"AWS Solutions Constructs",
99+
"Amazon API Gateway",
100+
"Amazon SQS"
101+
]
94102
}

‎source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/__snapshots__/apigateway-sqs.test.js.snap

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -592,7 +592,9 @@ Object {
592592
},
593593
},
594594
"Effect": "Deny",
595-
"Principal": "*",
595+
"Principal": Object {
596+
"AWS": "*",
597+
},
596598
"Resource": Object {
597599
"Fn::GetAtt": Array [
598600
"apigatewaysqsdeadLetterQueue25B510FA",
@@ -678,7 +680,9 @@ Object {
678680
},
679681
},
680682
"Effect": "Deny",
681-
"Principal": "*",
683+
"Principal": Object {
684+
"AWS": "*",
685+
},
682686
"Resource": Object {
683687
"Fn::GetAtt": Array [
684688
"apigatewaysqsqueueE186B895",
@@ -1105,7 +1109,9 @@ Object {
11051109
},
11061110
},
11071111
"Effect": "Deny",
1108-
"Principal": "*",
1112+
"Principal": Object {
1113+
"AWS": "*",
1114+
},
11091115
"Resource": Object {
11101116
"Fn::GetAtt": Array [
11111117
"apigatewaysqsdeadLetterQueue25B510FA",
@@ -1191,7 +1197,9 @@ Object {
11911197
},
11921198
},
11931199
"Effect": "Deny",
1194-
"Principal": "*",
1200+
"Principal": Object {
1201+
"AWS": "*",
1202+
},
11951203
"Resource": Object {
11961204
"Fn::GetAtt": Array [
11971205
"apigatewaysqsqueueE186B895",
@@ -1618,7 +1626,9 @@ Object {
16181626
},
16191627
},
16201628
"Effect": "Deny",
1621-
"Principal": "*",
1629+
"Principal": Object {
1630+
"AWS": "*",
1631+
},
16221632
"Resource": Object {
16231633
"Fn::GetAtt": Array [
16241634
"apigatewaysqsqueueE186B895",
@@ -2045,7 +2055,9 @@ Object {
20452055
},
20462056
},
20472057
"Effect": "Deny",
2048-
"Principal": "*",
2058+
"Principal": Object {
2059+
"AWS": "*",
2060+
},
20492061
"Resource": Object {
20502062
"Fn::GetAtt": Array [
20512063
"apigatewaysqsdeadLetterQueue25B510FA",
@@ -2131,7 +2143,9 @@ Object {
21312143
},
21322144
},
21332145
"Effect": "Deny",
2134-
"Principal": "*",
2146+
"Principal": Object {
2147+
"AWS": "*",
2148+
},
21352149
"Resource": Object {
21362150
"Fn::GetAtt": Array [
21372151
"apigatewaysqsqueueE186B895",
@@ -2558,7 +2572,9 @@ Object {
25582572
},
25592573
},
25602574
"Effect": "Deny",
2561-
"Principal": "*",
2575+
"Principal": Object {
2576+
"AWS": "*",
2577+
},
25622578
"Resource": Object {
25632579
"Fn::GetAtt": Array [
25642580
"apigatewaysqsdeadLetterQueue25B510FA",
@@ -2644,7 +2660,9 @@ Object {
26442660
},
26452661
},
26462662
"Effect": "Deny",
2647-
"Principal": "*",
2663+
"Principal": Object {
2664+
"AWS": "*",
2665+
},
26482666
"Resource": Object {
26492667
"Fn::GetAtt": Array [
26502668
"apigatewaysqsqueueE186B895",

‎source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/integ.apigateway-sqs-crud.expected.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,9 @@
5959
}
6060
},
6161
"Effect": "Deny",
62-
"Principal": "*",
62+
"Principal": {
63+
"AWS": "*"
64+
},
6365
"Resource": {
6466
"Fn::GetAtt": [
6567
"testapigatewaysqsdeadLetterQueueAA4F6060",
@@ -145,7 +147,9 @@
145147
}
146148
},
147149
"Effect": "Deny",
148-
"Principal": "*",
150+
"Principal": {
151+
"AWS": "*"
152+
},
149153
"Resource": {
150154
"Fn::GetAtt": [
151155
"testapigatewaysqsqueue8EDC3CAF",

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,9 @@
5959
}
6060
},
6161
"Effect": "Deny",
62-
"Principal": "*",
62+
"Principal": {
63+
"AWS": "*"
64+
},
6365
"Resource": {
6466
"Fn::GetAtt": [
6567
"testapigatewaysqsdefaultdeadLetterQueue24467CAD",
@@ -145,7 +147,9 @@
145147
}
146148
},
147149
"Effect": "Deny",
148-
"Principal": "*",
150+
"Principal": {
151+
"AWS": "*"
152+
},
149153
"Resource": {
150154
"Fn::GetAtt": [
151155
"testapigatewaysqsdefaultqueueCAC098BE",

‎source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway-lambda/package.json

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,5 +96,14 @@
9696
"@aws-cdk/aws-s3": "0.0.0",
9797
"@aws-cdk/aws-iam": "0.0.0",
9898
"@aws-cdk/aws-cloudfront-origins": "0.0.0"
99-
}
99+
},
100+
"keywords": [
101+
"aws",
102+
"cdk",
103+
"awscdk",
104+
"AWS Solutions Constructs",
105+
"Amazon CloudFront",
106+
"Amazon API Gateway",
107+
"AWS Lambda"
108+
]
100109
}

‎source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway-lambda/test/__snapshots__/test.cloudfront-apigateway-lambda.test.js.snap

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,9 @@ Object {
223223
},
224224
},
225225
"Effect": "Deny",
226-
"Principal": "*",
226+
"Principal": Object {
227+
"AWS": "*",
228+
},
227229
"Resource": Array [
228230
Object {
229231
"Fn::Join": Array [

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -815,7 +815,9 @@
815815
}
816816
},
817817
"Effect": "Deny",
818-
"Principal": "*",
818+
"Principal": {
819+
"AWS": "*"
820+
},
819821
"Resource": [
820822
{
821823
"Fn::Join": [

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -776,7 +776,9 @@
776776
}
777777
},
778778
"Effect": "Deny",
779-
"Principal": "*",
779+
"Principal": {
780+
"AWS": "*"
781+
},
780782
"Resource": [
781783
{
782784
"Fn::Join": [

‎source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway/package.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,5 +90,13 @@
9090
"@aws-cdk/aws-logs": "0.0.0",
9191
"constructs": "^3.2.0",
9292
"@aws-cdk/aws-s3": "0.0.0"
93-
}
93+
},
94+
"keywords": [
95+
"aws",
96+
"cdk",
97+
"awscdk",
98+
"AWS Solutions Constructs",
99+
"Amazon CloudFront",
100+
"Amazon API Gateway"
101+
]
94102
}

0 commit comments

Comments
 (0)