Skip to content

Commit 4531300

Browse files
authored
chore: rename private package cdk-cli-wrapper to @aws-cdk/cdk-cli-wrapper (#25357)
The name `cdk-cli-wrapper` has been squatted publicly (and has been removed for malware from NPMJS) ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
1 parent 748e685 commit 4531300

24 files changed

+39
-46
lines changed

packages/cdk-cli-wrapper/.gitignore renamed to packages/@aws-cdk/cdk-cli-wrapper/.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
node_modules
66
dist
77
.jsii
8-
tsconfig.json
98

109
# Generated by generate.sh
1110
build-info.json

packages/cdk-cli-wrapper/package.json renamed to packages/@aws-cdk/cdk-cli-wrapper/package.json

+4-38
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "cdk-cli-wrapper",
2+
"name": "@aws-cdk/cdk-cli-wrapper",
33
"description": "CDK CLI Wrapper Library",
44
"private": true,
55
"version": "0.0.0",
@@ -17,42 +17,8 @@
1717
"build+test+package": "yarn build+test && yarn package",
1818
"build+test": "yarn build && yarn test",
1919
"compat": "cdk-compat",
20-
"rosetta:extract": "yarn --silent jsii-rosetta extract",
21-
"build+extract": "yarn build && yarn rosetta:extract",
22-
"build+test+extract": "yarn build+test && yarn rosetta:extract"
23-
},
24-
"jsii": {
25-
"outdir": "dist",
26-
"targets": {
27-
"java": {
28-
"package": "software.amazon.awscdk.cdkcliwrapper",
29-
"maven": {
30-
"groupId": "software.amazon.awscdk",
31-
"artifactId": "cdk-cli-wrapper"
32-
}
33-
},
34-
"dotnet": {
35-
"namespace": "Amazon.CDK.CdkCliWrapper",
36-
"packageId": "Amazon.CDK.CdkCliWrapper",
37-
"iconUrl": "https://raw.githubusercontent.com/aws/aws-cdk/main/logo/default-256-dark.png"
38-
},
39-
"python": {
40-
"distName": "aws-cdk.cdk-cli-wrapper",
41-
"module": "aws_cdk.cdk_cli_wrapper",
42-
"classifiers": [
43-
"Framework :: AWS CDK",
44-
"Framework :: AWS CDK :: 2"
45-
]
46-
}
47-
},
48-
"projectReferences": true,
49-
"metadata": {
50-
"jsii": {
51-
"rosetta": {
52-
"strict": true
53-
}
54-
}
55-
}
20+
"build+extract": "yarn build",
21+
"build+test+extract": "yarn build+test"
5622
},
5723
"author": {
5824
"name": "Amazon Web Services",
@@ -69,7 +35,7 @@
6935
"repository": {
7036
"url": "https://github.com/aws/aws-cdk.git",
7137
"type": "git",
72-
"directory": "packages/cdk-cli-wrapper"
38+
"directory": "packages/@aws-cdk/cdk-cli-wrapper"
7339
},
7440
"keywords": [
7541
"aws",
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
{
2+
"compilerOptions": {
3+
"target": "ES2020",
4+
"module": "commonjs",
5+
"lib": ["es2020"],
6+
"strict": true,
7+
"alwaysStrict": true,
8+
"declaration": true,
9+
"inlineSourceMap": true,
10+
"inlineSources": true,
11+
"noUnusedLocals": true,
12+
"noUnusedParameters": true,
13+
"noImplicitReturns": true,
14+
"noFallthroughCasesInSwitch": true,
15+
"resolveJsonModule": true,
16+
"composite": true,
17+
"incremental": true
18+
},
19+
"include": [
20+
"**/*.ts"
21+
],
22+
"exclude": [
23+
"node_modules"
24+
]
25+
}

packages/@aws-cdk/integ-runner/lib/runner/integ-test-runner.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as path from 'path';
2+
import { DeployOptions, DestroyOptions } from '@aws-cdk/cdk-cli-wrapper';
23
import { RequireApproval } from '@aws-cdk/cloud-assembly-schema';
3-
import { DeployOptions, DestroyOptions } from 'cdk-cli-wrapper';
44
import * as fs from 'fs-extra';
55
import { IntegRunnerOptions, IntegRunner, DEFAULT_SYNTH_OPTIONS } from './runner-base';
66
import * as logger from '../logger';

packages/@aws-cdk/integ-runner/lib/runner/integ-test-suite.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as osPath from 'path';
2+
import { ICdk, ListOptions } from '@aws-cdk/cdk-cli-wrapper';
23
import { TestCase, TestOptions, Manifest, IntegManifest } from '@aws-cdk/cloud-assembly-schema';
3-
import { ICdk, ListOptions } from 'cdk-cli-wrapper';
44
import * as fs from 'fs-extra';
55
import { IntegManifestReader } from './private/integ-manifest';
66

packages/@aws-cdk/integ-runner/lib/runner/runner-base.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/* eslint-disable @aws-cdk/no-literal-partition */
22
import * as path from 'path';
3+
import { CdkCliWrapper, ICdk } from '@aws-cdk/cdk-cli-wrapper';
34
import { TestCase, DefaultCdkOptions } from '@aws-cdk/cloud-assembly-schema';
45
import { AVAILABILITY_ZONE_FALLBACK_CONTEXT_KEY, TARGET_PARTITIONS, NEW_PROJECT_CONTEXT } from '@aws-cdk/cx-api';
5-
import { CdkCliWrapper, ICdk } from 'cdk-cli-wrapper';
66
import * as fs from 'fs-extra';
77
import { IntegTestSuite, LegacyIntegTestSuite } from './integ-test-suite';
88
import { IntegTest } from './integration-tests';

packages/@aws-cdk/integ-runner/package.json

+5-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"BSD-2-Clause",
4242
"0BSD"
4343
],
44-
"dontAttribute": "^@aws-cdk/|^cdk-assets$|^cdk-cli-wrapper$",
44+
"dontAttribute": "^@aws-cdk/|^cdk-assets$",
4545
"test": "bin/integ-runner --version"
4646
}
4747
},
@@ -70,7 +70,7 @@
7070
"@aws-cdk/cloudformation-diff": "0.0.0",
7171
"@aws-cdk/cx-api": "0.0.0",
7272
"cdk-assets": "0.0.0",
73-
"cdk-cli-wrapper": "0.0.0",
73+
"@aws-cdk/cdk-cli-wrapper": "0.0.0",
7474
"aws-cdk": "0.0.0",
7575
"chalk": "^4",
7676
"fs-extra": "^9.1.0",
@@ -101,5 +101,8 @@
101101
"maturity": "experimental",
102102
"publishConfig": {
103103
"tag": "latest"
104+
},
105+
"peerDependencies": {
106+
"@aws-cdk/cdk-cli-wrapper": "0.0.0"
104107
}
105108
}

packages/@aws-cdk/integ-runner/test/helpers.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ICdk, CdkCliWrapper, CdkCliWrapperOptions, SynthFastOptions, DestroyOptions, ListOptions, SynthOptions, DeployOptions } from 'cdk-cli-wrapper';
1+
import { ICdk, CdkCliWrapper, CdkCliWrapperOptions, SynthFastOptions, DestroyOptions, ListOptions, SynthOptions, DeployOptions } from '@aws-cdk/cdk-cli-wrapper';
22
import { IntegSnapshotRunner, IntegTest } from '../lib/runner';
33
import { DestructiveChange, Diagnostic } from '../lib/workers';
44

@@ -84,4 +84,4 @@ export class MockCdkProvider {
8484

8585
return results;
8686
}
87-
}
87+
}

0 commit comments

Comments
 (0)