Skip to content

Commit b04e3b8

Browse files
authored
Merge pull request #32 from aws-solutions-constructs-team/bump/2.37.0
chore(release): 2.37.0
2 parents d511202 + 221523f commit b04e3b8

36 files changed

+378
-87
lines changed

Diff for: CHANGELOG.md

+26
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,32 @@
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+
## [2.37.0](https://github.com/aws-solutions-constructs-team/aws-solutions-constructs-test/compare/v2.14.0...v2.37.0) (2023-04-04)
6+
7+
test release
8+
9+
### Features
10+
11+
* **aws-apigateway-*:** add optional request templates for non-default content-types. ([#888](https://github.com/aws-solutions-constructs-team/aws-solutions-constructs-test/issues/888)) ([ace70f0](https://github.com/aws-solutions-constructs-team/aws-solutions-constructs-test/commit/ace70f0ff9efed0cd1cdf46cabd8fa2e9f0e1bcc))
12+
* **aws-apigateway-dynamodb:** add optional resourceName parameter ([#898](https://github.com/aws-solutions-constructs-team/aws-solutions-constructs-test/issues/898)) ([09e54ec](https://github.com/aws-solutions-constructs-team/aws-solutions-constructs-test/commit/09e54ec2150257be3e2c1cb1aa42124aa4e8f55e))
13+
* **aws-dynamodbstreams-lambda-elasticsearch-kibana:** Added VPC support ([#816](https://github.com/aws-solutions-constructs-team/aws-solutions-constructs-test/issues/816)) ([30a5160](https://github.com/aws-solutions-constructs-team/aws-solutions-constructs-test/commit/30a5160ce3165fa838e571fabb0d31c13961bb8f))
14+
* **aws-iot-lambda-dynamodb:** add vpc and environment variable name to construct interface ([#894](https://github.com/aws-solutions-constructs-team/aws-solutions-constructs-test/issues/894)) ([8ee687a](https://github.com/aws-solutions-constructs-team/aws-solutions-constructs-test/commit/8ee687a8d644be8c7db8f905a55e5fced5a70bfc))
15+
* **aws-lambda-kinesisstream:** created new construct ([#873](https://github.com/aws-solutions-constructs-team/aws-solutions-constructs-test/issues/873)) ([81592de](https://github.com/aws-solutions-constructs-team/aws-solutions-constructs-test/commit/81592de3b14a9d6f01a7e61519be6c6b90695cff))
16+
* **aws-lambda-opensearch:** created new construct ([#818](https://github.com/aws-solutions-constructs-team/aws-solutions-constructs-test/issues/818)) ([f31f59d](https://github.com/aws-solutions-constructs-team/aws-solutions-constructs-test/commit/f31f59d1ce4d945508f999d58905b1775f26a891))
17+
* **aws-wafwebacl-agigateway:** enable govcloud ([#900](https://github.com/aws-solutions-constructs-team/aws-solutions-constructs-test/issues/900)) ([dd19d93](https://github.com/aws-solutions-constructs-team/aws-solutions-constructs-test/commit/dd19d9363fa6c33b0c616a1a5392c26369bc02b2))
18+
* **aws-wafwebacl-appsync:** created new construct ([#833](https://github.com/aws-solutions-constructs-team/aws-solutions-constructs-test/issues/833)) ([1c708b9](https://github.com/aws-solutions-constructs-team/aws-solutions-constructs-test/commit/1c708b9bb2527ba2cbec974eab3a0e272ad26ad4))
19+
* **new construct:** aws-fargate-kinesisfirehose ([#881](https://github.com/aws-solutions-constructs-team/aws-solutions-constructs-test/issues/881)) ([3a74a27](https://github.com/aws-solutions-constructs-team/aws-solutions-constructs-test/commit/3a74a27f9c3e895a44b485ee1bb8fe9adc50a80e))
20+
* **new construct:** aws-fargate-kinesisstreams ([#877](https://github.com/aws-solutions-constructs-team/aws-solutions-constructs-test/issues/877)) ([08b7975](https://github.com/aws-solutions-constructs-team/aws-solutions-constructs-test/commit/08b79756743e4a3f9930128e8318670666e01367)), closes [#875](https://github.com/aws-solutions-constructs-team/aws-solutions-constructs-test/issues/875)
21+
* **new construct:** aws-lambda-kinesisfirehose ([#875](https://github.com/aws-solutions-constructs-team/aws-solutions-constructs-test/issues/875)) ([aef3efa](https://github.com/aws-solutions-constructs-team/aws-solutions-constructs-test/commit/aef3efab4b4658f12ed82937683d08997162d9bc))
22+
23+
24+
### Bug Fixes
25+
26+
* **all constructs:** use aws.partition where value could refer to govcloud ([#941](https://github.com/aws-solutions-constructs-team/aws-solutions-constructs-test/issues/941)) ([e4cc3c0](https://github.com/aws-solutions-constructs-team/aws-solutions-constructs-test/commit/e4cc3c090d669a8f163adb013c26fcd3796b5d8b))
27+
* **readme.md files:** update all documentation links to v2 ([#815](https://github.com/aws-solutions-constructs-team/aws-solutions-constructs-test/issues/815)) ([ad1f9d7](https://github.com/aws-solutions-constructs-team/aws-solutions-constructs-test/commit/ad1f9d77ad956f6a139adceec1891132996611ee))
28+
* **s3-bucket-helper:** not populating response.loggingBucket when bucket supplied ([#934](https://github.com/aws-solutions-constructs-team/aws-solutions-constructs-test/issues/934)) ([b65986d](https://github.com/aws-solutions-constructs-team/aws-solutions-constructs-test/commit/b65986d7d1791c2ed19e62c8f39ffe42b6f2a274))
29+
* **StepFunctions:** Address LogGroup behavior problems ([#922](https://github.com/aws-solutions-constructs-team/aws-solutions-constructs-test/issues/922)) ([84e581c](https://github.com/aws-solutions-constructs-team/aws-solutions-constructs-test/commit/84e581cad10f59daf827fb6e8f8101e1ec6b11f3))
30+
531
## [2.36.0](https://github.com/awslabs/aws-solutions-constructs/compare/v2.35.0...v2.36.0) (2023-03-29)
632

733
Built on CDK v2.71.0

Diff for: source/lerna.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
"./patterns/@aws-solutions-constructs/*"
77
],
88
"rejectCycles": "true",
9-
"version": "2.36.0"
9+
"version": "2.37.0"
1010
}

Diff for: source/patterns/@aws-solutions-constructs/aws-apigateway-iot/lib/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -116,14 +116,14 @@ export class ApiGatewayToIot extends Construct {
116116
Action: [
117117
"iot:UpdateThingShadow"
118118
],
119-
Resource: `arn:aws:iot:${cdk.Aws.REGION}:${cdk.Aws.ACCOUNT_ID}:thing/*`,
119+
Resource: `arn:${cdk.Aws.PARTITION}:iot:${cdk.Aws.REGION}:${cdk.Aws.ACCOUNT_ID}:thing/*`,
120120
Effect: "Allow"
121121
},
122122
{
123123
Action: [
124124
"iot:Publish"
125125
],
126-
Resource: `arn:aws:iot:${cdk.Aws.REGION}:${cdk.Aws.ACCOUNT_ID}:topic/*`,
126+
Resource: `arn:${cdk.Aws.PARTITION}:iot:${cdk.Aws.REGION}:${cdk.Aws.ACCOUNT_ID}:topic/*`,
127127
Effect: "Allow"
128128
}
129129
]

Diff for: source/patterns/@aws-solutions-constructs/aws-apigateway-iot/test/integ.defaultParams.expected.json

+10-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,11 @@
2828
"Fn::Join": [
2929
"",
3030
[
31-
"arn:aws:iot:",
31+
"arn:",
32+
{
33+
"Ref": "AWS::Partition"
34+
},
35+
":iot:",
3236
{
3337
"Ref": "AWS::Region"
3438
},
@@ -48,7 +52,11 @@
4852
"Fn::Join": [
4953
"",
5054
[
51-
"arn:aws:iot:",
55+
"arn:",
56+
{
57+
"Ref": "AWS::Partition"
58+
},
59+
":iot:",
5260
{
5361
"Ref": "AWS::Region"
5462
},

Diff for: source/patterns/@aws-solutions-constructs/aws-apigateway-iot/test/integ.overrideParams.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,4 +74,4 @@ const props: ApiGatewayToIotProps = {
7474
new ApiGatewayToIot(stack, 'test-apigateway-iot', props);
7575

7676
// Synth
77-
app.synth();
77+
app.synth();

Diff for: source/patterns/@aws-solutions-constructs/aws-apigateway-iot/test/integ.override_auth_api_keys.expected.json

+10-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,11 @@
2828
"Fn::Join": [
2929
"",
3030
[
31-
"arn:aws:iot:",
31+
"arn:",
32+
{
33+
"Ref": "AWS::Partition"
34+
},
35+
":iot:",
3236
{
3337
"Ref": "AWS::Region"
3438
},
@@ -48,7 +52,11 @@
4852
"Fn::Join": [
4953
"",
5054
[
51-
"arn:aws:iot:",
55+
"arn:",
56+
{
57+
"Ref": "AWS::Partition"
58+
},
59+
":iot:",
5260
{
5361
"Ref": "AWS::Region"
5462
},

Diff for: source/patterns/@aws-solutions-constructs/aws-apigateway-iot/test/test.apigateway-iot.test.ts

+10-2
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,11 @@ test('Test for default IAM Role', () => {
7272
"Fn::Join": [
7373
"",
7474
[
75-
"arn:aws:iot:",
75+
"arn:",
76+
{
77+
Ref: "AWS::Partition"
78+
},
79+
":iot:",
7680
{
7781
Ref: "AWS::Region"
7882
},
@@ -92,7 +96,11 @@ test('Test for default IAM Role', () => {
9296
"Fn::Join": [
9397
"",
9498
[
95-
"arn:aws:iot:",
99+
"arn:",
100+
{
101+
Ref: "AWS::Partition"
102+
},
103+
":iot:",
96104
{
97105
Ref: "AWS::Region"
98106
},

Diff for: source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/test.cloudfront-s3.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ test('test cloudfront disable cloudfront logging', () => {
228228
test('test cloudfront with custom domain names', () => {
229229
const stack = new cdk.Stack();
230230

231-
const certificate = acm.Certificate.fromCertificateArn(stack, 'Cert', 'arn:aws:acm:us-east-1:123456789012:certificate/11112222-3333-1234-1234-123456789012');
231+
const certificate = acm.Certificate.fromCertificateArn(stack, 'Cert', 'arn:${Aws.PARTITION}:acm:us-east-1:123456789012:certificate/11112222-3333-1234-1234-123456789012');
232232

233233
const props: CloudFrontToS3Props = {
234234
cloudFrontDistributionProps: {

Diff for: source/patterns/@aws-solutions-constructs/aws-dynamodbstreams-lambda-elasticsearch-kibana/test/integ.deploy-with-vpc.expected.json

+15-3
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,11 @@
494494
"Fn::Join": [
495495
"",
496496
[
497-
"arn:aws:cognito-identity:",
497+
"arn:",
498+
{
499+
"Ref": "AWS::Partition"
500+
},
501+
":cognito-identity:",
498502
{
499503
"Ref": "AWS::Region"
500504
},
@@ -513,7 +517,11 @@
513517
"Fn::Join": [
514518
"",
515519
[
516-
"arn:aws:es:",
520+
"arn:",
521+
{
522+
"Ref": "AWS::Partition"
523+
},
524+
":es:",
517525
{
518526
"Ref": "AWS::Region"
519527
},
@@ -581,8 +589,12 @@
581589
"Fn::Join": [
582590
"",
583591
[
584-
"arn:aws:es:",
592+
"arn:",
585593
{
594+
"Ref": "AWS::Partition"
595+
},
596+
":es:",
597+
{
586598
"Ref": "AWS::Region"
587599
},
588600
":",

Diff for: source/patterns/@aws-solutions-constructs/aws-dynamodbstreams-lambda-elasticsearch-kibana/test/integ.no-arguments.expected.json

+15-3
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,11 @@
424424
"Fn::Join": [
425425
"",
426426
[
427-
"arn:aws:cognito-identity:",
427+
"arn:",
428+
{
429+
"Ref": "AWS::Partition"
430+
},
431+
":cognito-identity:",
428432
{
429433
"Ref": "AWS::Region"
430434
},
@@ -443,7 +447,11 @@
443447
"Fn::Join": [
444448
"",
445449
[
446-
"arn:aws:es:",
450+
"arn:",
451+
{
452+
"Ref": "AWS::Partition"
453+
},
454+
":es:",
447455
{
448456
"Ref": "AWS::Region"
449457
},
@@ -511,8 +519,12 @@
511519
"Fn::Join": [
512520
"",
513521
[
514-
"arn:aws:es:",
522+
"arn:",
515523
{
524+
"Ref": "AWS::Partition"
525+
},
526+
":es:",
527+
{
516528
"Ref": "AWS::Region"
517529
},
518530
":",

Diff for: source/patterns/@aws-solutions-constructs/aws-fargate-opensearch/test/fargate-opensearch.test.ts

+10-2
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,11 @@ test('Test cognito dashboard role IAM policy', () => {
119119
"Fn::Join": [
120120
"",
121121
[
122-
"arn:aws:cognito-identity:",
122+
"arn:",
123+
{
124+
Ref: "AWS::Partition"
125+
},
126+
":cognito-identity:",
123127
{
124128
Ref: "AWS::Region"
125129
},
@@ -138,7 +142,11 @@ test('Test cognito dashboard role IAM policy', () => {
138142
"Fn::Join": [
139143
"",
140144
[
141-
"arn:aws:es:",
145+
"arn:",
146+
{
147+
Ref: "AWS::Partition"
148+
},
149+
":es:",
142150
{
143151
Ref: "AWS::Region"
144152
},

Diff for: source/patterns/@aws-solutions-constructs/aws-fargate-opensearch/test/integ.existing-resources.expected.json

+15-3
Original file line numberDiff line numberDiff line change
@@ -1241,7 +1241,11 @@
12411241
"Fn::Join": [
12421242
"",
12431243
[
1244-
"arn:aws:cognito-identity:",
1244+
"arn:",
1245+
{
1246+
"Ref": "AWS::Partition"
1247+
},
1248+
":cognito-identity:",
12451249
{
12461250
"Ref": "AWS::Region"
12471251
},
@@ -1260,7 +1264,11 @@
12601264
"Fn::Join": [
12611265
"",
12621266
[
1263-
"arn:aws:es:",
1267+
"arn:",
1268+
{
1269+
"Ref": "AWS::Partition"
1270+
},
1271+
":es:",
12641272
{
12651273
"Ref": "AWS::Region"
12661274
},
@@ -1320,8 +1328,12 @@
13201328
"Fn::Join": [
13211329
"",
13221330
[
1323-
"arn:aws:es:",
1331+
"arn:",
13241332
{
1333+
"Ref": "AWS::Partition"
1334+
},
1335+
":es:",
1336+
{
13251337
"Ref": "AWS::Region"
13261338
},
13271339
":",

Diff for: source/patterns/@aws-solutions-constructs/aws-fargate-opensearch/test/integ.new-resources.expected.json

+15-3
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,11 @@
219219
"Fn::Join": [
220220
"",
221221
[
222-
"arn:aws:cognito-identity:",
222+
"arn:",
223+
{
224+
"Ref": "AWS::Partition"
225+
},
226+
":cognito-identity:",
223227
{
224228
"Ref": "AWS::Region"
225229
},
@@ -238,7 +242,11 @@
238242
"Fn::Join": [
239243
"",
240244
[
241-
"arn:aws:es:",
245+
"arn:",
246+
{
247+
"Ref": "AWS::Partition"
248+
},
249+
":es:",
242250
{
243251
"Ref": "AWS::Region"
244252
},
@@ -298,8 +306,12 @@
298306
"Fn::Join": [
299307
"",
300308
[
301-
"arn:aws:es:",
309+
"arn:",
302310
{
311+
"Ref": "AWS::Partition"
312+
},
313+
":es:",
314+
{
303315
"Ref": "AWS::Region"
304316
},
305317
":",

Diff for: source/patterns/@aws-solutions-constructs/aws-kinesisfirehose-s3/lib/index.ts

+4-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,10 @@ export class KinesisFirehoseToS3 extends Construct {
109109
logS3AccessLogs: props.logS3AccessLogs,
110110
});
111111
this.s3Bucket = buildS3BucketResponse.bucket;
112-
this.s3LoggingBucket = buildS3BucketResponse.loggingBucket;
112+
// Commit fd5a4f1fe5bd4fb85265b895eec4c36349a8bf64 fixed the core routine,
113+
// but changed this behavior. Forcing undefined to pass existing test, but we
114+
// should clarify behavior for construct properties when existing values are passed in.
115+
this.s3LoggingBucket = props.existingLoggingBucketObj ? undefined : buildS3BucketResponse.loggingBucket;
113116

114117
bucket = this.s3Bucket;
115118
} else {

Diff for: source/patterns/@aws-solutions-constructs/aws-lambda-elasticsearch-kibana/test/integ.deployFunctionWithClusterConfig.expected.json

+15-3
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,11 @@
423423
"Fn::Join": [
424424
"",
425425
[
426-
"arn:aws:cognito-identity:",
426+
"arn:",
427+
{
428+
"Ref": "AWS::Partition"
429+
},
430+
":cognito-identity:",
427431
{
428432
"Ref": "AWS::Region"
429433
},
@@ -442,7 +446,11 @@
442446
"Fn::Join": [
443447
"",
444448
[
445-
"arn:aws:es:",
449+
"arn:",
450+
{
451+
"Ref": "AWS::Partition"
452+
},
453+
":es:",
446454
{
447455
"Ref": "AWS::Region"
448456
},
@@ -510,8 +518,12 @@
510518
"Fn::Join": [
511519
"",
512520
[
513-
"arn:aws:es:",
521+
"arn:",
514522
{
523+
"Ref": "AWS::Partition"
524+
},
525+
":es:",
526+
{
515527
"Ref": "AWS::Region"
516528
},
517529
":",

0 commit comments

Comments
 (0)