chore: upgrade cdk library dependency to 2.158.0

codebuild_specs/build_linux.yml

@@ -1,6 +1,8 @@
 version: 0.2
 env:
   shell: bash
+  variables:
+    NODE_OPTIONS: --max-old-space-size=8096
 phases:
   build:
     commands:

codebuild_specs/build_windows.yml

@@ -1,12 +1,19 @@
 version: 0.2
 env:
   shell: powershell.exe
+  variables:
+    NODE_OPTIONS: --max-old-space-size=8096
 phases:
+  pre_build:
+    commands:
+      - choco install -fy nodejs-lts --version=18.20.4
+      - |
+        $nodeVersion = node -v
+        Write-Host "Node version: $nodeVersion"
   build:
     commands:
       - yarn run production-build
       - yarn build-tests
-
 artifacts:
   files:
     - 'shared-scripts.sh'

package.json

@@ -406,7 +406,7 @@
     "**/istanbul/async": "^2.6.4",
     "**/jake/async": "^2.6.4",
     "**/nth-check": "^2.0.1",
-    "aws-cdk-lib": "~2.152.0",
+    "aws-cdk-lib": "~2.158.0",
     "lodash": "^4.17.21",
     "node-fetch": "^2.6.7",
     "cross-fetch": "^2.2.6",

packages/amplify-data-construct/.jsii

@@ -131,7 +131,7 @@
   },
   "dependencies": {
     "@aws-amplify/graphql-api-construct": "1.14.0",
-    "aws-cdk-lib": "^2.152.0",
+    "aws-cdk-lib": "^2.158.0",
     "constructs": "^10.3.0"
   },
   "dependencyClosure": {
@@ -220,6 +220,36 @@
         }
       }
     },
+    "@aws-cdk/cloud-assembly-schema": {
+      "targets": {
+        "dotnet": {
+          "iconUrl": "https://raw.githubusercontent.com/aws/aws-cdk/main/logo/default-256-dark.png",
+          "namespace": "Amazon.CDK.CloudAssembly.Schema",
+          "packageId": "Amazon.CDK.CloudAssembly.Schema"
+        },
+        "go": {
+          "moduleName": "github.com/cdklabs/cloud-assembly-schema-go"
+        },
+        "java": {
+          "maven": {
+            "artifactId": "cdk-cloud-assembly-schema",
+            "groupId": "software.amazon.awscdk"
+          },
+          "package": "software.amazon.awscdk.cloudassembly.schema"
+        },
+        "js": {
+          "npm": "@aws-cdk/cloud-assembly-schema"
+        },
+        "python": {
+          "classifiers": [
+            "Framework :: AWS CDK",
+            "Framework :: AWS CDK :: 2"
+          ],
+          "distName": "aws-cdk.cloud-assembly-schema",
+          "module": "aws_cdk.cloud_assembly_schema"
+        }
+      }
+    },
     "aws-cdk-lib": {
       "submodules": {
         "aws-cdk-lib.alexa_ask": {
@@ -2290,6 +2320,19 @@
             }
           }
         },
+        "aws-cdk-lib.aws_launchwizard": {
+          "targets": {
+            "dotnet": {
+              "package": "Amazon.CDK.AWS.LaunchWizard"
+            },
+            "java": {
+              "package": "software.amazon.awscdk.services.launchwizard"
+            },
+            "python": {
+              "module": "aws_cdk.aws_launchwizard"
+            }
+          }
+        },
         "aws-cdk-lib.aws_lex": {
           "targets": {
             "dotnet": {
@@ -2784,6 +2827,19 @@
             }
           }
         },
+        "aws-cdk-lib.aws_pcaconnectorscep": {
+          "targets": {
+            "dotnet": {
+              "package": "Amazon.CDK.AWS.PCAConnectorSCEP"
+            },
+            "java": {
+              "package": "software.amazon.awscdk.services.pcaconnectorscep"
+            },
+            "python": {
+              "module": "aws_cdk.aws_pcaconnectorscep"
+            }
+          }
+        },
         "aws-cdk-lib.aws_personalize": {
           "targets": {
             "dotnet": {
@@ -3499,6 +3555,19 @@
             }
           }
         },
+        "aws-cdk-lib.aws_ssmquicksetup": {
+          "targets": {
+            "dotnet": {
+              "package": "Amazon.CDK.AWS.SSMQuickSetup"
+            },
+            "java": {
+              "package": "software.amazon.awscdk.services.ssmquicksetup"
+            },
+            "python": {
+              "module": "aws_cdk.aws_ssmquicksetup"
+            }
+          }
+        },
         "aws-cdk-lib.aws_sso": {
           "targets": {
             "dotnet": {
@@ -3746,19 +3815,7 @@
             }
           }
         },
-        "aws-cdk-lib.cloud_assembly_schema": {
-          "targets": {
-            "dotnet": {
-              "namespace": "Amazon.CDK.CloudAssembly.Schema"
-            },
-            "java": {
-              "package": "software.amazon.awscdk.cloudassembly.schema"
-            },
-            "python": {
-              "module": "aws_cdk.cloud_assembly_schema"
-            }
-          }
-        },
+        "aws-cdk-lib.cloud_assembly_schema": {},
         "aws-cdk-lib.cloudformation_include": {
           "targets": {
             "dotnet": {
@@ -3970,5 +4027,5 @@
   },
   "types": {},
   "version": "1.10.2",
-  "fingerprint": "Ur2Iw+iIJolzSkulUyEDgbJ9aLqUExVDrAiHRMhbnL4="
+  "fingerprint": "naLvPjdr9z9wuDIK2e15PtMBvodNvsprfPj2tyr4FaA="
 }

packages/amplify-data-construct/package.json

@@ -284,7 +284,7 @@
   "devDependencies": {
     "@types/fs-extra": "^8.0.1",
     "@types/node": "^18.0.0",
-    "aws-cdk-lib": "2.152.0",
+    "aws-cdk-lib": "2.158.0",
     "constructs": "10.3.0",
     "jsii": "^5.4.23",
     "jsii-pacmak": "^1.84.0",
@@ -294,7 +294,7 @@
     "ts-node": "^8.10.1"
   },
   "peerDependencies": {
-    "aws-cdk-lib": "^2.152.0",
+    "aws-cdk-lib": "^2.158.0",
     "constructs": "^10.3.0"
   },
   "stability": "stable",

packages/amplify-graphql-api-construct-tests/package.json

@@ -45,7 +45,7 @@
     "@aws-amplify/graphql-transformer-core": "3.1.2",
     "@aws-amplify/graphql-transformer-interfaces": "4.1.1",
     "@types/node": "^18.0.0",
-    "aws-cdk-lib": "2.152.0",
+    "aws-cdk-lib": "2.158.0",
     "constructs": "10.3.0",
     "ts-node": "^8.10.2"
   },

packages/amplify-graphql-api-construct-tests/src/__tests__/__snapshots__/base-cdk.test.ts.snap

@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`CDK GraphQL Transformer CDK base case - aws-cdk-lib@2.152.0 1`] = `
+exports[`CDK GraphQL Transformer CDK base case - aws-cdk-lib@2.158.0 1`] = `
 Object {
   "body": Object {
     "data": Object {
@@ -14,7 +14,7 @@ Object {
 }
 `;
 
-exports[`CDK GraphQL Transformer CDK base case - aws-cdk-lib@2.152.0 2`] = `
+exports[`CDK GraphQL Transformer CDK base case - aws-cdk-lib@2.158.0 2`] = `
 Object {
   "body": Object {
     "data": Object {

packages/amplify-graphql-api-construct-tests/src/__tests__/admin-role.test.ts

@@ -29,10 +29,10 @@ describe('CDK Auth Modes', () => {
   test('Can be invoked with Admin Roles defined', async () => {
     const templatePath = path.resolve(path.join(__dirname, 'backends', 'admin-role'));
     const name = await initCDKProject(projRoot, templatePath, {
-      cdkVersion: '2.152.0', // Explicitly declaring this, since this version needs to match cognito idp
+      cdkVersion: '2.158.0', // Explicitly declaring this, since this version needs to match cognito idp
       additionalDependencies: [
         'esbuild', // required to bundle the lambda function
-        '@aws-cdk/aws-cognito-identitypool-alpha@2.152.0-alpha.0', // using alpha cognito idp resource for auth config
+        '@aws-cdk/aws-cognito-identitypool-alpha@2.158.0-alpha.0', // using alpha cognito idp resource for auth config
         '@aws-crypto/sha256-js', // All remaining deps are required for the lambda to sign the request to appsync
         '@aws-sdk/credential-provider-node',
         '@aws-sdk/protocol-http',

packages/amplify-graphql-api-construct-tests/src/__tests__/base-cdk.test.ts

@@ -30,7 +30,7 @@ describe('CDK GraphQL Transformer', () => {
     deleteProjectDir(projRoot);
   });
 
-  ['2.152.0', 'latest'].forEach((cdkVersion) => {
+  ['2.158.0', 'latest'].forEach((cdkVersion) => {
     test(`CDK base case - aws-cdk-lib@${cdkVersion}`, async () => {
       const templatePath = path.resolve(path.join(__dirname, 'backends', 'base-cdk'));
       const name = await initCDKProject(projRoot, templatePath, { cdkVersion });

packages/amplify-graphql-api-construct-tests/src/__tests__/data-construct.test.ts

@@ -25,7 +25,7 @@ describe('Data Construct', () => {
     deleteProjectDir(projRoot);
   });
 
-  ['2.152.0', 'latest'].forEach((cdkVersion) => {
+  ['2.158.0', 'latest'].forEach((cdkVersion) => {
     test(`Data Construct - aws-cdk-lib@${cdkVersion}`, async () => {
       const templatePath = path.resolve(path.join(__dirname, 'backends', 'data-construct'));
       const name = await initCDKProject(projRoot, templatePath, { cdkVersion, construct: 'Data' });

packages/amplify-graphql-api-construct-tests/src/commands.ts

@@ -68,7 +68,7 @@ export type InitCDKProjectProps = {
  * @returns a promise which resolves to the stack name
  */
 export const initCDKProject = async (cwd: string, templatePath: string, props?: InitCDKProjectProps): Promise<string> => {
-  const { cdkVersion = '2.152.0', additionalDependencies = [] } = props ?? {};
+  const { cdkVersion = '2.158.0', additionalDependencies = [] } = props ?? {};
 
   await spawn(getNpxPath(), ['cdk', 'init', 'app', '--language', 'typescript'], {
     cwd,

packages/amplify-graphql-api-construct/.jsii

@@ -130,7 +130,7 @@
     "zod": "^3.22.2"
   },
   "dependencies": {
-    "aws-cdk-lib": "^2.152.0",
+    "aws-cdk-lib": "^2.158.0",
     "constructs": "^10.3.0"
   },
   "dependencyClosure": {
@@ -212,6 +212,36 @@
         }
       }
     },
+    "@aws-cdk/cloud-assembly-schema": {
+      "targets": {
+        "dotnet": {
+          "iconUrl": "https://raw.githubusercontent.com/aws/aws-cdk/main/logo/default-256-dark.png",
+          "namespace": "Amazon.CDK.CloudAssembly.Schema",
+          "packageId": "Amazon.CDK.CloudAssembly.Schema"
+        },
+        "go": {
+          "moduleName": "github.com/cdklabs/cloud-assembly-schema-go"
+        },
+        "java": {
+          "maven": {
+            "artifactId": "cdk-cloud-assembly-schema",
+            "groupId": "software.amazon.awscdk"
+          },
+          "package": "software.amazon.awscdk.cloudassembly.schema"
+        },
+        "js": {
+          "npm": "@aws-cdk/cloud-assembly-schema"
+        },
+        "python": {
+          "classifiers": [
+            "Framework :: AWS CDK",
+            "Framework :: AWS CDK :: 2"
+          ],
+          "distName": "aws-cdk.cloud-assembly-schema",
+          "module": "aws_cdk.cloud_assembly_schema"
+        }
+      }
+    },
     "aws-cdk-lib": {
       "submodules": {
         "aws-cdk-lib.alexa_ask": {
@@ -2282,6 +2312,19 @@
             }
           }
         },
+        "aws-cdk-lib.aws_launchwizard": {
+          "targets": {
+            "dotnet": {
+              "package": "Amazon.CDK.AWS.LaunchWizard"
+            },
+            "java": {
+              "package": "software.amazon.awscdk.services.launchwizard"
+            },
+            "python": {
+              "module": "aws_cdk.aws_launchwizard"
+            }
+          }
+        },
         "aws-cdk-lib.aws_lex": {
           "targets": {
             "dotnet": {
@@ -2776,6 +2819,19 @@
             }
           }
         },
+        "aws-cdk-lib.aws_pcaconnectorscep": {
+          "targets": {
+            "dotnet": {
+              "package": "Amazon.CDK.AWS.PCAConnectorSCEP"
+            },
+            "java": {
+              "package": "software.amazon.awscdk.services.pcaconnectorscep"
+            },
+            "python": {
+              "module": "aws_cdk.aws_pcaconnectorscep"
+            }
+          }
+        },
         "aws-cdk-lib.aws_personalize": {
           "targets": {
             "dotnet": {
@@ -3491,6 +3547,19 @@
             }
           }
         },
+        "aws-cdk-lib.aws_ssmquicksetup": {
+          "targets": {
+            "dotnet": {
+              "package": "Amazon.CDK.AWS.SSMQuickSetup"
+            },
+            "java": {
+              "package": "software.amazon.awscdk.services.ssmquicksetup"
+            },
+            "python": {
+              "module": "aws_cdk.aws_ssmquicksetup"
+            }
+          }
+        },
         "aws-cdk-lib.aws_sso": {
           "targets": {
             "dotnet": {
@@ -3738,19 +3807,7 @@
             }
           }
         },
-        "aws-cdk-lib.cloud_assembly_schema": {
-          "targets": {
-            "dotnet": {
-              "namespace": "Amazon.CDK.CloudAssembly.Schema"
-            },
-            "java": {
-              "package": "software.amazon.awscdk.cloudassembly.schema"
-            },
-            "python": {
-              "module": "aws_cdk.cloud_assembly_schema"
-            }
-          }
-        },
+        "aws-cdk-lib.cloud_assembly_schema": {},
         "aws-cdk-lib.cloudformation_include": {
           "targets": {
             "dotnet": {
@@ -8902,5 +8959,5 @@
     }
   },
   "version": "1.14.0",
-  "fingerprint": "izzdFUzhDEGlYfYipZndJkvmkwoDkGn6UZivsangA2g="
+  "fingerprint": "u4jHwzwBKRAlcky7o7NnOthEdgdtKR1CtWBsGA5tXq4="
 }