Skip to content

Commit dccfb01

Browse files
naveenkoppulanaveenkoppula
authored
fix(core): Upgrading CDK version from 1.75.0 to 1.85.0 (#587)
* Removing Deprecations - Removing unused cfn-response - Replacing cdk.core.stringValue with uncachedString. * Upgrading CdK from 1.75.0 to 1.85.0
1 parent 1dc46a3 commit dccfb01

File tree

71 files changed

+458
-481
lines changed

Some content is hidden

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

71 files changed

+458
-481
lines changed

‎src/core/cdk/package.json‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"devDependencies": {
1212
"@types/jest": "25.2.3",
1313
"@types/node": "12.12.6",
14-
"aws-cdk": "1.75.0",
14+
"aws-cdk": "1.85.0",
1515
"babel-jest": "25.2.0",
1616
"jest": "25.2.4",
1717
"prettier": "2.2.0",
@@ -36,25 +36,25 @@
3636
"dependencies": {
3737
"@aws-accelerator/accelerator-runtime": "workspace:^0.0.1",
3838
"@aws-accelerator/cdk-accelerator": "workspace:^0.0.1",
39-
"@aws-cdk/aws-cloudformation": "1.75.0",
40-
"@aws-cdk/aws-codebuild": "1.75.0",
41-
"@aws-cdk/aws-codepipeline": "1.75.0",
42-
"@aws-cdk/aws-codepipeline-actions": "1.75.0",
43-
"@aws-cdk/aws-dynamodb": "1.75.0",
44-
"@aws-cdk/aws-events": "1.75.0",
45-
"@aws-cdk/aws-events-targets": "1.75.0",
46-
"@aws-cdk/aws-iam": "1.75.0",
47-
"@aws-cdk/aws-kms": "1.75.0",
48-
"@aws-cdk/aws-lambda": "1.75.0",
49-
"@aws-cdk/aws-route53resolver": "1.75.0",
50-
"@aws-cdk/aws-s3": "1.75.0",
51-
"@aws-cdk/aws-s3-assets": "1.75.0",
52-
"@aws-cdk/aws-s3-deployment": "1.75.0",
53-
"@aws-cdk/aws-secretsmanager": "1.75.0",
54-
"@aws-cdk/aws-sns": "1.75.0",
55-
"@aws-cdk/aws-stepfunctions": "1.75.0",
56-
"@aws-cdk/aws-stepfunctions-tasks": "1.75.0",
57-
"@aws-cdk/core": "1.75.0",
39+
"@aws-cdk/aws-cloudformation": "1.85.0",
40+
"@aws-cdk/aws-codebuild": "1.85.0",
41+
"@aws-cdk/aws-codepipeline": "1.85.0",
42+
"@aws-cdk/aws-codepipeline-actions": "1.85.0",
43+
"@aws-cdk/aws-dynamodb": "1.85.0",
44+
"@aws-cdk/aws-events": "1.85.0",
45+
"@aws-cdk/aws-events-targets": "1.85.0",
46+
"@aws-cdk/aws-iam": "1.85.0",
47+
"@aws-cdk/aws-kms": "1.85.0",
48+
"@aws-cdk/aws-lambda": "1.85.0",
49+
"@aws-cdk/aws-route53resolver": "1.85.0",
50+
"@aws-cdk/aws-s3": "1.85.0",
51+
"@aws-cdk/aws-s3-assets": "1.85.0",
52+
"@aws-cdk/aws-s3-deployment": "1.85.0",
53+
"@aws-cdk/aws-secretsmanager": "1.85.0",
54+
"@aws-cdk/aws-sns": "1.85.0",
55+
"@aws-cdk/aws-stepfunctions": "1.85.0",
56+
"@aws-cdk/aws-stepfunctions-tasks": "1.85.0",
57+
"@aws-cdk/core": "1.85.0",
5858
"@types/cfn-response": "1.0.4",
5959
"aws-sdk": "2.787.0",
6060
"cfn-response": "1.0.1",

‎src/deployments/cdk/package.json‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111
"devDependencies": {
1212
"@aws-accelerator/cdk-plugin-assume-role": "workspace:^0.0.1",
1313
"@aws-accelerator/deployments-runtime": "workspace:^0.0.1",
14-
"@aws-cdk/assert": "1.75.0",
15-
"@aws-cdk/cfnspec": "1.75.0",
16-
"@aws-cdk/cloud-assembly-schema": "1.75.0",
17-
"@aws-cdk/cx-api": "1.75.0",
14+
"@aws-cdk/assert": "1.85.0",
15+
"@aws-cdk/cfnspec": "1.85.0",
16+
"@aws-cdk/cloud-assembly-schema": "1.85.0",
17+
"@aws-cdk/cx-api": "1.85.0",
1818
"@types/jest": "25.2.3",
1919
"@types/mri": "1.1.0",
2020
"@types/node": "12.12.6",
21-
"aws-cdk": "1.75.0",
21+
"aws-cdk": "1.85.0",
2222
"babel-jest": "25.2.0",
2323
"jest": "25.2.4",
2424
"mri": "1.1.6",
@@ -100,38 +100,38 @@
100100
"@aws-accelerator/custom-resource-disassociate-hosted-zones": "workspace:^0.0.1",
101101
"@aws-accelerator/custom-resource-ec2-modify-transit-gateway-vpc-attachment": "workspace:^0.0.1",
102102
"@aws-accelerator/custom-resource-s3-put-bucket-versioning": "workspace:^0.0.1",
103-
"@aws-cdk/aws-accessanalyzer": "1.75.0",
104-
"@aws-cdk/aws-autoscaling": "1.75.0",
105-
"@aws-cdk/aws-budgets": "1.75.0",
106-
"@aws-cdk/aws-certificatemanager": "1.75.0",
107-
"@aws-cdk/aws-cloudformation": "1.75.0",
108-
"@aws-cdk/aws-cloudwatch": "1.75.0",
109-
"@aws-cdk/aws-config": "1.75.0",
110-
"@aws-cdk/aws-directoryservice": "1.75.0",
111-
"@aws-cdk/aws-ec2": "1.75.0",
112-
"@aws-cdk/aws-elasticloadbalancingv2": "1.75.0",
113-
"@aws-cdk/aws-events": "1.75.0",
114-
"@aws-cdk/aws-guardduty": "1.75.0",
115-
"@aws-cdk/aws-iam": "1.75.0",
116-
"@aws-cdk/aws-kinesis": "1.75.0",
117-
"@aws-cdk/aws-kinesisfirehose": "1.75.0",
118-
"@aws-cdk/aws-kms": "1.75.0",
119-
"@aws-cdk/aws-lambda": "1.75.0",
120-
"@aws-cdk/aws-logs": "1.75.0",
121-
"@aws-cdk/aws-ram": "1.75.0",
122-
"@aws-cdk/aws-route53": "1.75.0",
123-
"@aws-cdk/aws-route53-targets": "1.75.0",
124-
"@aws-cdk/aws-route53resolver": "1.75.0",
125-
"@aws-cdk/aws-s3": "1.75.0",
126-
"@aws-cdk/aws-s3-deployment": "1.75.0",
127-
"@aws-cdk/aws-secretsmanager": "1.75.0",
128-
"@aws-cdk/aws-securityhub": "1.75.0",
129-
"@aws-cdk/aws-sns": "1.75.0",
130-
"@aws-cdk/aws-ssm": "1.75.0",
131-
"@aws-cdk/aws-stepfunctions": "1.75.0",
132-
"@aws-cdk/core": "1.75.0",
133-
"@aws-cdk/custom-resources": "1.75.0",
134-
"@aws-cdk/region-info": "1.75.0",
103+
"@aws-cdk/aws-accessanalyzer": "1.85.0",
104+
"@aws-cdk/aws-autoscaling": "1.85.0",
105+
"@aws-cdk/aws-budgets": "1.85.0",
106+
"@aws-cdk/aws-certificatemanager": "1.85.0",
107+
"@aws-cdk/aws-cloudformation": "1.85.0",
108+
"@aws-cdk/aws-cloudwatch": "1.85.0",
109+
"@aws-cdk/aws-config": "1.85.0",
110+
"@aws-cdk/aws-directoryservice": "1.85.0",
111+
"@aws-cdk/aws-ec2": "1.85.0",
112+
"@aws-cdk/aws-elasticloadbalancingv2": "1.85.0",
113+
"@aws-cdk/aws-events": "1.85.0",
114+
"@aws-cdk/aws-guardduty": "1.85.0",
115+
"@aws-cdk/aws-iam": "1.85.0",
116+
"@aws-cdk/aws-kinesis": "1.85.0",
117+
"@aws-cdk/aws-kinesisfirehose": "1.85.0",
118+
"@aws-cdk/aws-kms": "1.85.0",
119+
"@aws-cdk/aws-lambda": "1.85.0",
120+
"@aws-cdk/aws-logs": "1.85.0",
121+
"@aws-cdk/aws-ram": "1.85.0",
122+
"@aws-cdk/aws-route53": "1.85.0",
123+
"@aws-cdk/aws-route53-targets": "1.85.0",
124+
"@aws-cdk/aws-route53resolver": "1.85.0",
125+
"@aws-cdk/aws-s3": "1.85.0",
126+
"@aws-cdk/aws-s3-deployment": "1.85.0",
127+
"@aws-cdk/aws-secretsmanager": "1.85.0",
128+
"@aws-cdk/aws-securityhub": "1.85.0",
129+
"@aws-cdk/aws-sns": "1.85.0",
130+
"@aws-cdk/aws-ssm": "1.85.0",
131+
"@aws-cdk/aws-stepfunctions": "1.85.0",
132+
"@aws-cdk/core": "1.85.0",
133+
"@aws-cdk/custom-resources": "1.85.0",
134+
"@aws-cdk/region-info": "1.85.0",
135135
"@types/cfn-response": "1.0.4",
136136
"@types/semver": "7.3.4",
137137
"colors": "1.4.0",

‎src/deployments/cdk/test/apps/__snapshots__/unsupported-changed.spec.ts.snap‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1370,6 +1370,7 @@ Array [
13701370
"CpuOptions": undefined,
13711371
"ElasticGpuSpecifications": undefined,
13721372
"ElasticInferenceAccelerators": undefined,
1373+
"EnclaveOptions": undefined,
13731374
"HibernationOptions": undefined,
13741375
"HostResourceGroupArn": undefined,
13751376
"ImageId": Object {
@@ -1447,6 +1448,7 @@ Array [
14471448
"CpuOptions": undefined,
14481449
"ElasticGpuSpecifications": undefined,
14491450
"ElasticInferenceAccelerators": undefined,
1451+
"EnclaveOptions": undefined,
14501452
"HibernationOptions": undefined,
14511453
"HostResourceGroupArn": undefined,
14521454
"ImageId": "ami-047aac44951feb9fb",
@@ -1494,6 +1496,7 @@ Array [
14941496
"CpuOptions": undefined,
14951497
"ElasticGpuSpecifications": undefined,
14961498
"ElasticInferenceAccelerators": undefined,
1499+
"EnclaveOptions": undefined,
14971500
"HibernationOptions": undefined,
14981501
"HostResourceGroupArn": undefined,
14991502
"ImageId": "ami-047aac44951feb9fb",
@@ -1541,6 +1544,7 @@ Array [
15411544
"CpuOptions": undefined,
15421545
"ElasticGpuSpecifications": undefined,
15431546
"ElasticInferenceAccelerators": undefined,
1547+
"EnclaveOptions": undefined,
15441548
"HibernationOptions": undefined,
15451549
"HostResourceGroupArn": undefined,
15461550
"ImageId": "ami-06fa2a9e6f8fae9f2",

‎src/installer/cdk/package.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"devDependencies": {
1010
"@types/jest": "25.2.3",
1111
"@types/node": "12.12.6",
12-
"aws-cdk": "1.75.0",
12+
"aws-cdk": "1.85.0",
1313
"aws-sdk": "2.787.0",
1414
"babel-jest": "25.2.0",
1515
"jest": "25.2.4",
@@ -33,14 +33,14 @@
3333
"typescript": "3.8.3"
3434
},
3535
"dependencies": {
36-
"@aws-cdk/aws-codebuild": "1.75.0",
37-
"@aws-cdk/aws-codecommit": "1.75.0",
38-
"@aws-cdk/aws-codepipeline": "1.75.0",
39-
"@aws-cdk/aws-codepipeline-actions": "1.75.0",
40-
"@aws-cdk/aws-iam": "1.75.0",
41-
"@aws-cdk/aws-lambda": "1.75.0",
42-
"@aws-cdk/aws-s3": "1.75.0",
43-
"@aws-cdk/core": "1.75.0"
36+
"@aws-cdk/aws-codebuild": "1.85.0",
37+
"@aws-cdk/aws-codecommit": "1.85.0",
38+
"@aws-cdk/aws-codepipeline": "1.85.0",
39+
"@aws-cdk/aws-codepipeline-actions": "1.85.0",
40+
"@aws-cdk/aws-iam": "1.85.0",
41+
"@aws-cdk/aws-lambda": "1.85.0",
42+
"@aws-cdk/aws-s3": "1.85.0",
43+
"@aws-cdk/core": "1.85.0"
4444
},
4545
"jest": {
4646
"preset": "ts-jest",

‎src/installer/cdk/src/index.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -204,19 +204,19 @@ async function main() {
204204
},
205205
NOTIFICATION_EMAIL: {
206206
type: codebuild.BuildEnvironmentVariableType.PLAINTEXT,
207-
value: notificationEmail,
207+
value: notificationEmail.valueAsString,
208208
},
209209
SOURCE_REPO: {
210210
type: codebuild.BuildEnvironmentVariableType.PLAINTEXT,
211-
value: githubRepository,
211+
value: githubRepository.valueAsString,
212212
},
213213
SOURCE_BRANCH: {
214214
type: codebuild.BuildEnvironmentVariableType.PLAINTEXT,
215-
value: githubBranch,
215+
value: githubBranch.valueAsString,
216216
},
217217
SOURCE_OWNER: {
218218
type: codebuild.BuildEnvironmentVariableType.PLAINTEXT,
219-
value: githubOwner,
219+
value: githubOwner.valueAsString,
220220
},
221221
},
222222
},

‎src/lib/cdk-accelerator/package.json‎

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"src"
1313
],
1414
"devDependencies": {
15-
"@aws-cdk/assert": "1.75.0",
15+
"@aws-cdk/assert": "1.85.0",
1616
"@types/glob": "7.1.3",
1717
"@types/jest": "25.2.1",
1818
"@types/node": "12.12.6",
@@ -39,23 +39,24 @@
3939
},
4040
"dependencies": {
4141
"@aws-accelerator/custom-resource-ec2-keypair": "workspace:^0.0.1",
42-
"@aws-cdk/aws-cloudformation": "1.75.0",
43-
"@aws-cdk/aws-codebuild": "1.75.0",
44-
"@aws-cdk/aws-ec2": "1.75.0",
45-
"@aws-cdk/aws-elasticloadbalancingv2": "1.75.0",
46-
"@aws-cdk/aws-events": "1.75.0",
47-
"@aws-cdk/aws-events-targets": "1.75.0",
48-
"@aws-cdk/aws-guardduty": "1.75.0",
49-
"@aws-cdk/aws-iam": "1.75.0",
50-
"@aws-cdk/aws-kms": "1.75.0",
51-
"@aws-cdk/aws-lambda": "1.75.0",
52-
"@aws-cdk/aws-s3": "1.75.0",
53-
"@aws-cdk/aws-s3-assets": "1.75.0",
54-
"@aws-cdk/aws-secretsmanager": "1.75.0",
55-
"@aws-cdk/aws-sns": "1.75.0",
56-
"@aws-cdk/aws-stepfunctions": "1.75.0",
57-
"@aws-cdk/aws-stepfunctions-tasks": "1.75.0",
58-
"@aws-cdk/core": "1.75.0",
42+
"@aws-cdk/aws-cloudformation": "1.85.0",
43+
"@aws-cdk/aws-codebuild": "1.85.0",
44+
"@aws-cdk/aws-ec2": "1.85.0",
45+
"@aws-cdk/aws-elasticloadbalancingv2": "1.85.0",
46+
"@aws-cdk/aws-events": "1.85.0",
47+
"@aws-cdk/aws-events-targets": "1.85.0",
48+
"@aws-cdk/aws-guardduty": "1.85.0",
49+
"@aws-cdk/aws-iam": "1.85.0",
50+
"@aws-cdk/aws-kms": "1.85.0",
51+
"@aws-cdk/aws-lambda": "1.85.0",
52+
"@aws-cdk/aws-s3": "1.85.0",
53+
"@aws-cdk/aws-s3-assets": "1.85.0",
54+
"@aws-cdk/aws-secretsmanager": "1.85.0",
55+
"@aws-cdk/aws-sns": "1.85.0",
56+
"@aws-cdk/aws-stepfunctions": "1.85.0",
57+
"@aws-cdk/aws-stepfunctions-tasks": "1.85.0",
58+
"@aws-cdk/cloudformation-include": "1.85.0",
59+
"@aws-cdk/core": "1.85.0",
5960
"@types/js-yaml": "3.12.3",
6061
"glob": "7.1.6",
6162
"js-yaml": "3.13.1",

‎src/lib/cdk-accelerator/src/core/cfn-include.ts‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
import * as cdk from '@aws-cdk/core';
2+
import * as cfn_inc from '@aws-cdk/cloudformation-include';
3+
4+
export namespace CfnInclude {
5+
export interface Props {
6+
path: string;
7+
}
8+
}
9+
10+
export class CfnInclude extends cdk.Construct {
11+
constructor(scope: cdk.Construct, id: string, props: CfnInclude.Props) {
12+
super(scope, id);
13+
14+
new cfn_inc.CfnInclude(this, 'include', {
15+
templateFile: props.path,
16+
});
17+
}
18+
}

‎src/lib/cdk-accelerator/src/core/cfn-json-include.ts‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎src/lib/cdk-accelerator/src/core/cfn-yaml-include.ts‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎src/lib/cdk-accelerator/src/core/index.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
export * from './cfn-json-include';
2-
export * from './cfn-yaml-include';
1+
export * from './cfn-include';
32
export * from './name-tagger';
43
export * from './accelerator-protected-tagger';

0 commit comments

Comments
 (0)