@aws-cdk/asset-awscli-v1 2.2.52 → 2.2.54

package/.jsii

@@ -11,7 +11,7 @@
     "stability": "stable"
   },
   "homepage": "https://github.com/cdklabs/awscdk-asset-awscli#readme",
-  "jsiiVersion": "1.73.0 (build 6faeda3)",
+  "jsiiVersion": "1.74.0 (build 6d08790)",
   "keywords": [
     "cdk"
   ],
@@ -58,6 +58,6 @@
     }
   },
   "types": {},
-  "version": "2.2.52",
-  "fingerprint": "Z63O8gEKD8plrrhuZ9CN31ulXrKy+lVmrOGRAjy0frM="
+  "version": "2.2.54",
+  "fingerprint": "ZhpCjwmvoHvk7TNRh6x6/7PYxsXGOnpMxafh26Cmc50="
 }

package/.jsii.tabl.json

@@ -0,0 +1,81 @@
+{
+  "version": "2",
+  "toolVersion": "1.74.0",
+  "snippets": {
+    "ee64d1d87ed8dbf0d7ef6309b39a074fbeadcea9d27c461650c4f33577a5df5d": {
+      "translations": {
+        "python": {
+          "source": "# AwsCliLayer bundles the AWS CLI in a lambda layer\nfrom aws_cdk.asset_awscli_v1 import ASSET_FILE, LAYER_SOURCE_DIR\nimport aws_cdk.aws_lambda as lambda_\nimport aws_cdk.aws_s3_assets as s3_assets\nfrom aws_cdk import FileSystem\n\n# fn: lambda.Function\n\nasset = s3_assets.Asset(self, \"layer-asset\",\n    path=ASSET_FILE,\n    asset_hash=FileSystem.fingerprint(LAYER_SOURCE_DIR)\n)\nfn.add_layers(lambda_.LayerVersion(self, \"AwsCliLayer\",\n    code=lambda_.Code.from_bucket(asset.bucket, asset.s3_object_key)\n))",
+          "version": "2"
+        },
+        "csharp": {
+          "source": "// AwsCliLayer bundles the AWS CLI in a lambda layer\nusing Aws.Cdk.Asset.Awscli.V1;\nusing Amazon.CDK.AWS.Lambda;\nusing Amazon.CDK.AWS.S3.Assets;\nusing Amazon.CDK;\n\nFunction fn;\n\nAsset asset = new Asset(this, \"layer-asset\", new AssetProps {\n    Path = ASSET_FILE,\n    AssetHash = FileSystem.Fingerprint(LAYER_SOURCE_DIR)\n});\nfn.AddLayers(new LayerVersion(this, \"AwsCliLayer\", new LayerVersionProps {\n    Code = Code.FromBucket(asset.Bucket, asset.S3ObjectKey)\n}));",
+          "version": "1"
+        },
+        "java": {
+          "source": "// AwsCliLayer bundles the AWS CLI in a lambda layer\nimport aws.cdk.asset.awscli.v1.ASSET_FILE;\nimport aws.cdk.asset.awscli.v1.LAYER_SOURCE_DIR;\nimport software.amazon.awscdk.services.lambda.*;\nimport software.amazon.awscdk.services.s3.assets.*;\nimport software.amazon.awscdk.FileSystem;\n\nFunction fn;\n\nAsset asset = Asset.Builder.create(this, \"layer-asset\")\n        .path(ASSET_FILE)\n        .assetHash(FileSystem.fingerprint(LAYER_SOURCE_DIR))\n        .build();\nfn.addLayers(LayerVersion.Builder.create(this, \"AwsCliLayer\")\n        .code(Code.fromBucket(asset.getBucket(), asset.getS3ObjectKey()))\n        .build());",
+          "version": "1"
+        },
+        "go": {
+          "source": "// AwsCliLayer bundles the AWS CLI in a lambda layer\nimport \"github.com/aws-samples/dummy/awscdkassetawscliv1\"\nimport lambda \"github.com/aws/aws-cdk-go/awscdk\"\nimport s3_assets \"github.com/aws/aws-cdk-go/awscdk\"\nimport \"github.com/aws/aws-cdk-go/awscdk\"\n\nvar fn function\n\nasset := s3_assets.NewAsset(this, jsii.String(\"layer-asset\"), &assetProps{\n\tpath: *awscdkassetawscliv1.ASSET_FILE,\n\tassetHash: awscdk.FileSystem.fingerprint(*awscdkassetawscliv1.LAYER_SOURCE_DIR),\n})\nfn.addLayers(lambda.NewLayerVersion(this, jsii.String(\"AwsCliLayer\"), &layerVersionProps{\n\tcode: lambda.code.fromBucket(asset.bucket, asset.s3ObjectKey),\n}))",
+          "version": "1"
+        },
+        "$": {
+          "source": "// AwsCliLayer bundles the AWS CLI in a lambda layer\nimport { ASSET_FILE, LAYER_SOURCE_DIR } from '@aws-cdk/asset-awscli-v1';\nimport * as lambda from 'aws-cdk-lib/aws-lambda';\nimport * as s3_assets from 'aws-cdk-lib/aws-s3-assets';\nimport { FileSystem } from 'aws-cdk-lib';\n\ndeclare const fn: lambda.Function;\nconst asset = new s3_assets.Asset(this, 'layer-asset', {\n  path: ASSET_FILE,\n  assetHash: FileSystem.fingerprint(LAYER_SOURCE_DIR),\n});\nfn.addLayers(new lambda.LayerVersion(this, 'AwsCliLayer', {\n  code: lambda.Code.fromBucket(asset.bucket, asset.s3ObjectKey),\n}));",
+          "version": "0"
+        }
+      },
+      "location": {
+        "api": {
+          "api": "moduleReadme",
+          "moduleFqn": "@aws-cdk/asset-awscli-v1"
+        },
+        "field": {
+          "field": "markdown",
+          "line": 21
+        }
+      },
+      "didCompile": true,
+      "fqnsReferenced": [
+        "aws-cdk-lib.FileSystem#fingerprint",
+        "aws-cdk-lib.aws_lambda.Code",
+        "aws-cdk-lib.aws_lambda.Code#fromBucket",
+        "aws-cdk-lib.aws_lambda.Function#addLayers",
+        "aws-cdk-lib.aws_lambda.ILayerVersion",
+        "aws-cdk-lib.aws_lambda.LayerVersion",
+        "aws-cdk-lib.aws_lambda.LayerVersionProps",
+        "aws-cdk-lib.aws_s3.IBucket",
+        "aws-cdk-lib.aws_s3_assets.Asset",
+        "aws-cdk-lib.aws_s3_assets.Asset#bucket",
+        "aws-cdk-lib.aws_s3_assets.Asset#s3ObjectKey",
+        "aws-cdk-lib.aws_s3_assets.AssetProps",
+        "constructs.Construct"
+      ],
+      "fullSource": "// Hoisted imports begin after !show marker below\n/// !show\n// AwsCliLayer bundles the AWS CLI in a lambda layer\nimport { ASSET_FILE, LAYER_SOURCE_DIR } from '@aws-cdk/asset-awscli-v1';\nimport * as lambda from 'aws-cdk-lib/aws-lambda';\nimport * as s3_assets from 'aws-cdk-lib/aws-s3-assets';\nimport { FileSystem } from 'aws-cdk-lib';\n\ndeclare const fn: lambda.Function;\n/// !hide\n// Hoisted imports ended before !hide marker above\n// Fixture with packages imported, but nothing else\nimport { Construct } from 'constructs';\nimport {\n  Stack,\n} from 'aws-cdk-lib';\n\nclass Fixture extends Stack {\n  constructor(scope: Construct, id: string) {\n    super(scope, id);\n\n    // Code snippet begins after !show marker below\n/// !show\n\nconst asset = new s3_assets.Asset(this, 'layer-asset', {\n  path: ASSET_FILE,\n  assetHash: FileSystem.fingerprint(LAYER_SOURCE_DIR),\n});\nfn.addLayers(new lambda.LayerVersion(this, 'AwsCliLayer', {\n  code: lambda.Code.fromBucket(asset.bucket, asset.s3ObjectKey),\n}));\n/// !hide\n// Code snippet ended before !hide marker above\n  }\n}\n",
+      "syntaxKindCounter": {
+        "10": 6,
+        "75": 29,
+        "104": 2,
+        "130": 1,
+        "153": 1,
+        "169": 1,
+        "193": 2,
+        "194": 8,
+        "196": 3,
+        "197": 2,
+        "225": 2,
+        "226": 1,
+        "242": 2,
+        "243": 2,
+        "254": 4,
+        "255": 4,
+        "256": 2,
+        "257": 2,
+        "258": 3,
+        "281": 3,
+        "290": 1
+      },
+      "fqnsFingerprint": "62f5a38e295e2fd500946ee82fb1f0c3aa53e67b27938800aa23545bbcfec9af"
+    }
+  }
+}

package/.projenrc.ts

@@ -55,6 +55,8 @@ project.deps.removeDependency('constructs', DependencyType.PEER);
 project.deps.addDependency('constructs@^10.0.5', DependencyType.DEVENV);
 project.deps.removeDependency('aws-cdk-lib', DependencyType.PEER);
 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' });
@@ -62,4 +64,23 @@ new WorkflowNoDockerPatch(project, { workflow: 'release', workflowName: 'release
 
 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

@@ -15,12 +15,8 @@
     "docgen": "npx projen docgen",
     "eject": "npx projen eject",
     "eslint": "npx projen eslint",
-    "integ:awscli-asset:assert": "npx projen integ:awscli-asset:assert",
-    "integ:awscli-asset:deploy": "npx projen integ:awscli-asset:deploy",
-    "integ:awscli-asset:destroy": "npx projen integ:awscli-asset:destroy",
-    "integ:awscli-asset:snapshot": "npx projen integ:awscli-asset:snapshot",
-    "integ:awscli-asset:watch": "npx projen integ:awscli-asset:watch",
-    "integ:snapshot-all": "npx projen integ:snapshot-all",
+    "integ": "npx projen integ",
+    "integ:update": "npx projen integ:update",
     "package": "npx projen package",
     "package-all": "npx projen package-all",
     "package:dotnet": "npx projen package:dotnet",
@@ -32,6 +28,7 @@
     "post-upgrade": "npx projen post-upgrade",
     "pre-compile": "npx projen pre-compile",
     "release:awscli-v1/main": "npx projen release:awscli-v1/main",
+    "rosetta:extract": "npx projen rosetta:extract",
     "test": "npx projen test",
     "test:watch": "npx projen test:watch",
     "unbump": "npx projen unbump",
@@ -45,11 +42,12 @@
     "organization": false
   },
   "devDependencies": {
+    "@aws-cdk/integ-runner": "^2.45.0",
+    "@aws-cdk/integ-tests-alpha": "^2.45.0-alpha.0",
     "@types/jest": "^27",
     "@types/node": "^14",
     "@typescript-eslint/eslint-plugin": "^5",
     "@typescript-eslint/parser": "^5",
-    "aws-cdk": "^2",
     "aws-cdk-lib": "^2.0.0",
     "constructs": "^10.0.5",
     "eslint": "^8",
@@ -58,17 +56,16 @@
     "eslint-plugin-import": "^2.27.5",
     "jest": "^27",
     "jest-junit": "^13",
-    "jsii": "^1.73.0",
-    "jsii-diff": "^1.73.0",
-    "jsii-docgen": "^7.0.214",
-    "jsii-pacmak": "^1.73.0",
-    "json-schema": "^0.4.0",
+    "jsii": "^1.74.0",
+    "jsii-diff": "^1.74.0",
+    "jsii-docgen": "^7.0.220",
+    "jsii-pacmak": "^1.74.0",
     "npm-check-updates": "^16",
-    "projen": "^0.67.13",
+    "projen": "^0.67.29",
     "standard-version": "^9",
     "ts-jest": "^27",
     "ts-node": "^10.9.1",
-    "typescript": "^4.9.4"
+    "typescript": "^4.9.5"
   },
   "keywords": [
     "cdk"
@@ -79,7 +76,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "2.2.52",
+  "version": "2.2.54",
   "jest": {
     "testMatch": [
       "<rootDir>/src/**/__tests__/**/*.ts?(x)",

package/rosetta/default.ts-fixture

@@ -0,0 +1,13 @@
+// Fixture with packages imported, but nothing else
+import { Construct } from 'constructs';
+import {
+  Stack,
+} from 'aws-cdk-lib';
+
+class Fixture extends Stack {
+  constructor(scope: Construct, id: string) {
+    super(scope, id);
+
+    /// here
+  }
+}