Skip to content

Commit 80d1fe8

Browse files
authored
fix(cdk-v2-align-version): it fails to build cdk-integ-tools for constructs v2.0.0-rc.2 (#424)
* fix(cdk-v2-align-version): it fails to build cdk-integ-tools for constructs v2.0.0-rc.2 * fix(cdk-v2-align-version): it fails to build cdk-integ-tools for constructs v2.0.0-rc.2
1 parent 2d66ae7 commit 80d1fe8

File tree

3 files changed

+16
-8
lines changed

3 files changed

+16
-8
lines changed

deployment/v2/align-version.js

+15-5
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,12 @@ function processDependencies(section, file) {
4343
let newdependencies = {};
4444
for (const [ name, version ] of Object.entries(section)) {
4545
// Remove all entries starting with @aws-cdk/* and constructs
46-
if (MODULE_EXEMPTIONS.has(name) || ((!name.startsWith('@aws-cdk/') && !name.startsWith('constructs')))) {
46+
if ((!name.startsWith('@aws-cdk/') && !name.startsWith('constructs'))) {
4747
newdependencies[name] = version.replace(findVersion, replaceVersion);
4848
}
49+
if (MODULE_EXEMPTIONS.has(name)) {
50+
newdependencies[name] = version.replace(findVersion, awsCdkLibVersion);
51+
}
4952
}
5053
return newdependencies;
5154
}
@@ -54,23 +57,30 @@ function processPeerDependencies(section, file) {
5457
let newdependencies = {};
5558
for (const [ name, version ] of Object.entries(section)) {
5659
// Remove all entries starting with @aws-cdk/* and constructs
57-
if (MODULE_EXEMPTIONS.has(name) || ((!name.startsWith('@aws-cdk/') && !name.startsWith('constructs')))) {
60+
if ((!name.startsWith('@aws-cdk/') && !name.startsWith('constructs'))) {
5861
newdependencies[name] = version.replace(findVersion, replaceVersion);
5962
}
63+
if (MODULE_EXEMPTIONS.has(name)) {
64+
newdependencies[name] = version.replace(findVersion, awsCdkLibVersion);
65+
}
6066
}
6167
newdependencies["aws-cdk-lib"] = `^${awsCdkLibVersion}`;
6268
newdependencies["constructs"] = `^${constructsVersion}`;
6369
return newdependencies;
6470
}
6571

6672
function processDevDependencies(section, file) {
67-
let newdependencies = section;
68-
for (const [ name, version ] of Object.entries(newdependencies)) {
73+
let newdependencies = {};
74+
for (const [ name, version ] of Object.entries(section)) {
6975
// Remove all entries starting with @aws-cdk/* and constructs
70-
if (version === findVersion || version === '^' + findVersion) {
76+
if ((!name.startsWith('@aws-cdk/') && !name.startsWith('constructs'))) {
7177
newdependencies[name] = version.replace(findVersion, replaceVersion);
7278
}
79+
if (MODULE_EXEMPTIONS.has(name)) {
80+
newdependencies[name] = version.replace(findVersion, awsCdkLibVersion);
81+
}
7382
}
83+
7484
// note: no ^ to make sure we test against the minimum version
7585
newdependencies["aws-cdk-lib"] = `${awsCdkLibVersion}`;
7686
newdependencies["constructs"] = `^${constructsVersion}`;

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,7 @@
6666
"devDependencies": {
6767
"@aws-cdk/assert": "0.0.0",
6868
"@types/jest": "^26.0.22",
69-
"@types/node": "^10.3.0",
70-
"aws-cdk": "0.0.0"
69+
"@types/node": "^10.3.0"
7170
},
7271
"jest": {
7372
"moduleFileExtensions": [

source/tools/cdk-integ-tools/package.json

-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
"@aws-cdk/cloudformation-diff": "0.0.0",
3636
"@aws-cdk/cx-api": "0.0.0",
3737
"@aws-cdk/assert": "0.0.0",
38-
"aws-cdk": "0.0.0",
3938
"fs-extra": "^9.0.1",
4039
"yargs": "^16.1.1",
4140
"deepmerge": "^4.0.0"

0 commit comments

Comments
 (0)