From 619f018c9d022cc99bf7d830c7f197c520010a9f Mon Sep 17 00:00:00 2001
From: Kendra Neil <53584728+TheRealAmazonKendra@users.noreply.github.com>
Date: Wed, 13 Sep 2023 12:16:59 -0700
Subject: [PATCH 1/6] chore: update cdk migrate command to allow for stack name
 input and additional languages

This change updates use of noctilucent to cdk-from-cfn and installs it from npm. It also adds some additional language support and stack renaming.
---
 packages/@aws-cdk/cli-lib-alpha/generate.sh   |  16 ---
 packages/@aws-cdk/cli-lib-alpha/package.json  |   5 +-
 packages/aws-cdk/.eslintrc.js                 |   1 -
 packages/aws-cdk/.gitignore                   |   4 -
 packages/aws-cdk/.npmignore                   |   2 -
 packages/aws-cdk/THIRD_PARTY_LICENSES         |   4 +
 packages/aws-cdk/generate.sh                  |  16 ---
 packages/aws-cdk/lib/cli.ts                   |  16 ++-
 packages/aws-cdk/lib/commands/migrate.ts      | 115 ++++++++++--------
 .../%name.PascalCased%/Program.template.cs    |   2 +-
 .../%name.PascalCased%/Program.template.fs    |   2 +-
 .../init-templates/app/go/%name%.template.go  |   2 +-
 .../myorg/%name.PascalCased%App.template.java |   2 +-
 .../app/javascript/bin/%name%.template.js     |   2 +-
 .../init-templates/app/python/app.template.py |   2 +-
 .../app/typescript/bin/%name%.template.ts     |   2 +-
 .../%name.PascalCased%/Program.template.cs    |   2 +-
 .../%name.PascalCased%/Program.template.fs    |   2 +-
 .../sample-app/go/%name%.template.go          |   2 +-
 .../myorg/%name.PascalCased%App.template.java |   2 +-
 .../javascript/bin/%name%.template.js         |   2 +-
 .../sample-app/python/app.template.py         |   2 +-
 .../typescript/bin/%name%.template.ts         |   2 +-
 packages/aws-cdk/lib/init.ts                  |  29 ++++-
 .../aws-cdk/lib/vendor/noctilucent/.keepdir   |   0
 packages/aws-cdk/package.json                 |   7 +-
 packages/aws-cdk/test/init.test.ts            |   1 -
 yarn.lock                                     |   5 +
 28 files changed, 122 insertions(+), 127 deletions(-)
 delete mode 100755 packages/@aws-cdk/cli-lib-alpha/generate.sh
 delete mode 100644 packages/aws-cdk/lib/vendor/noctilucent/.keepdir

diff --git a/packages/@aws-cdk/cli-lib-alpha/generate.sh b/packages/@aws-cdk/cli-lib-alpha/generate.sh
deleted file mode 100755
index e5ea04d12acd8..0000000000000
--- a/packages/@aws-cdk/cli-lib-alpha/generate.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-
-commit=${CODEBUILD_RESOLVED_SOURCE_VERSION:-}
-# CODEBUILD_RESOLVED_SOURCE_VERSION is not defined (i.e. local build or CodePipeline build),
-# use the HEAD commit hash
-if [ -z "${commit}" ]; then
-  commit="$(git rev-parse --verify HEAD)"
-fi
-
-cat > build-info.json <<HERE
-{
-  "comment": "Generated at $(date -u +"%Y-%m-%dT%H:%M:%SZ") by generate.sh",
-  "commit": "${commit:0:7}"
-}
-HERE
\ No newline at end of file
diff --git a/packages/@aws-cdk/cli-lib-alpha/package.json b/packages/@aws-cdk/cli-lib-alpha/package.json
index e45ed687f74f7..bb6eb52b45cd6 100644
--- a/packages/@aws-cdk/cli-lib-alpha/package.json
+++ b/packages/@aws-cdk/cli-lib-alpha/package.json
@@ -52,7 +52,7 @@
     "build+test+package": "yarn build+test && yarn package",
     "bundle": "esbuild --bundle lib/index.ts --target=node14 --platform=node --external:fsevents --minify-whitespace --outfile=lib/main.js",
     "compat": "cdk-compat",
-    "gen": "./generate.sh",
+    "gen": "../../../packages/aws-cdk/generate.sh",
     "lint": "cdk-lint",
     "package": "cdk-package",
     "pkglint": "pkglint -f",
@@ -68,7 +68,6 @@
   "cdk-build": {
     "post": [
       "yarn attribute",
-      "cp ../../aws-cdk/lib/vendor/noctilucent/index_bg.wasm ./lib/",
       "mkdir -p ./lib/api/bootstrap/ && cp ../../aws-cdk/lib/api/bootstrap/bootstrap-template.yaml ./lib/api/bootstrap/",
       "yarn bundle",
       "node ./lib/main.js >/dev/null 2>/dev/null </dev/null"
@@ -126,4 +125,4 @@
   },
   "dependencies": {},
   "peerDependencies": {}
-}
+}
\ No newline at end of file
diff --git a/packages/aws-cdk/.eslintrc.js b/packages/aws-cdk/.eslintrc.js
index 6a52d172b6abd..437c4f0c222e9 100644
--- a/packages/aws-cdk/.eslintrc.js
+++ b/packages/aws-cdk/.eslintrc.js
@@ -1,6 +1,5 @@
 const baseConfig = require('@aws-cdk/cdk-build-tools/config/eslintrc');
 baseConfig.ignorePatterns.push('lib/init-templates/**/typescript/**/*.ts');
 baseConfig.ignorePatterns.push('test/integ/cli/sam_cdk_integ_app/**/*.ts');
-baseConfig.ignorePatterns.push('vendor/noctilucent/**/*.ts');
 baseConfig.parserOptions.project = __dirname + '/tsconfig.json';
 module.exports = baseConfig;
diff --git a/packages/aws-cdk/.gitignore b/packages/aws-cdk/.gitignore
index ba79b3b0cb5c5..86263e936e436 100644
--- a/packages/aws-cdk/.gitignore
+++ b/packages/aws-cdk/.gitignore
@@ -36,10 +36,6 @@ test/integ/cli/*.js
 test/integ/cli/*.d.ts
 !test/integ/cli-regression-patches/**/*
 
-lib/vendor/noctilucent/*
-!lib/vendor/noctilucent/.keepdir
-
 .DS_Store
 
 junit.xml
-tmp/
diff --git a/packages/aws-cdk/.npmignore b/packages/aws-cdk/.npmignore
index c59a8edc18921..a287b2ba535b9 100644
--- a/packages/aws-cdk/.npmignore
+++ b/packages/aws-cdk/.npmignore
@@ -30,5 +30,3 @@ tsconfig.json
 junit.xml
 
 generate.sh
-lib/vendor/noctilucent/Dockerfile
-tmp/
diff --git a/packages/aws-cdk/THIRD_PARTY_LICENSES b/packages/aws-cdk/THIRD_PARTY_LICENSES
index 514abcf582e47..1e3b66230d13f 100644
--- a/packages/aws-cdk/THIRD_PARTY_LICENSES
+++ b/packages/aws-cdk/THIRD_PARTY_LICENSES
@@ -459,6 +459,10 @@ The above copyright notice and this permission notice shall be included in all c
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
+----------------
+
+** cdk-from-cfn@0.11.0 - https://www.npmjs.com/package/cdk-from-cfn/v/0.11.0 | MIT OR Apache-2.0
+
 ----------------
 
 ** chalk@4.1.2 - https://www.npmjs.com/package/chalk/v/4.1.2 | MIT
diff --git a/packages/aws-cdk/generate.sh b/packages/aws-cdk/generate.sh
index f27a9e2845c7f..4d9d43a954b6b 100755
--- a/packages/aws-cdk/generate.sh
+++ b/packages/aws-cdk/generate.sh
@@ -14,19 +14,3 @@ cat > build-info.json <<HERE
   "commit": "${commit:0:7}"
 }
 HERE
-
-# Download noctilucent wasm-pack build
-NOCTILUCENT_VERSION=0.1.2
-PACK_URL=https://github.com/iph/noctilucent/releases/download/v${NOCTILUCENT_VERSION}/wasm-pack.zip
-zipfile=$PWD/tmp/noctilucent-wasm-${NOCTILUCENT_VERSION}.zip
-outdir=lib/vendor/noctilucent
-
-mkdir -p tmp
-if [[ ! -f "$zipfile" ]]; then
-    curl -sSfLo "$zipfile" "$PACK_URL"
-fi
-
-(cd $outdir && unzip -qo $zipfile)
-
-# Don't need these files
-rm -f $outdir/{.gitignore,README.md,package.json}
diff --git a/packages/aws-cdk/lib/cli.ts b/packages/aws-cdk/lib/cli.ts
index 70d4184b09de2..ab397d6b4ea7e 100644
--- a/packages/aws-cdk/lib/cli.ts
+++ b/packages/aws-cdk/lib/cli.ts
@@ -272,10 +272,10 @@ async function parseCommandLineArguments(args: string[]) {
       .option('generate-only', { type: 'boolean', default: false, desc: 'If true, only generates project files, without executing additional operations such as setting up a git repo, installing dependencies or compiling the project' }),
     )
     .command('migrate', false /* hidden from "cdk --help" */, (yargs: Argv) => yargs
-      .option('language', { type: 'string', alias: 'l', desc: 'The language to be used for the new project (default can be configured in ~/.cdk.json)', choices: MIGRATE_SUPPORTED_LANGUAGES })
-      .option('input-path', { type: 'string', alias: 'inputpath', desc: 'The path to the CloudFormation template to migrate' })
-      .option('output-path', { type: 'string', alias: 'outputpath', desc: 'The output path for the migrated cdk code' })
-      .option('generate-only', { type: 'boolean', default: false, desc: 'If true, only generates project files, without executing additional operations such as setting up a git repo, installing dependencies or compiling the project' }),
+      .option('stack-name', { type: 'string', alias: 'n', desc: 'The name assigned to the stack created in the new project. The name of the app will be based off this name as well.', requiresArg: true })
+      .option('language', { type: 'string', default: 'typescript', alias: 'l', desc: 'The language to be used for the new project', choices: MIGRATE_SUPPORTED_LANGUAGES })
+      .option('from-path', { type: 'string', alias: 'p', desc: 'The path to the CloudFormation template to migrate. Use this for locally stored templates' })
+      .option('output-path', { type: 'string', alias: 'o', desc: 'The output path for the migrated cdk app' }),
     )
     .command('context', 'Manage cached context values', (yargs: Argv) => yargs
       .option('reset', { alias: 'e', desc: 'The context key (or its index) to reset', type: 'string', requiresArg: true })
@@ -659,8 +659,12 @@ export async function exec(args: string[], synthesizer?: Synthesizer): Promise<n
           return cliInit(args.TEMPLATE, language, undefined, args.generateOnly);
         }
       case 'migrate':
-        const migrateLanguage = configuration.settings.get(['language']);
-        return cliMigrate(args.inputpath, migrateLanguage, args.generateOnly, args.outputpath);
+        return cliMigrate({
+          stackName: args['stack-name'],
+          fromPath: args['from-path'],
+          language: args.language,
+          outputPath: args['output-path'],
+        });
       case 'version':
         return data(version.DISPLAY_VERSION);
 
diff --git a/packages/aws-cdk/lib/commands/migrate.ts b/packages/aws-cdk/lib/commands/migrate.ts
index 693dbfaba2283..97f934b235389 100644
--- a/packages/aws-cdk/lib/commands/migrate.ts
+++ b/packages/aws-cdk/lib/commands/migrate.ts
@@ -1,71 +1,78 @@
 import * as fs from 'fs';
 import * as path from 'path';
-import { initializeProject, availableInitTemplates } from '../../lib/init';
+import * as cdk_from_cfn from 'cdk-from-cfn';
+import { cliInit } from '../../lib/init';
 import { warning } from '../logging';
-import * as nocti from '../vendor/noctilucent';
+
+/* eslint-disable @typescript-eslint/no-var-requires */ // Packages don't have @types module
+// eslint-disable-next-line @typescript-eslint/no-require-imports
+const camelCase = require('camelcase');
+// eslint-disable-next-line @typescript-eslint/no-require-imports
+const decamelize = require('decamelize');
 
 /** The list of languages supported by the built-in noctilucent binary. */
-export const MIGRATE_SUPPORTED_LANGUAGES: readonly string[] = nocti.supported_languages();
+export const MIGRATE_SUPPORTED_LANGUAGES: readonly string[] = cdk_from_cfn.supported_languages();
 
-export async function cliMigrate(
-  inputpath: string = process.cwd() + '/../template.txt',
-  language = MIGRATE_SUPPORTED_LANGUAGES[0],
-  generateOnly = false,
-  outputpath = process.cwd(),
-) {
-  warning('This is an experimental feature. We make no guarantees about the outcome or stability of the functionality.');
-  const type = 'default'; // "default" is the default type (and maps to 'app')
-  const template = (await availableInitTemplates()).find(t => t.hasName(type!));
-  if (!template) {
-    throw new Error(`couldn't find template for ${type} app type, this should never happen`);
-  }
+export interface CliMigrateOptions {
+  readonly stackName: string;
+  readonly language?: string;
+  readonly fromPath?: string;
+  readonly outputPath?: string;
+}
 
-  if (!MIGRATE_SUPPORTED_LANGUAGES.includes(language)) {
-    throw new Error(`Unsupported language for cdk migrate: ${language}. Supported languages are: ${MIGRATE_SUPPORTED_LANGUAGES.join(', ')}`);
-  }
+export async function cliMigrate(options: CliMigrateOptions) {
+  warning('This is an experimental feature. We make no guarantees about the outcome or stability of the functionality.');
 
-  await initializeProject(template, language, true, generateOnly, outputpath);
-  const template_file = fs.readFileSync(inputpath, 'utf8');
-  const generated_app = nocti.transmute(template_file, language);
+  // TODO: Validate stack name
 
-  // clear out the init'd bin/lib files to replace with our own
-  delete_files(outputpath + '/lib/');
+  const language = options.language ?? 'typescript';
+  const outputPath = path.join(options.outputPath ?? process.cwd(), options.stackName);
 
-  // we hardcode everything to be called noctstack still so this works for now.
-  // Will change this to be much smarter once we can change stack name in noct
-  const bin_app = `#!/usr/bin/env node
-  import 'source-map-support/register';
-  import * as cdk from 'aws-cdk-lib';
-  import { NoctStack } from '../lib/generated_stack';
+  const generatedStack = generateStack(options, language);
+  const stackName = decamelize(options.stackName);
 
-  const app = new cdk.App();
-  new NoctStack(app, 'NoctStack', {
-    /* If you don't specify 'env', this stack will be environment-agnostic.
-     * Account/Region-dependent features and context lookups will not work,
-     * but a single synthesized template can be deployed anywhere. */
+  try {
+    fs.rmSync(outputPath, { recursive: true, force: true });
+    fs.mkdirSync(outputPath, { recursive: true });
+    await cliInit('app', language, true, false, outputPath, options.stackName);
 
-    /* Uncomment the next line to specialize this stack for the AWS Account
-     * and Region that are implied by the current CLI configuration. */
-    // env: { account: process.env.CDK_DEFAULT_ACCOUNT, region: process.env.CDK_DEFAULT_REGION },
+    let stackFileName: string;
+    switch (language) {
+      case 'typescript':
+        stackFileName = `${outputPath}/lib/${stackName}-stack.ts`;
+        break;
+      case 'java':
+        stackFileName = `${outputPath}/src/main/java/com/myorg/${camelCase(stackName, { pascalCase: true })}Stack.java`;
+        break;
+      case 'python':
+        stackFileName = `${outputPath}/${stackName.replace(/-/g, '_')}/${stackName.replace(/-/g, '_')}_stack.py`;
+        break;
+      case 'csharp':
+        stackFileName = `${outputPath}/src/${camelCase(stackName, { pascalCase: true })}/${camelCase(stackName, { pascalCase: true })}Stack.cs`;
+        break;
+      // TODO: Add Go support
+      default:
+        throw new Error(`${language} is not supported by CDK Migrate. Please choose from: ${MIGRATE_SUPPORTED_LANGUAGES.join(', ')}`);
+    }
+    fs.writeFileSync(stackFileName!, generatedStack);
+  } catch (error) {
+    fs.rmSync(outputPath, { recursive: true, force: true });
+    throw error;
+  }
 
-    /* Uncomment the next line if you know exactly what Account and Region you
-     * want to deploy the stack to. */
-    // env: { account: '123456789012', region: 'us-east-1' },
+}
 
-    /* For more information, see https://docs.aws.amazon.com/cdk/latest/guide/environments.html */
-  });`;
-  const myname = path.basename(outputpath);
-  fs.writeFileSync(outputpath + '/lib/' + 'generated_stack.ts', generated_app);
-  fs.writeFileSync(outputpath + '/bin/' + `${myname}.ts`, bin_app);
+function generateStack(options: CliMigrateOptions, language: string) {
+  const stackName = `${camelCase(decamelize(options.stackName), { pascalCase: true })}Stack`;
+  // We will add other options here in a future change.
+  if (options.fromPath) {
+    return fromPath(stackName, options.fromPath, language);
+  }
+  // TODO: replace with actual output for other options.
+  return '';
 }
 
-function delete_files(filepath: string) {
-  fs.readdir(filepath, (err, files) => {
-    if (err) throw err;
-    for (const file of files) {
-      fs.unlink(filepath + file, (cause) => {
-        if (cause) throw cause;
-      });
-    }
-  });
+function fromPath(stackName: string, inputPath: string, language: string): string {
+  const templateFile = fs.readFileSync(inputPath, 'utf8');
+  return cdk_from_cfn.transmute(templateFile, language, stackName);
 }
diff --git a/packages/aws-cdk/lib/init-templates/app/csharp/src/%name.PascalCased%/Program.template.cs b/packages/aws-cdk/lib/init-templates/app/csharp/src/%name.PascalCased%/Program.template.cs
index 0a35f06be9217..7099783ef9eac 100644
--- a/packages/aws-cdk/lib/init-templates/app/csharp/src/%name.PascalCased%/Program.template.cs
+++ b/packages/aws-cdk/lib/init-templates/app/csharp/src/%name.PascalCased%/Program.template.cs
@@ -10,7 +10,7 @@ sealed class Program
         public static void Main(string[] args)
         {
             var app = new App();
-            new %name.PascalCased%Stack(app, "%name.PascalCased%Stack", new StackProps
+            new %name.PascalCased%Stack(app, "%stackname%", new StackProps
             {
                 // If you don't specify 'env', this stack will be environment-agnostic.
                 // Account/Region-dependent features and context lookups will not work,
diff --git a/packages/aws-cdk/lib/init-templates/app/fsharp/src/%name.PascalCased%/Program.template.fs b/packages/aws-cdk/lib/init-templates/app/fsharp/src/%name.PascalCased%/Program.template.fs
index dc618af3fbbf1..34190a2caaa87 100644
--- a/packages/aws-cdk/lib/init-templates/app/fsharp/src/%name.PascalCased%/Program.template.fs
+++ b/packages/aws-cdk/lib/init-templates/app/fsharp/src/%name.PascalCased%/Program.template.fs
@@ -5,7 +5,7 @@ open %name.PascalCased%
 let main _ =
     let app = App(null)
 
-    %name.PascalCased%Stack(app, "%name.PascalCased%Stack", StackProps()) |> ignore
+    %name.PascalCased%Stack(app, "%stackname%", StackProps()) |> ignore
 
     app.Synth() |> ignore
     0
diff --git a/packages/aws-cdk/lib/init-templates/app/go/%name%.template.go b/packages/aws-cdk/lib/init-templates/app/go/%name%.template.go
index 8c966fa48359d..f97e0a2aec40b 100644
--- a/packages/aws-cdk/lib/init-templates/app/go/%name%.template.go
+++ b/packages/aws-cdk/lib/init-templates/app/go/%name%.template.go
@@ -33,7 +33,7 @@ func main() {
 
 	app := awscdk.NewApp(nil)
 
-	New%name.PascalCased%Stack(app, "%name.PascalCased%Stack", &%name.PascalCased%StackProps{
+	New%name.PascalCased%Stack(app, "%stackname%", &%name.PascalCased%StackProps{
 		awscdk.StackProps{
 			Env: env(),
 		},
diff --git a/packages/aws-cdk/lib/init-templates/app/java/src/main/java/com/myorg/%name.PascalCased%App.template.java b/packages/aws-cdk/lib/init-templates/app/java/src/main/java/com/myorg/%name.PascalCased%App.template.java
index 6499cbc9d2870..5aee9b6d9172d 100644
--- a/packages/aws-cdk/lib/init-templates/app/java/src/main/java/com/myorg/%name.PascalCased%App.template.java
+++ b/packages/aws-cdk/lib/init-templates/app/java/src/main/java/com/myorg/%name.PascalCased%App.template.java
@@ -10,7 +10,7 @@ public class %name.PascalCased%App {
     public static void main(final String[] args) {
         App app = new App();
 
-        new %name.PascalCased%Stack(app, "%name.PascalCased%Stack", StackProps.builder()
+        new %name.PascalCased%Stack(app, "%stackname%", StackProps.builder()
                 // If you don't specify 'env', this stack will be environment-agnostic.
                 // Account/Region-dependent features and context lookups will not work,
                 // but a single synthesized template can be deployed anywhere.
diff --git a/packages/aws-cdk/lib/init-templates/app/javascript/bin/%name%.template.js b/packages/aws-cdk/lib/init-templates/app/javascript/bin/%name%.template.js
index 46f0d3cbcc860..f63b587ed95c0 100644
--- a/packages/aws-cdk/lib/init-templates/app/javascript/bin/%name%.template.js
+++ b/packages/aws-cdk/lib/init-templates/app/javascript/bin/%name%.template.js
@@ -4,7 +4,7 @@ const cdk = require('aws-cdk-lib');
 const { %name.PascalCased%Stack } = require('../lib/%name%-stack');
 
 const app = new cdk.App();
-new %name.PascalCased%Stack(app, '%name.PascalCased%Stack', {
+new %name.PascalCased%Stack(app, '%stackname%', {
   /* If you don't specify 'env', this stack will be environment-agnostic.
    * Account/Region-dependent features and context lookups will not work,
    * but a single synthesized template can be deployed anywhere. */
diff --git a/packages/aws-cdk/lib/init-templates/app/python/app.template.py b/packages/aws-cdk/lib/init-templates/app/python/app.template.py
index 65cd03f7253da..1a79039b88609 100644
--- a/packages/aws-cdk/lib/init-templates/app/python/app.template.py
+++ b/packages/aws-cdk/lib/init-templates/app/python/app.template.py
@@ -7,7 +7,7 @@
 
 
 app = cdk.App()
-%name.PascalCased%Stack(app, "%name.PascalCased%Stack",
+%name.PascalCased%Stack(app, "%stackname%",
     # If you don't specify 'env', this stack will be environment-agnostic.
     # Account/Region-dependent features and context lookups will not work,
     # but a single synthesized template can be deployed anywhere.
diff --git a/packages/aws-cdk/lib/init-templates/app/typescript/bin/%name%.template.ts b/packages/aws-cdk/lib/init-templates/app/typescript/bin/%name%.template.ts
index d29a34d0b3c79..fb6e9d5085377 100644
--- a/packages/aws-cdk/lib/init-templates/app/typescript/bin/%name%.template.ts
+++ b/packages/aws-cdk/lib/init-templates/app/typescript/bin/%name%.template.ts
@@ -4,7 +4,7 @@ import * as cdk from 'aws-cdk-lib';
 import { %name.PascalCased%Stack } from '../lib/%name%-stack';
 
 const app = new cdk.App();
-new %name.PascalCased%Stack(app, '%name.PascalCased%Stack', {
+new %name.PascalCased%Stack(app, '%stackname%', {
   /* If you don't specify 'env', this stack will be environment-agnostic.
    * Account/Region-dependent features and context lookups will not work,
    * but a single synthesized template can be deployed anywhere. */
diff --git a/packages/aws-cdk/lib/init-templates/sample-app/csharp/src/%name.PascalCased%/Program.template.cs b/packages/aws-cdk/lib/init-templates/sample-app/csharp/src/%name.PascalCased%/Program.template.cs
index 20d5337f09888..42a37ba7352c7 100644
--- a/packages/aws-cdk/lib/init-templates/sample-app/csharp/src/%name.PascalCased%/Program.template.cs
+++ b/packages/aws-cdk/lib/init-templates/sample-app/csharp/src/%name.PascalCased%/Program.template.cs
@@ -7,7 +7,7 @@ sealed class Program
         public static void Main(string[] args)
         {
             var app = new App();
-            new %name.PascalCased%Stack(app, "%name.PascalCased%Stack");
+            new %name.PascalCased%Stack(app, "%stackname%");
 
             app.Synth();
         }
diff --git a/packages/aws-cdk/lib/init-templates/sample-app/fsharp/src/%name.PascalCased%/Program.template.fs b/packages/aws-cdk/lib/init-templates/sample-app/fsharp/src/%name.PascalCased%/Program.template.fs
index dc618af3fbbf1..34190a2caaa87 100644
--- a/packages/aws-cdk/lib/init-templates/sample-app/fsharp/src/%name.PascalCased%/Program.template.fs
+++ b/packages/aws-cdk/lib/init-templates/sample-app/fsharp/src/%name.PascalCased%/Program.template.fs
@@ -5,7 +5,7 @@ open %name.PascalCased%
 let main _ =
     let app = App(null)
 
-    %name.PascalCased%Stack(app, "%name.PascalCased%Stack", StackProps()) |> ignore
+    %name.PascalCased%Stack(app, "%stackname%", StackProps()) |> ignore
 
     app.Synth() |> ignore
     0
diff --git a/packages/aws-cdk/lib/init-templates/sample-app/go/%name%.template.go b/packages/aws-cdk/lib/init-templates/sample-app/go/%name%.template.go
index a45e420483da9..7eb3ba013fcae 100644
--- a/packages/aws-cdk/lib/init-templates/sample-app/go/%name%.template.go
+++ b/packages/aws-cdk/lib/init-templates/sample-app/go/%name%.template.go
@@ -36,7 +36,7 @@ func main() {
 
 	app := awscdk.NewApp(nil)
 
-	New%name.PascalCased%Stack(app, "%name.PascalCased%Stack", &%name.PascalCased%StackProps{
+	New%name.PascalCased%Stack(app, "%stackname", &%name.PascalCased%StackProps{
 		awscdk.StackProps{
 			Env: env(),
 		},
diff --git a/packages/aws-cdk/lib/init-templates/sample-app/java/src/main/java/com/myorg/%name.PascalCased%App.template.java b/packages/aws-cdk/lib/init-templates/sample-app/java/src/main/java/com/myorg/%name.PascalCased%App.template.java
index e015c59bc73bf..9a0c42330c6d0 100644
--- a/packages/aws-cdk/lib/init-templates/sample-app/java/src/main/java/com/myorg/%name.PascalCased%App.template.java
+++ b/packages/aws-cdk/lib/init-templates/sample-app/java/src/main/java/com/myorg/%name.PascalCased%App.template.java
@@ -6,7 +6,7 @@ public final class %name.PascalCased%App {
     public static void main(final String[] args) {
         App app = new App();
 
-        new %name.PascalCased%Stack(app, "%name.PascalCased%Stack");
+        new %name.PascalCased%Stack(app, "%stackname%");
 
         app.synth();
     }
diff --git a/packages/aws-cdk/lib/init-templates/sample-app/javascript/bin/%name%.template.js b/packages/aws-cdk/lib/init-templates/sample-app/javascript/bin/%name%.template.js
index 0a334a1be0dfe..f7e634866d0e0 100644
--- a/packages/aws-cdk/lib/init-templates/sample-app/javascript/bin/%name%.template.js
+++ b/packages/aws-cdk/lib/init-templates/sample-app/javascript/bin/%name%.template.js
@@ -3,4 +3,4 @@ const cdk = require('aws-cdk-lib');
 const { %name.PascalCased%Stack } = require('../lib/%name%-stack');
 
 const app = new cdk.App();
-new %name.PascalCased%Stack(app, '%name.PascalCased%Stack');
+new %name.PascalCased%Stack(app, '%stackname%');
diff --git a/packages/aws-cdk/lib/init-templates/sample-app/python/app.template.py b/packages/aws-cdk/lib/init-templates/sample-app/python/app.template.py
index 49094e6711cbf..17857578cfe86 100644
--- a/packages/aws-cdk/lib/init-templates/sample-app/python/app.template.py
+++ b/packages/aws-cdk/lib/init-templates/sample-app/python/app.template.py
@@ -6,6 +6,6 @@
 
 
 app = cdk.App()
-%name.PascalCased%Stack(app, "%name.StackName%")
+%name.PascalCased%Stack(app, "%stackname%")
 
 app.synth()
diff --git a/packages/aws-cdk/lib/init-templates/sample-app/typescript/bin/%name%.template.ts b/packages/aws-cdk/lib/init-templates/sample-app/typescript/bin/%name%.template.ts
index 2e7f99ba70e8b..8c3c9d3fa308f 100644
--- a/packages/aws-cdk/lib/init-templates/sample-app/typescript/bin/%name%.template.ts
+++ b/packages/aws-cdk/lib/init-templates/sample-app/typescript/bin/%name%.template.ts
@@ -3,4 +3,4 @@ import * as cdk from 'aws-cdk-lib';
 import { %name.PascalCased%Stack } from '../lib/%name%-stack';
 
 const app = new cdk.App();
-new %name.PascalCased%Stack(app, '%name.PascalCased%Stack');
+new %name.PascalCased%Stack(app, '%stackname%');
diff --git a/packages/aws-cdk/lib/init.ts b/packages/aws-cdk/lib/init.ts
index 6ca74494466f3..5ec9010c81a1f 100644
--- a/packages/aws-cdk/lib/init.ts
+++ b/packages/aws-cdk/lib/init.ts
@@ -17,7 +17,14 @@ const decamelize = require('decamelize');
 /**
  * Initialize a CDK package in the current directory
  */
-export async function cliInit(type?: string, language?: string, canUseNetwork = true, generateOnly = false, workDir = process.cwd()) {
+export async function cliInit(
+  type?: string,
+  language?: string,
+  canUseNetwork = true,
+  generateOnly = false,
+  workDir = process.cwd(),
+  stackName?: string,
+) {
   if (!type && !language) {
     await printAvailableTemplates();
     return;
@@ -39,7 +46,7 @@ export async function cliInit(type?: string, language?: string, canUseNetwork =
     throw new Error('No language was selected');
   }
 
-  await initializeProject(template, language, canUseNetwork, generateOnly, workDir);
+  await initializeProject(template, language, canUseNetwork, generateOnly, workDir, stackName);
 }
 
 /**
@@ -90,7 +97,7 @@ export class InitTemplate {
    * @param language    the language to instantiate this template with
    * @param targetDirectory the directory where the template is to be instantiated into
    */
-  public async install(language: string, targetDirectory: string) {
+  public async install(language: string, targetDirectory: string, stackName?: string) {
     if (this.languages.indexOf(language) === -1) {
       error(`The ${chalk.blue(language)} language is not supported for ${chalk.green(this.name)} `
           + `(it supports: ${this.languages.map(l => chalk.blue(l)).join(', ')})`);
@@ -99,6 +106,7 @@ export class InitTemplate {
 
     const projectInfo: ProjectInfo = {
       name: decamelize(path.basename(path.resolve(targetDirectory))),
+      stackName,
     };
 
     const sourceDirectory = path.join(this.basePath, language);
@@ -117,7 +125,7 @@ export class InitTemplate {
     });
   }
 
-  private async installFiles(sourceDirectory: string, targetDirectory: string, language:string, project: ProjectInfo) {
+  private async installFiles(sourceDirectory: string, targetDirectory: string, language: string, project: ProjectInfo) {
     for (const file of await fs.readdir(sourceDirectory)) {
       const fromFile = path.join(sourceDirectory, file);
       const toFile = path.join(targetDirectory, this.expand(file, language, project));
@@ -159,6 +167,7 @@ export class InitTemplate {
         break;
     }
     return template.replace(/%name%/g, project.name)
+      .replace(/%stackname%/, project.stackName ?? '%name.PascalCased%Stack')
       .replace(/%name\.camelCased%/g, camelCase(project.name))
       .replace(/%name\.PascalCased%/g, camelCase(project.name, { pascalCase: true }))
       .replace(/%cdk-version%/g, cdkVersion)
@@ -192,6 +201,7 @@ export class InitTemplate {
 interface ProjectInfo {
   /** The value used for %name% */
   readonly name: string;
+  readonly stackName?: string;
 }
 
 export async function availableInitTemplates(): Promise<InitTemplate[]> {
@@ -247,10 +257,17 @@ export async function printAvailableTemplates(language?: string) {
   }
 }
 
-export async function initializeProject(template: InitTemplate, language: string, canUseNetwork: boolean, generateOnly: boolean, workDir: string) {
+async function initializeProject(
+  template: InitTemplate,
+  language: string,
+  canUseNetwork: boolean,
+  generateOnly: boolean,
+  workDir: string,
+  stackName?: string,
+) {
   await assertIsEmptyDirectory(workDir);
   print(`Applying project template ${chalk.green(template.name)} for ${chalk.blue(language)}`);
-  await template.install(language, workDir);
+  await template.install(language, workDir, stackName);
   if (await fs.pathExists('README.md')) {
     print(chalk.green(await fs.readFile('README.md', { encoding: 'utf-8' })));
   }
diff --git a/packages/aws-cdk/lib/vendor/noctilucent/.keepdir b/packages/aws-cdk/lib/vendor/noctilucent/.keepdir
deleted file mode 100644
index e69de29bb2d1d..0000000000000
diff --git a/packages/aws-cdk/package.json b/packages/aws-cdk/package.json
index 558fefb9619ff..c2e9f6fa74131 100644
--- a/packages/aws-cdk/package.json
+++ b/packages/aws-cdk/package.json
@@ -33,16 +33,14 @@
           "fsevents"
         ]
       },
-      "resources": {
-        "lib/vendor/noctilucent/index_bg.wasm": "lib/index_bg.wasm"
-      },
       "allowedLicenses": [
         "Apache-2.0",
         "MIT",
         "BSD-3-Clause",
         "ISC",
         "BSD-2-Clause",
-        "0BSD"
+        "0BSD",
+        "MIT OR Apache-2.0"
       ],
       "dontAttribute": "^@aws-cdk/|^cdk-assets$|^cdk-cli-wrapper$",
       "test": "bin/cdk --version",
@@ -101,6 +99,7 @@
     "aws-sdk": "^2.1451.0",
     "camelcase": "^6.3.0",
     "cdk-assets": "0.0.0",
+    "cdk-from-cfn": "^0.11.0",
     "chalk": "^4",
     "chokidar": "^3.5.3",
     "decamelize": "^5.0.1",
diff --git a/packages/aws-cdk/test/init.test.ts b/packages/aws-cdk/test/init.test.ts
index 632c579fca329..4ecdc53789530 100644
--- a/packages/aws-cdk/test/init.test.ts
+++ b/packages/aws-cdk/test/init.test.ts
@@ -1,4 +1,3 @@
-/* eslint-disable import/order */
 import * as os from 'os';
 import * as path from 'path';
 import * as cxapi from '@aws-cdk/cx-api';
diff --git a/yarn.lock b/yarn.lock
index b7552de48ac75..d9c1c01d11a65 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5773,6 +5773,11 @@ case@1.6.3, case@^1.6.3:
   resolved "https://registry.npmjs.org/case/-/case-1.6.3.tgz#0a4386e3e9825351ca2e6216c60467ff5f1ea1c9"
   integrity sha512-mzDSXIPaFwVDvZAHqZ9VlbyF4yyXRuX6IvB06WvPYkqJVO24kX1PPhv9bfpKNFZyxYFmmgo03HUiD8iklmJYRQ==
 
+cdk-from-cfn@^0.11.0:
+  version "0.11.0"
+  resolved "https://registry.npmjs.org/cdk-from-cfn/-/cdk-from-cfn-0.11.0.tgz#b294dcc886323195b1b891161cda843170eba535"
+  integrity sha512-Pk0Sfp0LT0XXTqAf+QRLwvcY2x/2bvm6JGwV6ABLvdJAFAQa1XsGaELkSRZqz1C2iB5vp8dVw0EC0v1x3c5bHQ==
+
 cdk-generate-synthetic-examples@^0.1.291:
   version "0.1.291"
   resolved "https://registry.npmjs.org/cdk-generate-synthetic-examples/-/cdk-generate-synthetic-examples-0.1.291.tgz#67660f4c620ee4a994abb142e4d385086e248bc9"

From 51513bb7880eb135bc1efa104785ee4f38e1a1e4 Mon Sep 17 00:00:00 2001
From: Kendra Neil <53584728+TheRealAmazonKendra@users.noreply.github.com>
Date: Wed, 13 Sep 2023 13:25:31 -0700
Subject: [PATCH 2/6] update pkglint

---
 .../cli-lib-alpha/THIRD_PARTY_LICENSES        | 46 +++++++++++++++----
 packages/@aws-cdk/cli-lib-alpha/package.json  |  2 +-
 2 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/packages/@aws-cdk/cli-lib-alpha/THIRD_PARTY_LICENSES b/packages/@aws-cdk/cli-lib-alpha/THIRD_PARTY_LICENSES
index 231613e7eabf1..6ccc890a622f1 100644
--- a/packages/@aws-cdk/cli-lib-alpha/THIRD_PARTY_LICENSES
+++ b/packages/@aws-cdk/cli-lib-alpha/THIRD_PARTY_LICENSES
@@ -138,6 +138,32 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 ----------------
 
+** archiver-utils@3.0.4 - https://www.npmjs.com/package/archiver-utils/v/3.0.4 | MIT
+Copyright (c) 2015 Chris Talkington.
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+----------------
+
 ** archiver@5.3.2 - https://www.npmjs.com/package/archiver/v/5.3.2 | MIT
 Copyright (c) 2012-2014 Chris Talkington, contributors.
 
@@ -238,7 +264,7 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH RE
 
 ----------------
 
-** aws-sdk@2.1447.0 - https://www.npmjs.com/package/aws-sdk/v/2.1447.0 | Apache-2.0
+** aws-sdk@2.1451.0 - https://www.npmjs.com/package/aws-sdk/v/2.1451.0 | Apache-2.0
 AWS SDK for JavaScript
 Copyright 2012-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 
@@ -433,6 +459,10 @@ The above copyright notice and this permission notice shall be included in all c
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
+----------------
+
+** cdk-from-cfn@0.11.0 - https://www.npmjs.com/package/cdk-from-cfn/v/0.11.0 | MIT OR Apache-2.0
+
 ----------------
 
 ** chalk@4.1.2 - https://www.npmjs.com/package/chalk/v/4.1.2 | MIT
@@ -532,7 +562,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 ----------------
 
-** compress-commons@4.1.1 - https://www.npmjs.com/package/compress-commons/v/4.1.1 | MIT
+** compress-commons@4.1.2 - https://www.npmjs.com/package/compress-commons/v/4.1.2 | MIT
 Copyright (c) 2014 Chris Talkington, contributors.
 
 Permission is hereby granted, free of charge, to any person
@@ -811,7 +841,7 @@ IN THE SOFTWARE.
 
 ----------------
 
-** crc32-stream@4.0.2 - https://www.npmjs.com/package/crc32-stream/v/4.0.2 | MIT
+** crc32-stream@4.0.3 - https://www.npmjs.com/package/crc32-stream/v/4.0.3 | MIT
 Copyright (c) 2014 Chris Talkington, contributors.
 
 Permission is hereby granted, free of charge, to any person
@@ -1367,7 +1397,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ----------------
 
-** https-proxy-agent@7.0.1 - https://www.npmjs.com/package/https-proxy-agent/v/7.0.1 | MIT
+** https-proxy-agent@7.0.2 - https://www.npmjs.com/package/https-proxy-agent/v/7.0.2 | MIT
 
 ----------------
 
@@ -2134,7 +2164,7 @@ IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ----------------
 
-** pac-proxy-agent@7.0.0 - https://www.npmjs.com/package/pac-proxy-agent/v/7.0.0 | MIT
+** pac-proxy-agent@7.0.1 - https://www.npmjs.com/package/pac-proxy-agent/v/7.0.1 | MIT
 
 ----------------
 
@@ -2224,7 +2254,7 @@ THE SOFTWARE.
 
 ----------------
 
-** proxy-agent@6.3.0 - https://www.npmjs.com/package/proxy-agent/v/6.3.0 | MIT
+** proxy-agent@6.3.1 - https://www.npmjs.com/package/proxy-agent/v/6.3.1 | MIT
 
 ----------------
 
@@ -2793,7 +2823,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ----------------
 
-** socks-proxy-agent@8.0.1 - https://www.npmjs.com/package/socks-proxy-agent/v/8.0.1 | MIT
+** socks-proxy-agent@8.0.2 - https://www.npmjs.com/package/socks-proxy-agent/v/8.0.2 | MIT
 
 ----------------
 
@@ -3375,7 +3405,7 @@ THE SOFTWARE.
 
 ----------------
 
-** zip-stream@4.1.0 - https://www.npmjs.com/package/zip-stream/v/4.1.0 | MIT
+** zip-stream@4.1.1 - https://www.npmjs.com/package/zip-stream/v/4.1.1 | MIT
 Copyright (c) 2014 Chris Talkington, contributors.
 
 Permission is hereby granted, free of charge, to any person
diff --git a/packages/@aws-cdk/cli-lib-alpha/package.json b/packages/@aws-cdk/cli-lib-alpha/package.json
index bb6eb52b45cd6..5fa5add6369f6 100644
--- a/packages/@aws-cdk/cli-lib-alpha/package.json
+++ b/packages/@aws-cdk/cli-lib-alpha/package.json
@@ -125,4 +125,4 @@
   },
   "dependencies": {},
   "peerDependencies": {}
-}
\ No newline at end of file
+}

From 39bfc947289fcccb5a983153391c154fd31e4454 Mon Sep 17 00:00:00 2001
From: Kendra Neil <53584728+TheRealAmazonKendra@users.noreply.github.com>
Date: Wed, 13 Sep 2023 14:53:17 -0700
Subject: [PATCH 3/6] update allowed licenses

---
 tools/@aws-cdk/node-bundle/src/api/bundle.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/@aws-cdk/node-bundle/src/api/bundle.ts b/tools/@aws-cdk/node-bundle/src/api/bundle.ts
index fe25db42acd28..ccebedba43b0e 100644
--- a/tools/@aws-cdk/node-bundle/src/api/bundle.ts
+++ b/tools/@aws-cdk/node-bundle/src/api/bundle.ts
@@ -13,6 +13,7 @@ const DEFAULT_ALLOWED_LICENSES = [
   'ISC',
   'BSD-2-Clause',
   '0BSD',
+  'MIT OR Apache-2.0'
 ];
 
 /**

From cde7f9ebc5800a96b6cd63c3487a079029f7a7aa Mon Sep 17 00:00:00 2001
From: Kendra Neil <53584728+TheRealAmazonKendra@users.noreply.github.com>
Date: Wed, 13 Sep 2023 16:07:10 -0700
Subject: [PATCH 4/6] copy cdk-from-cfn

---
 packages/@aws-cdk/cli-lib-alpha/package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/@aws-cdk/cli-lib-alpha/package.json b/packages/@aws-cdk/cli-lib-alpha/package.json
index 5fa5add6369f6..3736649f071c7 100644
--- a/packages/@aws-cdk/cli-lib-alpha/package.json
+++ b/packages/@aws-cdk/cli-lib-alpha/package.json
@@ -69,6 +69,7 @@
     "post": [
       "yarn attribute",
       "mkdir -p ./lib/api/bootstrap/ && cp ../../aws-cdk/lib/api/bootstrap/bootstrap-template.yaml ./lib/api/bootstrap/",
+      "cp ../../../node_modules/cdk-from-cfn/index_bg.wasm ./lib/",
       "yarn bundle",
       "node ./lib/main.js >/dev/null 2>/dev/null </dev/null"
     ],
@@ -125,4 +126,4 @@
   },
   "dependencies": {},
   "peerDependencies": {}
-}
+}
\ No newline at end of file

From 2a8efd89076bc9e8c33bf97f1324127ebbeb6e61 Mon Sep 17 00:00:00 2001
From: Kendra Neil <53584728+TheRealAmazonKendra@users.noreply.github.com>
Date: Wed, 13 Sep 2023 18:18:53 -0700
Subject: [PATCH 5/6] pack wasm

---
 packages/@aws-cdk/cli-lib-alpha/package.json | 2 +-
 packages/aws-cdk/.gitignore                  | 2 ++
 packages/aws-cdk/package.json                | 8 +++++++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/packages/@aws-cdk/cli-lib-alpha/package.json b/packages/@aws-cdk/cli-lib-alpha/package.json
index 3736649f071c7..26e875ff3b586 100644
--- a/packages/@aws-cdk/cli-lib-alpha/package.json
+++ b/packages/@aws-cdk/cli-lib-alpha/package.json
@@ -50,7 +50,7 @@
     "build+test": "yarn build && yarn test",
     "build+test+extract": "yarn build+test && yarn rosetta:extract",
     "build+test+package": "yarn build+test && yarn package",
-    "bundle": "esbuild --bundle lib/index.ts --target=node14 --platform=node --external:fsevents --minify-whitespace --outfile=lib/main.js",
+    "bundle": "esbuild --bundle lib/index.ts --target=node18 --platform=node --external:fsevents --minify-whitespace --outfile=lib/main.js",
     "compat": "cdk-compat",
     "gen": "../../../packages/aws-cdk/generate.sh",
     "lint": "cdk-lint",
diff --git a/packages/aws-cdk/.gitignore b/packages/aws-cdk/.gitignore
index 86263e936e436..d7212cfe80e61 100644
--- a/packages/aws-cdk/.gitignore
+++ b/packages/aws-cdk/.gitignore
@@ -39,3 +39,5 @@ test/integ/cli/*.d.ts
 .DS_Store
 
 junit.xml
+
+lib/**/*.wasm
diff --git a/packages/aws-cdk/package.json b/packages/aws-cdk/package.json
index c2e9f6fa74131..158112185dfae 100644
--- a/packages/aws-cdk/package.json
+++ b/packages/aws-cdk/package.json
@@ -26,6 +26,11 @@
     "build+test+extract": "yarn build+test",
     "attributions:update": "yarn node-bundle validate --entrypoint lib/index.ts --dont-attribute \"^@aws-cdk/|^cdk-assets|^cdk-cli-wrapper$\" --fix"
   },
+  "cdk-build": {
+    "post": [
+      "cp ../../node_modules/cdk-from-cfn/index_bg.wasm ./lib/"
+    ]
+  },
   "cdk-package": {
     "bundle": {
       "externals": {
@@ -77,6 +82,7 @@
     "aws-cdk-lib": "0.0.0",
     "aws-sdk-mock": "5.6.0",
     "axios": "^0.27.2",
+    "cdk-from-cfn": "^0.11.0",
     "constructs": "^10.0.0",
     "fast-check": "^3.12.1",
     "jest": "^29.6.4",
@@ -149,4 +155,4 @@
   "publishConfig": {
     "tag": "latest"
   }
-}
+}
\ No newline at end of file

From 3073231c294779307a81ea20819e8bd02ea8cdd9 Mon Sep 17 00:00:00 2001
From: Kendra Neil <53584728+TheRealAmazonKendra@users.noreply.github.com>
Date: Wed, 13 Sep 2023 19:41:09 -0700
Subject: [PATCH 6/6] fix go template

---
 .../aws-cdk/lib/init-templates/sample-app/go/%name%.template.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/aws-cdk/lib/init-templates/sample-app/go/%name%.template.go b/packages/aws-cdk/lib/init-templates/sample-app/go/%name%.template.go
index 7eb3ba013fcae..f3a617f8bfb2f 100644
--- a/packages/aws-cdk/lib/init-templates/sample-app/go/%name%.template.go
+++ b/packages/aws-cdk/lib/init-templates/sample-app/go/%name%.template.go
@@ -36,7 +36,7 @@ func main() {
 
 	app := awscdk.NewApp(nil)
 
-	New%name.PascalCased%Stack(app, "%stackname", &%name.PascalCased%StackProps{
+	New%name.PascalCased%Stack(app, "%stackname%", &%name.PascalCased%StackProps{
 		awscdk.StackProps{
 			Env: env(),
 		},