fix(cdk-v2-align-version): it fails to build cdk-integ-tools for cons…

…tructs 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
awslabs · Oct 6, 2021 · 80d1fe8 · 80d1fe8
1 parent 2d66ae7
commit 80d1fe8
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/deployment/v2/align-version.js b/deployment/v2/align-version.js
@@ -43,9 +43,12 @@ function processDependencies(section, file) {
   let newdependencies = {};
   for (const [ name, version ] of Object.entries(section)) {
     // Remove all entries starting with @aws-cdk/* and constructs
-    if (MODULE_EXEMPTIONS.has(name) || ((!name.startsWith('@aws-cdk/') && !name.startsWith('constructs')))) {
+    if ((!name.startsWith('@aws-cdk/') && !name.startsWith('constructs'))) {
       newdependencies[name] = version.replace(findVersion, replaceVersion);
     }
+    if (MODULE_EXEMPTIONS.has(name)) {
+      newdependencies[name] = version.replace(findVersion, awsCdkLibVersion);
+    }
   }
   return newdependencies;
 }
@@ -54,23 +57,30 @@ function processPeerDependencies(section, file) {
   let newdependencies = {};
   for (const [ name, version ] of Object.entries(section)) {
     // Remove all entries starting with @aws-cdk/* and constructs
-    if (MODULE_EXEMPTIONS.has(name) || ((!name.startsWith('@aws-cdk/') && !name.startsWith('constructs')))) {
+    if ((!name.startsWith('@aws-cdk/') && !name.startsWith('constructs'))) {
       newdependencies[name] = version.replace(findVersion, replaceVersion);
     }
+    if (MODULE_EXEMPTIONS.has(name)) {
+      newdependencies[name] = version.replace(findVersion, awsCdkLibVersion);
+    }
   }
   newdependencies["aws-cdk-lib"] = `^${awsCdkLibVersion}`;
   newdependencies["constructs"] = `^${constructsVersion}`;
   return newdependencies;
 }
 
 function processDevDependencies(section, file) {
-  let newdependencies = section;
-  for (const [ name, version ] of Object.entries(newdependencies)) {
+  let newdependencies = {};
+  for (const [ name, version ] of Object.entries(section)) {
     // Remove all entries starting with @aws-cdk/* and constructs
-    if (version === findVersion || version === '^' + findVersion) {
+    if ((!name.startsWith('@aws-cdk/') && !name.startsWith('constructs'))) {
       newdependencies[name] = version.replace(findVersion, replaceVersion);
     }
+    if (MODULE_EXEMPTIONS.has(name)) {
+      newdependencies[name] = version.replace(findVersion, awsCdkLibVersion);
+    }
   }
+
   // note: no ^ to make sure we test against the minimum version
   newdependencies["aws-cdk-lib"] = `${awsCdkLibVersion}`;
   newdependencies["constructs"] = `^${constructsVersion}`;

diff --git a/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-gluejob/package.json b/source/patterns/@aws-solutions-constructs/aws-kinesisstreams-gluejob/package.json
@@ -66,8 +66,7 @@
   "devDependencies": {
     "@aws-cdk/assert": "0.0.0",
     "@types/jest": "^26.0.22",
-    "@types/node": "^10.3.0",
-    "aws-cdk": "0.0.0"
+    "@types/node": "^10.3.0"
   },
   "jest": {
     "moduleFileExtensions": [

diff --git a/source/tools/cdk-integ-tools/package.json b/source/tools/cdk-integ-tools/package.json
@@ -35,7 +35,6 @@
     "@aws-cdk/cloudformation-diff": "0.0.0",
     "@aws-cdk/cx-api": "0.0.0",
     "@aws-cdk/assert": "0.0.0",
-    "aws-cdk": "0.0.0",
     "fs-extra": "^9.0.1",
     "yargs": "^16.1.1",
     "deepmerge": "^4.0.0"