@aws-cdk/asset-awscli-v1 2.2.187 → 2.2.189
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.gitattributes +1 -0
- package/.jsii +5 -4
- package/.jsii.tabl.json +1 -1
- package/.projenrc.ts +17 -29
- package/layer/build.sh +12 -4
- package/lib/index.js +7 -3
- package/lib/layer.zip +0 -0
- package/package.json +22 -17
- package/projenrc/workflow-no-docker-patch.ts +0 -30
package/.gitattributes
CHANGED
|
@@ -10,6 +10,7 @@
|
|
|
10
10
|
/.github/workflows/release-awscli-v1.yml linguist-generated
|
|
11
11
|
/.github/workflows/upgrade-awscli-v1-main.yml linguist-generated
|
|
12
12
|
/.github/workflows/upgrade-awscli-v2-main.yml linguist-generated
|
|
13
|
+
/.github/workflows/upgrade-cdklabs-projen-project-types-awscli-v1-main.yml linguist-generated
|
|
13
14
|
/.gitignore linguist-generated
|
|
14
15
|
/.mergify.yml linguist-generated
|
|
15
16
|
/.npmignore linguist-generated
|
package/.jsii
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
{
|
|
2
2
|
"author": {
|
|
3
3
|
"email": "aws-cdk-dev@amazon.com",
|
|
4
|
-
"name": "Amazon Web Services
|
|
4
|
+
"name": "Amazon Web Services",
|
|
5
|
+
"organization": true,
|
|
5
6
|
"roles": [
|
|
6
7
|
"author"
|
|
7
8
|
]
|
|
@@ -11,7 +12,7 @@
|
|
|
11
12
|
"stability": "stable"
|
|
12
13
|
},
|
|
13
14
|
"homepage": "https://github.com/cdklabs/awscdk-asset-awscli#readme",
|
|
14
|
-
"jsiiVersion": "1.
|
|
15
|
+
"jsiiVersion": "5.1.1 (build 1f91050)",
|
|
15
16
|
"keywords": [
|
|
16
17
|
"cdk"
|
|
17
18
|
],
|
|
@@ -58,6 +59,6 @@
|
|
|
58
59
|
}
|
|
59
60
|
},
|
|
60
61
|
"types": {},
|
|
61
|
-
"version": "2.2.
|
|
62
|
-
"fingerprint": "
|
|
62
|
+
"version": "2.2.189",
|
|
63
|
+
"fingerprint": "7Fr6gDnvys7zNPu7JI1o85FoA/YLkiZlzdPt8cEcduU="
|
|
63
64
|
}
|
package/.jsii.tabl.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":"2","toolVersion":"1.
|
|
1
|
+
{"version":"2","toolVersion":"5.1.1","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\nvar 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 \"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":{"11":6,"80":29,"110":2,"138":1,"165":1,"182":1,"209":2,"210":8,"212":3,"213":2,"242":2,"243":1,"259":2,"260":2,"271":4,"272":4,"273":2,"274":2,"275":3,"302":3,"311":1},"fqnsFingerprint":"62f5a38e295e2fd500946ee82fb1f0c3aa53e67b27938800aa23545bbcfec9af"}}}
|
package/.projenrc.ts
CHANGED
|
@@ -1,12 +1,14 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
import { WorkflowNoDockerPatch } from './projenrc/workflow-no-docker-patch';
|
|
1
|
+
import { CdklabsConstructLibrary } from 'cdklabs-projen-project-types';
|
|
2
|
+
import { DependencyType } from 'projen';
|
|
4
3
|
|
|
5
4
|
const MAJOR_VERSION = 1;
|
|
6
5
|
const releaseWorkflowName = `release-awscli-v${MAJOR_VERSION}`;
|
|
7
6
|
const defaultReleaseBranchName = `awscli-v${MAJOR_VERSION}/main`;
|
|
8
7
|
|
|
9
|
-
const project = new
|
|
8
|
+
const project = new CdklabsConstructLibrary({
|
|
9
|
+
setNodeEngineVersion: false,
|
|
10
|
+
stability: 'stable',
|
|
11
|
+
private: false,
|
|
10
12
|
projenrcTs: true,
|
|
11
13
|
author: 'Amazon Web Services, Inc.',
|
|
12
14
|
authorAddress: 'aws-cdk-dev@amazon.com',
|
|
@@ -30,10 +32,12 @@ const project = new awscdk.AwsCdkConstructLibrary({
|
|
|
30
32
|
},
|
|
31
33
|
},
|
|
32
34
|
majorVersion: 2,
|
|
33
|
-
npmAccess: NpmAccess.PUBLIC,
|
|
34
35
|
releaseTagPrefix: `awscli-v${MAJOR_VERSION}`,
|
|
35
36
|
releaseWorkflowName: releaseWorkflowName,
|
|
36
37
|
defaultReleaseBranch: defaultReleaseBranchName,
|
|
38
|
+
workflowNodeVersion: '16.x',
|
|
39
|
+
minNodeVersion: '16.0.0',
|
|
40
|
+
jsiiVersion: '^5',
|
|
37
41
|
publishToPypi: {
|
|
38
42
|
distName: `aws-cdk.asset-awscli-v${MAJOR_VERSION}`,
|
|
39
43
|
module: `aws_cdk.asset_awscli_v${MAJOR_VERSION}`,
|
|
@@ -64,32 +68,16 @@ project.deps.removeDependency('constructs', DependencyType.PEER);
|
|
|
64
68
|
project.deps.addDependency('constructs@^10.0.5', DependencyType.DEVENV);
|
|
65
69
|
project.deps.removeDependency('aws-cdk-lib', DependencyType.PEER);
|
|
66
70
|
project.deps.addDependency('aws-cdk-lib@^2.0.0', DependencyType.DEVENV);
|
|
67
|
-
project.deps.addDependency('@aws-cdk/integ-runner@^2.45.0', DependencyType.DEVENV);
|
|
68
|
-
project.deps.addDependency('@aws-cdk/integ-tests-alpha@^2.45.0-alpha.0', DependencyType.DEVENV);
|
|
69
71
|
|
|
70
|
-
//
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
description: 'Run integration snapshot tests',
|
|
78
|
-
exec: 'yarn integ-runner --language typescript',
|
|
79
|
-
});
|
|
80
|
-
|
|
81
|
-
project.addTask('integ:update', {
|
|
82
|
-
description: 'Run and update integration snapshot tests',
|
|
83
|
-
exec: 'yarn integ-runner --language typescript --update-on-failed',
|
|
84
|
-
receiveArgs: true,
|
|
72
|
+
// Rosetta
|
|
73
|
+
project.deps.addDependency('jsii-rosetta@^5', DependencyType.DEVENV);
|
|
74
|
+
project.package.addField('jsiiRosetta', {
|
|
75
|
+
exampleDependencies: {
|
|
76
|
+
'aws-cdk-lib': '^2.0.0',
|
|
77
|
+
'constructs': '^10.0.5',
|
|
78
|
+
},
|
|
85
79
|
});
|
|
86
80
|
|
|
87
|
-
|
|
88
|
-
description: 'Test rosetta extract',
|
|
89
|
-
exec: 'yarn --silent jsii-rosetta extract',
|
|
90
|
-
});
|
|
81
|
+
project.preCompileTask.exec('layer/build.sh');
|
|
91
82
|
|
|
92
|
-
project.testTask.spawn(integSnapshotTask);
|
|
93
|
-
project.postCompileTask.spawn(rosettaTask);
|
|
94
|
-
project.addGitIgnore('.jsii.tabl.json');
|
|
95
83
|
project.synth();
|
package/layer/build.sh
CHANGED
|
@@ -8,13 +8,21 @@ mkdir -p ../lib
|
|
|
8
8
|
echo ">> Building AWS Lambda layer inside a docker image..."
|
|
9
9
|
|
|
10
10
|
TAG='aws-lambda-layer'
|
|
11
|
+
if command -v docker >/dev/null; then
|
|
12
|
+
DOCKER=docker
|
|
13
|
+
elif command -v finch >/dev/null; then
|
|
14
|
+
DOCKER=finch
|
|
15
|
+
else
|
|
16
|
+
echo "Neither 'docker' nor 'finch' is available!"
|
|
17
|
+
exit 1
|
|
18
|
+
fi
|
|
11
19
|
|
|
12
|
-
|
|
20
|
+
${DOCKER} build -t ${TAG} .
|
|
13
21
|
|
|
14
22
|
echo ">> Extracting layer.zip from the build container..."
|
|
15
|
-
CONTAINER=$(
|
|
16
|
-
|
|
23
|
+
CONTAINER=$(${DOCKER} run -d ${TAG} -- -c 'sleep 60')
|
|
24
|
+
${DOCKER} cp ${CONTAINER}:/layer.zip ../lib/layer.zip
|
|
17
25
|
|
|
18
26
|
echo ">> Stopping container..."
|
|
19
|
-
|
|
27
|
+
${DOCKER} rm -f ${CONTAINER}
|
|
20
28
|
echo ">> lib/layer.zip is ready"
|
package/lib/index.js
CHANGED
|
@@ -1,14 +1,18 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
Object.
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
|
8
12
|
}));
|
|
9
13
|
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
10
|
-
for (var p in m) if (p !== "default" && !
|
|
14
|
+
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
11
15
|
};
|
|
12
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
17
|
__exportStar(require("./awscli-asset"), exports);
|
|
14
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
18
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLGlEQUErQiIsInNvdXJjZXNDb250ZW50IjpbImV4cG9ydCAqIGZyb20gJy4vYXdzY2xpLWFzc2V0JztcbiJdfQ==
|
package/lib/layer.zip
CHANGED
|
Binary file
|
package/package.json
CHANGED
|
@@ -33,43 +33,42 @@
|
|
|
33
33
|
"test:watch": "npx projen test:watch",
|
|
34
34
|
"unbump": "npx projen unbump",
|
|
35
35
|
"upgrade": "npx projen upgrade",
|
|
36
|
+
"upgrade-cdklabs-projen-project-types": "npx projen upgrade-cdklabs-projen-project-types",
|
|
36
37
|
"watch": "npx projen watch",
|
|
37
38
|
"projen": "npx projen"
|
|
38
39
|
},
|
|
39
40
|
"author": {
|
|
40
|
-
"name": "Amazon Web Services
|
|
41
|
+
"name": "Amazon Web Services",
|
|
41
42
|
"email": "aws-cdk-dev@amazon.com",
|
|
42
|
-
"organization":
|
|
43
|
+
"organization": true
|
|
43
44
|
},
|
|
44
45
|
"devDependencies": {
|
|
45
|
-
"@aws-cdk/integ-runner": "
|
|
46
|
-
"@aws-cdk/integ-tests-alpha": "
|
|
47
|
-
"@types/jest": "^
|
|
46
|
+
"@aws-cdk/integ-runner": "latest",
|
|
47
|
+
"@aws-cdk/integ-tests-alpha": "latest",
|
|
48
|
+
"@types/jest": "^29",
|
|
48
49
|
"@types/node": "^16",
|
|
49
50
|
"@typescript-eslint/eslint-plugin": "^5",
|
|
50
51
|
"@typescript-eslint/parser": "^5",
|
|
51
52
|
"aws-cdk-lib": "^2.0.0",
|
|
53
|
+
"cdklabs-projen-project-types": "^0.1.136",
|
|
52
54
|
"constructs": "^10.0.5",
|
|
53
55
|
"eslint": "^8",
|
|
54
56
|
"eslint-import-resolver-node": "^0.3.7",
|
|
55
57
|
"eslint-import-resolver-typescript": "^3.5.5",
|
|
56
58
|
"eslint-plugin-import": "^2.27.5",
|
|
57
|
-
"jest": "^
|
|
59
|
+
"jest": "^29",
|
|
58
60
|
"jest-junit": "^15",
|
|
59
|
-
"jsii": "
|
|
60
|
-
"jsii-diff": "^1.
|
|
61
|
+
"jsii": "^5",
|
|
62
|
+
"jsii-diff": "^1.83.0",
|
|
61
63
|
"jsii-docgen": "^7.2.9",
|
|
62
|
-
"jsii-pacmak": "^1.
|
|
64
|
+
"jsii-pacmak": "^1.83.0",
|
|
65
|
+
"jsii-rosetta": "^5",
|
|
63
66
|
"npm-check-updates": "^16",
|
|
64
|
-
"projen": "^0.71.
|
|
67
|
+
"projen": "^0.71.91",
|
|
65
68
|
"standard-version": "^9",
|
|
66
|
-
"ts-jest": "^
|
|
69
|
+
"ts-jest": "^29",
|
|
67
70
|
"ts-node": "^10.9.1",
|
|
68
|
-
"typescript": "^
|
|
69
|
-
},
|
|
70
|
-
"resolutions": {
|
|
71
|
-
"@types/babel__traverse": "7.18.2",
|
|
72
|
-
"@types/prettier": "2.6.0"
|
|
71
|
+
"typescript": "^5"
|
|
73
72
|
},
|
|
74
73
|
"keywords": [
|
|
75
74
|
"cdk"
|
|
@@ -80,7 +79,7 @@
|
|
|
80
79
|
"publishConfig": {
|
|
81
80
|
"access": "public"
|
|
82
81
|
},
|
|
83
|
-
"version": "2.2.
|
|
82
|
+
"version": "2.2.189",
|
|
84
83
|
"jest": {
|
|
85
84
|
"testMatch": [
|
|
86
85
|
"<rootDir>/src/**/__tests__/**/*.ts?(x)",
|
|
@@ -151,5 +150,11 @@
|
|
|
151
150
|
"rootDir": "src"
|
|
152
151
|
}
|
|
153
152
|
},
|
|
153
|
+
"jsiiRosetta": {
|
|
154
|
+
"exampleDependencies": {
|
|
155
|
+
"aws-cdk-lib": "^2.0.0",
|
|
156
|
+
"constructs": "^10.0.5"
|
|
157
|
+
}
|
|
158
|
+
},
|
|
154
159
|
"//": "~~ Generated by projen. To modify, edit .projenrc.ts and run \"npx projen\"."
|
|
155
160
|
}
|
|
@@ -1,30 +0,0 @@
|
|
|
1
|
-
import { JsonPatch } from 'projen';
|
|
2
|
-
import { NodeProject } from 'projen/lib/javascript';
|
|
3
|
-
|
|
4
|
-
export interface WorkflowDockerPatchOptions {
|
|
5
|
-
/**
|
|
6
|
-
* The workflow to patch.
|
|
7
|
-
*/
|
|
8
|
-
workflow: 'build' | 'release';
|
|
9
|
-
/**
|
|
10
|
-
* Name of the workflow.
|
|
11
|
-
* @default - same as `workflow`
|
|
12
|
-
*/
|
|
13
|
-
workflowName?: string;
|
|
14
|
-
}
|
|
15
|
-
|
|
16
|
-
export class WorkflowNoDockerPatch {
|
|
17
|
-
public constructor(project: NodeProject, options: WorkflowDockerPatchOptions) {
|
|
18
|
-
const workflow = options.workflow;
|
|
19
|
-
const workflowName = options.workflowName ?? options.workflow;
|
|
20
|
-
|
|
21
|
-
project.tryFindObjectFile(`.github/workflows/${workflowName}.yml`)?.patch(
|
|
22
|
-
JsonPatch.add(`/jobs/${workflow}/steps/`, {
|
|
23
|
-
name: 'Setup Node.js',
|
|
24
|
-
uses: 'actions/setup-node@v3',
|
|
25
|
-
with: { 'node-version': project.minNodeVersion ?? '14.x' },
|
|
26
|
-
}),
|
|
27
|
-
JsonPatch.remove(`/jobs/${workflow}/container`),
|
|
28
|
-
);
|
|
29
|
-
}
|
|
30
|
-
}
|