@aws-cdk/asset-awscli-v1 2.2.187 → 2.2.188

package/.gitattributes

@@ -10,6 +10,7 @@
 /.github/workflows/release-awscli-v1.yml linguist-generated
 /.github/workflows/upgrade-awscli-v1-main.yml linguist-generated
 /.github/workflows/upgrade-awscli-v2-main.yml linguist-generated
+/.github/workflows/upgrade-cdklabs-projen-project-types-awscli-v1-main.yml linguist-generated
 /.gitignore linguist-generated
 /.mergify.yml linguist-generated
 /.npmignore linguist-generated

package/.jsii

@@ -1,7 +1,8 @@
 {
   "author": {
     "email": "aws-cdk-dev@amazon.com",
-    "name": "Amazon Web Services, Inc.",
+    "name": "Amazon Web Services",
+    "organization": true,
     "roles": [
       "author"
     ]
@@ -58,6 +59,6 @@
     }
   },
   "types": {},
-  "version": "2.2.187",
-  "fingerprint": "KSYuyiK8hmuHdnp6703zMZo76iQTA8lauxa8l93o7go="
+  "version": "2.2.188",
+  "fingerprint": "dV6HEuvewnT3Y+ElJAyVCksIsIFLAgaALRKSsY+qysg="
 }

package/.projenrc.ts

@@ -1,13 +1,13 @@
-import { awscdk, DependencyType } from 'projen';
-import { NpmAccess } from 'projen/lib/javascript';
-import { WorkflowNoDockerPatch } from './projenrc/workflow-no-docker-patch';
+import { CdklabsConstructLibrary } from 'cdklabs-projen-project-types';
+import { DependencyType } from 'projen';
 
 const MAJOR_VERSION = 1;
 const releaseWorkflowName = `release-awscli-v${MAJOR_VERSION}`;
 const defaultReleaseBranchName = `awscli-v${MAJOR_VERSION}/main`;
 
-const project = new awscdk.AwsCdkConstructLibrary({
+const project = new CdklabsConstructLibrary({
   projenrcTs: true,
+  private: false,
   author: 'Amazon Web Services, Inc.',
   authorAddress: 'aws-cdk-dev@amazon.com',
   cdkVersion: '2.0.0',
@@ -30,10 +30,13 @@ const project = new awscdk.AwsCdkConstructLibrary({
     },
   },
   majorVersion: 2,
-  npmAccess: NpmAccess.PUBLIC,
   releaseTagPrefix: `awscli-v${MAJOR_VERSION}`,
   releaseWorkflowName: releaseWorkflowName,
   defaultReleaseBranch: defaultReleaseBranchName,
+  workflowNodeVersion: '16.x',
+  minNodeVersion: '16.0.0',
+  stability: 'stable',
+  setNodeEngineVersion: false,
   publishToPypi: {
     distName: `aws-cdk.asset-awscli-v${MAJOR_VERSION}`,
     module: `aws_cdk.asset_awscli_v${MAJOR_VERSION}`,
@@ -67,29 +70,6 @@ project.deps.addDependency('aws-cdk-lib@^2.0.0', DependencyType.DEVENV);
 project.deps.addDependency('@aws-cdk/integ-runner@^2.45.0', DependencyType.DEVENV);
 project.deps.addDependency('@aws-cdk/integ-tests-alpha@^2.45.0-alpha.0', DependencyType.DEVENV);
 
-// Fix Docker on GitHub
-new WorkflowNoDockerPatch(project, { workflow: 'build' });
-new WorkflowNoDockerPatch(project, { workflow: 'release', workflowName: 'release-awscli-v1' });
-
 project.preCompileTask.exec('layer/build.sh');
 
-const integSnapshotTask = project.addTask('integ', {
-  description: 'Run integration snapshot tests',
-  exec: 'yarn integ-runner --language typescript',
-});
-
-project.addTask('integ:update', {
-  description: 'Run and update integration snapshot tests',
-  exec: 'yarn integ-runner --language typescript --update-on-failed',
-  receiveArgs: true,
-});
-
-const rosettaTask = project.addTask('rosetta:extract', {
-  description: 'Test rosetta extract',
-  exec: 'yarn --silent jsii-rosetta extract',
-});
-
-project.testTask.spawn(integSnapshotTask);
-project.postCompileTask.spawn(rosettaTask);
-project.addGitIgnore('.jsii.tabl.json');
 project.synth();

package/package.json

@@ -33,13 +33,14 @@
     "test:watch": "npx projen test:watch",
     "unbump": "npx projen unbump",
     "upgrade": "npx projen upgrade",
+    "upgrade-cdklabs-projen-project-types": "npx projen upgrade-cdklabs-projen-project-types",
     "watch": "npx projen watch",
     "projen": "npx projen"
   },
   "author": {
-    "name": "Amazon Web Services, Inc.",
+    "name": "Amazon Web Services",
     "email": "aws-cdk-dev@amazon.com",
-    "organization": false
+    "organization": true
   },
   "devDependencies": {
     "@aws-cdk/integ-runner": "^2.45.0",
@@ -49,6 +50,7 @@
     "@typescript-eslint/eslint-plugin": "^5",
     "@typescript-eslint/parser": "^5",
     "aws-cdk-lib": "^2.0.0",
+    "cdklabs-projen-project-types": "^0.1.135",
     "constructs": "^10.0.5",
     "eslint": "^8",
     "eslint-import-resolver-node": "^0.3.7",
@@ -61,7 +63,7 @@
     "jsii-docgen": "^7.2.9",
     "jsii-pacmak": "^1.82.0",
     "npm-check-updates": "^16",
-    "projen": "^0.71.68",
+    "projen": "^0.71.90",
     "standard-version": "^9",
     "ts-jest": "^27",
     "ts-node": "^10.9.1",
@@ -80,7 +82,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "2.2.187",
+  "version": "2.2.188",
   "jest": {
     "testMatch": [
       "<rootDir>/src/**/__tests__/**/*.ts?(x)",

package/projenrc/workflow-no-docker-patch.ts

@@ -1,30 +0,0 @@
-import { JsonPatch } from 'projen';
-import { NodeProject } from 'projen/lib/javascript';
-
-export interface WorkflowDockerPatchOptions {
-  /**
-   * The workflow to patch.
-   */
-  workflow: 'build' | 'release';
-  /**
-   * Name of the workflow.
-   * @default - same as `workflow`
-   */
-  workflowName?: string;
-}
-
-export class WorkflowNoDockerPatch {
-  public constructor(project: NodeProject, options: WorkflowDockerPatchOptions) {
-    const workflow = options.workflow;
-    const workflowName = options.workflowName ?? options.workflow;
-
-    project.tryFindObjectFile(`.github/workflows/${workflowName}.yml`)?.patch(
-      JsonPatch.add(`/jobs/${workflow}/steps/`, {
-        name: 'Setup Node.js',
-        uses: 'actions/setup-node@v3',
-        with: { 'node-version': project.minNodeVersion ?? '14.x' },
-      }),
-      JsonPatch.remove(`/jobs/${workflow}/container`),
-    );
-  }
-}