Skip to content

Commit 136bd2f

Browse files
committed
this works
1 parent 8b2a2b2 commit 136bd2f

File tree

364 files changed

+2575
-23705
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

364 files changed

+2575
-23705
lines changed

packages/@aws-cdk/cli-lib-alpha/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ dist
99
tsconfig.json
1010

1111
# Generated by generate.sh
12+
resources/
1213
build-info.json
1314

1415
.LAST_BUILD

packages/@aws-cdk/cli-lib-alpha/.npmignore

+3-4
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,21 @@ tsconfig.json
1717

1818
# Make the linter happy, but...
1919
!*.js
20-
# ... we don't actualy want unbundled files
20+
# ... we don't actually want unbundled files
2121
*.js
2222
*.ts
2323

2424
# Explicitly allow all required files
25+
!resources/**
26+
!db.json.gz
2527
!lib/main.js
2628
!lib/bridge.js
2729
!lib/setup-sandbox.js
28-
!lib/api/bootstrap/bootstrap-template.yaml
2930
!*.d.ts
3031
!*.lit.ts
3132
!rosetta/
3233
!.jsii
3334
!.jsii.tabl.json
3435
!.warnings.jsii.js
35-
!build-info.json
3636
!NOTICE
3737
!THIRD_PARTY_LICENSES
38-
!db.json.gz

packages/@aws-cdk/cli-lib-alpha/THIRD_PARTY_LICENSES

+2,018-579
Large diffs are not rendered by default.

packages/@aws-cdk/cli-lib-alpha/build-tools/copy-cli-resources.sh

+3-5
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,8 @@ set -euo pipefail
33

44
aws_cdk="$1"
55

6-
# Copy all resources that aws_cdk/generate.sh produced, and some othersCall the generator for the
7-
cp $aws_cdk/build-info.json ./
8-
cp -R $aws_cdk/lib/init-templates ./lib/
9-
10-
mkdir -p ./lib/api/bootstrap/ && cp $aws_cdk/lib/api/bootstrap/bootstrap-template.yaml ./lib/api/bootstrap/
6+
# Copy the various resource files from the CLI
7+
cp -R $aws_cdk/resources ./resources
118
cp $aws_cdk/lib/index_bg.wasm ./lib/
9+
cp $aws_cdk/build-info.json ./
1210
cp $aws_cdk/db.json.gz ./

packages/@aws-cdk/cli-lib-alpha/lib/cli.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// eslint-disable-next-line import/no-extraneous-dependencies
22
import { exec as runCli } from 'aws-cdk/lib';
33
// eslint-disable-next-line import/no-extraneous-dependencies
4-
import { createAssembly, prepareContext, prepareDefaultEnvironment } from 'aws-cdk/lib/api/cxapp/exec';
4+
import { createAssembly, prepareContext, prepareDefaultEnvironment } from '@aws-cdk/tmp-toolkit-helpers/lib/api/cxapp/exec';
55
import { SharedOptions, DeployOptions, DestroyOptions, BootstrapOptions, SynthOptions, ListOptions, StackActivityProgress, HotswapMode } from './commands';
66

77
/**

packages/@aws-cdk/cli-lib-alpha/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@
8484
"license": "Apache-2.0",
8585
"devDependencies": {
8686
"@aws-cdk/cdk-build-tools": "0.0.0",
87+
"@aws-cdk/tmp-toolkit-helpers": "0.0.0",
8788
"aws-cdk-lib": "0.0.0",
8889
"@aws-cdk/pkglint": "0.0.0",
8990
"@types/jest": "^29.5.14",
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,6 @@
11
#!/bin/bash
22
set -euo pipefail
33

4-
commit=${CODEBUILD_RESOLVED_SOURCE_VERSION:-}
5-
# CODEBUILD_RESOLVED_SOURCE_VERSION is not defined (i.e. local build or CodePipeline build),
6-
# use the HEAD commit hash
7-
if [ -z "${commit}" ]; then
8-
commit="$(git rev-parse --verify HEAD)"
9-
fi
10-
11-
cat > resources/build-info.json <<HERE
12-
{
13-
"comment": "Generated at $(date -u +"%Y-%m-%dT%H:%M:%SZ") by generate.sh",
14-
"commit": "${commit:0:7}"
15-
}
16-
HERE
17-
184
# Copy the current 'aws-cdk-lib' version out from the monorepo.
195
cdk_version=$(node -p 'require("aws-cdk-lib/package.json").version')
206
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
2612

2713
# Copy the service-spec database out from @aws-cdk/aws-service-spec.
2814
path=$(node -p 'require.resolve("@aws-cdk/aws-service-spec/db.json.gz")')
29-
cp $path ./resources
15+
cp $path ./

packages/@aws-cdk/tmp-toolkit-helpers/lib/api/index.ts

+1
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ export * from './garbage-collection/garbage-collector';
33
export * from './deploy-stack';
44
export * from './toolkit-info';
55
export * from './aws-auth';
6+
export * from './diff';

packages/@aws-cdk/tmp-toolkit-helpers/package.json

+3-4
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
"description": "Temporary AWS CDK Programmatic Toolkit Library",
44
"private": true,
55
"version": "0.0.0",
6-
"main": "./lib/index.js",
7-
"exports": "./lib/index.js",
8-
"types": "./lib/index.d.ts",
6+
"main": "./lib/api/index.js",
7+
"types": "./lib/api/index.d.ts",
98
"type": "commonjs",
109
"scripts": {
1110
"build": "cdk-build",
@@ -111,4 +110,4 @@
111110
"access": "restricted",
112111
"tag": "latest"
113112
}
114-
}
113+
}

0 commit comments

Comments
 (0)