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*

packages/cdk-cli-wrapper/.gitignore → packages/@aws-cdk/cdk-cli-wrapper/.gitignore

@@ -5,7 +5,6 @@
 node_modules
 dist
 .jsii
-tsconfig.json
 
 # Generated by generate.sh
 build-info.json

packages/cdk-cli-wrapper/package.json → packages/@aws-cdk/cdk-cli-wrapper/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "cdk-cli-wrapper",
+  "name": "@aws-cdk/cdk-cli-wrapper",
   "description": "CDK CLI Wrapper Library",
   "private": true,
   "version": "0.0.0",
@@ -17,42 +17,8 @@
     "build+test+package": "yarn build+test && yarn package",
     "build+test": "yarn build && yarn test",
     "compat": "cdk-compat",
-    "rosetta:extract": "yarn --silent jsii-rosetta extract",
-    "build+extract": "yarn build && yarn rosetta:extract",
-    "build+test+extract": "yarn build+test && yarn rosetta:extract"
-  },
-  "jsii": {
-    "outdir": "dist",
-    "targets": {
-      "java": {
-        "package": "software.amazon.awscdk.cdkcliwrapper",
-        "maven": {
-          "groupId": "software.amazon.awscdk",
-          "artifactId": "cdk-cli-wrapper"
-        }
-      },
-      "dotnet": {
-        "namespace": "Amazon.CDK.CdkCliWrapper",
-        "packageId": "Amazon.CDK.CdkCliWrapper",
-        "iconUrl": "https://raw.githubusercontent.com/aws/aws-cdk/main/logo/default-256-dark.png"
-      },
-      "python": {
-        "distName": "aws-cdk.cdk-cli-wrapper",
-        "module": "aws_cdk.cdk_cli_wrapper",
-        "classifiers": [
-          "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 2"
-        ]
-      }
-    },
-    "projectReferences": true,
-    "metadata": {
-      "jsii": {
-        "rosetta": {
-          "strict": true
-        }
-      }
-    }
+    "build+extract": "yarn build",
+    "build+test+extract": "yarn build+test"
   },
   "author": {
     "name": "Amazon Web Services",
@@ -69,7 +35,7 @@
   "repository": {
     "url": "https://github.com/aws/aws-cdk.git",
     "type": "git",
-    "directory": "packages/cdk-cli-wrapper"
+    "directory": "packages/@aws-cdk/cdk-cli-wrapper"
   },
   "keywords": [
     "aws",

packages/@aws-cdk/cdk-cli-wrapper/tsconfig.json

@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "target": "ES2020",
+        "module": "commonjs",
+        "lib": ["es2020"],
+        "strict": true,
+        "alwaysStrict": true,
+        "declaration": true,
+        "inlineSourceMap": true,
+        "inlineSources": true,
+        "noUnusedLocals": true,
+        "noUnusedParameters": true,
+        "noImplicitReturns": true,
+        "noFallthroughCasesInSwitch": true,
+        "resolveJsonModule": true,
+        "composite": true,
+        "incremental": true
+    },
+    "include": [
+        "**/*.ts"
+    ],
+    "exclude": [
+      "node_modules"
+    ]
+}

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

@@ -1,6 +1,6 @@
 import * as path from 'path';
+import { DeployOptions, DestroyOptions } from '@aws-cdk/cdk-cli-wrapper';
 import { RequireApproval } from '@aws-cdk/cloud-assembly-schema';
-import { DeployOptions, DestroyOptions } from 'cdk-cli-wrapper';
 import * as fs from 'fs-extra';
 import { IntegRunnerOptions, IntegRunner, DEFAULT_SYNTH_OPTIONS } from './runner-base';
 import * as logger from '../logger';

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

@@ -1,6 +1,6 @@
 import * as osPath from 'path';
+import { ICdk, ListOptions } from '@aws-cdk/cdk-cli-wrapper';
 import { TestCase, TestOptions, Manifest, IntegManifest } from '@aws-cdk/cloud-assembly-schema';
-import { ICdk, ListOptions } from 'cdk-cli-wrapper';
 import * as fs from 'fs-extra';
 import { IntegManifestReader } from './private/integ-manifest';
 

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

@@ -1,8 +1,8 @@
 /* eslint-disable @aws-cdk/no-literal-partition */
 import * as path from 'path';
+import { CdkCliWrapper, ICdk } from '@aws-cdk/cdk-cli-wrapper';
 import { TestCase, DefaultCdkOptions } from '@aws-cdk/cloud-assembly-schema';
 import { AVAILABILITY_ZONE_FALLBACK_CONTEXT_KEY, TARGET_PARTITIONS, NEW_PROJECT_CONTEXT } from '@aws-cdk/cx-api';
-import { CdkCliWrapper, ICdk } from 'cdk-cli-wrapper';
 import * as fs from 'fs-extra';
 import { IntegTestSuite, LegacyIntegTestSuite } from './integ-test-suite';
 import { IntegTest } from './integration-tests';

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

@@ -41,7 +41,7 @@
         "BSD-2-Clause",
         "0BSD"
       ],
-      "dontAttribute": "^@aws-cdk/|^cdk-assets$|^cdk-cli-wrapper$",
+      "dontAttribute": "^@aws-cdk/|^cdk-assets$",
       "test": "bin/integ-runner --version"
     }
   },
@@ -70,7 +70,7 @@
     "@aws-cdk/cloudformation-diff": "0.0.0",
     "@aws-cdk/cx-api": "0.0.0",
     "cdk-assets": "0.0.0",
-    "cdk-cli-wrapper": "0.0.0",
+    "@aws-cdk/cdk-cli-wrapper": "0.0.0",
     "aws-cdk": "0.0.0",
     "chalk": "^4",
     "fs-extra": "^9.1.0",
@@ -101,5 +101,8 @@
   "maturity": "experimental",
   "publishConfig": {
     "tag": "latest"
+  },
+  "peerDependencies": {
+    "@aws-cdk/cdk-cli-wrapper": "0.0.0"
   }
 }

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

@@ -1,4 +1,4 @@
-import { ICdk, CdkCliWrapper, CdkCliWrapperOptions, SynthFastOptions, DestroyOptions, ListOptions, SynthOptions, DeployOptions } from 'cdk-cli-wrapper';
+import { ICdk, CdkCliWrapper, CdkCliWrapperOptions, SynthFastOptions, DestroyOptions, ListOptions, SynthOptions, DeployOptions } from '@aws-cdk/cdk-cli-wrapper';
 import { IntegSnapshotRunner, IntegTest } from '../lib/runner';
 import { DestructiveChange, Diagnostic } from '../lib/workers';
 
@@ -84,4 +84,4 @@ export class MockCdkProvider {
 
     return results;
   }
-}
+}