this works

aws · Jan 14, 2025 · f918ec3 · f918ec3
1 parent 8b2a2b2
commit f918ec3
Show file tree

Hide file tree

Showing 360 changed files with 554 additions and 23,126 deletions.
diff --git a/packages/@aws-cdk/cli-lib-alpha/.npmignore b/packages/@aws-cdk/cli-lib-alpha/.npmignore
@@ -17,22 +17,21 @@ tsconfig.json
 
 # Make the linter happy, but...
 !*.js
-# ... we don't actualy want unbundled files
+# ... we don't actually want unbundled files
 *.js
 *.ts
 
 # Explicitly allow all required files
+!resources/**
+!db.json.gz
 !lib/main.js
 !lib/bridge.js
 !lib/setup-sandbox.js
-!lib/api/bootstrap/bootstrap-template.yaml
 !*.d.ts
 !*.lit.ts
 !rosetta/
 !.jsii
 !.jsii.tabl.json
 !.warnings.jsii.js
-!build-info.json
 !NOTICE
 !THIRD_PARTY_LICENSES
-!db.json.gz
diff --git a/packages/@aws-cdk/cli-lib-alpha/build-tools/copy-cli-resources.sh b/packages/@aws-cdk/cli-lib-alpha/build-tools/copy-cli-resources.sh
@@ -3,10 +3,7 @@ set -euo pipefail
 
 aws_cdk="$1"
 
-# Copy all resources that aws_cdk/generate.sh produced, and some othersCall the generator for the
-cp $aws_cdk/build-info.json ./
-cp -R $aws_cdk/lib/init-templates ./lib/
-
-mkdir -p ./lib/api/bootstrap/ && cp $aws_cdk/lib/api/bootstrap/bootstrap-template.yaml ./lib/api/bootstrap/
+# Copy the various resource files from the CLI
+cp -R $aws_cdk/resources ./resources
 cp $aws_cdk/lib/index_bg.wasm ./lib/
 cp $aws_cdk/db.json.gz ./
diff --git a/packages/@aws-cdk/tmp-toolkit-helpers/generate.sh b/packages/@aws-cdk/tmp-toolkit-helpers/generate.sh
@@ -1,20 +1,6 @@
 #!/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 > resources/build-info.json <<HERE
-{
-  "comment": "Generated at $(date -u +"%Y-%m-%dT%H:%M:%SZ") by generate.sh",
-  "commit": "${commit:0:7}"
-}
-HERE
-
 # Copy the current 'aws-cdk-lib' version out from the monorepo.
 cdk_version=$(node -p 'require("aws-cdk-lib/package.json").version')
 constructs_range=$(node -p 'require("aws-cdk-lib/package.json").peerDependencies.constructs')
@@ -26,4 +12,4 @@ cp $path resources/init-templates/.recommended-feature-flags.json
 
 # Copy the service-spec database out from @aws-cdk/aws-service-spec.
 path=$(node -p 'require.resolve("@aws-cdk/aws-service-spec/db.json.gz")')
-cp $path ./resources
+cp $path ./
diff --git a/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/index.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/index.ts
@@ -3,3 +3,4 @@ export * from './garbage-collection/garbage-collector';
 export * from './deploy-stack';
 export * from './toolkit-info';
 export * from './aws-auth';
+export * from './diff';
diff --git a/packages/@aws-cdk/tmp-toolkit-helpers/package.json b/packages/@aws-cdk/tmp-toolkit-helpers/package.json
@@ -3,9 +3,8 @@
   "description": "Temporary AWS CDK Programmatic Toolkit Library",
   "private": true,
   "version": "0.0.0",
-  "main": "./lib/index.js",
-  "exports": "./lib/index.js",
-  "types": "./lib/index.d.ts",
+  "main": "./lib/api/index.js",
+  "types": "./lib/api/index.d.ts",
   "type": "commonjs",
   "scripts": {
     "build": "cdk-build",
@@ -111,4 +110,4 @@
     "access": "restricted",
     "tag": "latest"
   }
-}
+}