cdk-ecr-deployment 2.5.3 → 2.5.6
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/.jsii +3 -3
- package/README.md +2 -0
- package/changelog.md +1 -8
- package/lambda/Dockerfile +3 -1
- package/lib/index.js +3 -3
- package/node_modules/got/dist/source/as-promise/index.js +1 -1
- package/node_modules/got/dist/source/core/index.js +8 -0
- package/node_modules/got/dist/source/types.d.ts +8 -8
- package/node_modules/got/package.json +1 -1
- package/package.json +1 -1
- package/releasetag.txt +1 -1
- package/version.txt +1 -1
package/.jsii
CHANGED
|
@@ -2872,7 +2872,7 @@
|
|
|
2872
2872
|
},
|
|
2873
2873
|
"name": "cdk-ecr-deployment",
|
|
2874
2874
|
"readme": {
|
|
2875
|
-
"markdown": "# cdk-ecr-deployment\n\n[](https://github.com/cdklabs/cdk-ecr-deployment/actions/workflows/release.yml)\n[](https://www.npmjs.com/package/cdk-ecr-deployment)\n[](https://pypi.org/project/cdk-ecr-deployment)\n[](https://www.npmjs.com/package/cdk-ecr-deployment)\n[](https://pypi.org/project/cdk-ecr-deployment)\n\nCDK construct to synchronize single docker image between docker registries.\n\n⚠️ Please use ^1.0.0 for cdk version 1.x.x, use ^2.0.0 for cdk version 2.x.x\n\n## Features\n\n- Copy image from ECR/external registry to (another) ECR/external registry\n- Copy an archive tarball image from s3 to ECR/external registry\n\n## Environment variables\n\nEnable flags: `true`, `1`. e.g. `export CI=1`\n\n- `CI` indicate if it's CI environment. This flag will enable building lambda from scratch.\n- `NO_PREBUILT_LAMBDA` disable using prebuilt lambda.\n- `FORCE_PREBUILT_LAMBDA` force using prebuilt lambda.\n\n⚠️ If you want to force using prebuilt lambda in CI environment to reduce build time. Try `export FORCE_PREBUILT_LAMBDA=1`.\n\n## Examples\n\n```ts\nimport { DockerImageAsset } from 'aws-cdk-lib/aws-ecr-assets';\nimport * as ecrdeploy from 'cdk-ecr-deployment';\n\nconst image = new DockerImageAsset(this, 'CDKDockerImage', {\n directory: path.join(__dirname, 'docker'),\n});\n\n// Copy from cdk docker image asset to another ECR.\nnew ecrdeploy.ECRDeployment(this, 'DeployDockerImage1', {\n src: new ecrdeploy.DockerImageName(image.imageUri),\n dest: new ecrdeploy.DockerImageName(`${cdk.Aws.ACCOUNT_ID}.dkr.ecr.us-west-2.amazonaws.com/my-nginx:latest`),\n});\n\n// Copy from docker registry to ECR.\nnew ecrdeploy.ECRDeployment(this, 'DeployDockerImage2', {\n src: new ecrdeploy.DockerImageName('nginx:latest'),\n dest: new ecrdeploy.DockerImageName(`${cdk.Aws.ACCOUNT_ID}.dkr.ecr.us-west-2.amazonaws.com/my-nginx2:latest`),\n});\n\n// Copy from private docker registry to ECR.\n// The format of secret in aws secrets manager must be plain text! e.g. <username>:<password>\nnew ecrdeploy.ECRDeployment(this, 'DeployDockerImage3', {\n src: new ecrdeploy.DockerImageName('javacs3/nginx:latest', 'username:password'),\n // src: new ecrdeploy.DockerImageName('javacs3/nginx:latest', 'aws-secrets-manager-secret-name'),\n // src: new ecrdeploy.DockerImageName('javacs3/nginx:latest', 'arn:aws:secretsmanager:us-west-2:000000000000:secret:id'),\n dest: new ecrdeploy.DockerImageName(`${cdk.Aws.ACCOUNT_ID}.dkr.ecr.us-west-2.amazonaws.com/my-nginx3:latest`),\n}).addToPrincipalPolicy(new iam.PolicyStatement({\n effect: iam.Effect.ALLOW,\n actions: [\n 'secretsmanager:GetSecretValue',\n ],\n resources: ['*'],\n}));\n```\n\n## Sample: [test/integ.ecr-deployment.ts](./test/integ.ecr-deployment.ts)\n\n```shell\n# Run the following command to try the sample.\nNO_PREBUILT_LAMBDA=1 npx cdk deploy -a \"npx ts-node -P tsconfig.dev.json --prefer-ts-exts test/integ.ecr-deployment.ts\"\n```\n\n## [API](./API.md)\n\n## Tech Details & Contribution\n\nThe core of this project relies on [containers/image](https://github.com/containers/image) which is used by [Skopeo](https://github.com/containers/skopeo).\nPlease take a look at those projects before contribution.\n\nTo support a new docker image source(like docker tarball in s3), you need to implement [image transport interface](https://github.com/containers/image/blob/master/types/types.go). You could take a look at [docker-archive](https://github.com/containers/image/blob/ccb87a8d0f45cf28846e307eb0ec2b9d38a458c2/docker/archive/transport.go) transport for a good start.\n\nTo test the `lambda` folder, `make test`.\n"
|
|
2875
|
+
"markdown": "# cdk-ecr-deployment\n\n[](https://github.com/cdklabs/cdk-ecr-deployment/actions/workflows/release.yml)\n[](https://www.npmjs.com/package/cdk-ecr-deployment)\n[](https://pypi.org/project/cdk-ecr-deployment)\n[](https://www.npmjs.com/package/cdk-ecr-deployment)\n[](https://pypi.org/project/cdk-ecr-deployment)\n\nCDK construct to synchronize single docker image between docker registries.\n\n⚠️ Please use ^1.0.0 for cdk version 1.x.x, use ^2.0.0 for cdk version 2.x.x\n\n## Features\n\n- Copy image from ECR/external registry to (another) ECR/external registry\n- Copy an archive tarball image from s3 to ECR/external registry\n\n## Environment variables\n\nEnable flags: `true`, `1`. e.g. `export CI=1`\n\n- `CI` indicate if it's CI environment. This flag will enable building lambda from scratch.\n- `NO_PREBUILT_LAMBDA` disable using prebuilt lambda.\n- `FORCE_PREBUILT_LAMBDA` force using prebuilt lambda.\n\n⚠️ If you want to force using prebuilt lambda in CI environment to reduce build time. Try `export FORCE_PREBUILT_LAMBDA=1`.\n\n⚠️ The above flags are only available in cdk-ecr-deployment 2.x.\n\n## Examples\n\n```ts\nimport { DockerImageAsset } from 'aws-cdk-lib/aws-ecr-assets';\nimport * as ecrdeploy from 'cdk-ecr-deployment';\n\nconst image = new DockerImageAsset(this, 'CDKDockerImage', {\n directory: path.join(__dirname, 'docker'),\n});\n\n// Copy from cdk docker image asset to another ECR.\nnew ecrdeploy.ECRDeployment(this, 'DeployDockerImage1', {\n src: new ecrdeploy.DockerImageName(image.imageUri),\n dest: new ecrdeploy.DockerImageName(`${cdk.Aws.ACCOUNT_ID}.dkr.ecr.us-west-2.amazonaws.com/my-nginx:latest`),\n});\n\n// Copy from docker registry to ECR.\nnew ecrdeploy.ECRDeployment(this, 'DeployDockerImage2', {\n src: new ecrdeploy.DockerImageName('nginx:latest'),\n dest: new ecrdeploy.DockerImageName(`${cdk.Aws.ACCOUNT_ID}.dkr.ecr.us-west-2.amazonaws.com/my-nginx2:latest`),\n});\n\n// Copy from private docker registry to ECR.\n// The format of secret in aws secrets manager must be plain text! e.g. <username>:<password>\nnew ecrdeploy.ECRDeployment(this, 'DeployDockerImage3', {\n src: new ecrdeploy.DockerImageName('javacs3/nginx:latest', 'username:password'),\n // src: new ecrdeploy.DockerImageName('javacs3/nginx:latest', 'aws-secrets-manager-secret-name'),\n // src: new ecrdeploy.DockerImageName('javacs3/nginx:latest', 'arn:aws:secretsmanager:us-west-2:000000000000:secret:id'),\n dest: new ecrdeploy.DockerImageName(`${cdk.Aws.ACCOUNT_ID}.dkr.ecr.us-west-2.amazonaws.com/my-nginx3:latest`),\n}).addToPrincipalPolicy(new iam.PolicyStatement({\n effect: iam.Effect.ALLOW,\n actions: [\n 'secretsmanager:GetSecretValue',\n ],\n resources: ['*'],\n}));\n```\n\n## Sample: [test/integ.ecr-deployment.ts](./test/integ.ecr-deployment.ts)\n\n```shell\n# Run the following command to try the sample.\nNO_PREBUILT_LAMBDA=1 npx cdk deploy -a \"npx ts-node -P tsconfig.dev.json --prefer-ts-exts test/integ.ecr-deployment.ts\"\n```\n\n## [API](./API.md)\n\n## Tech Details & Contribution\n\nThe core of this project relies on [containers/image](https://github.com/containers/image) which is used by [Skopeo](https://github.com/containers/skopeo).\nPlease take a look at those projects before contribution.\n\nTo support a new docker image source(like docker tarball in s3), you need to implement [image transport interface](https://github.com/containers/image/blob/master/types/types.go). You could take a look at [docker-archive](https://github.com/containers/image/blob/ccb87a8d0f45cf28846e307eb0ec2b9d38a458c2/docker/archive/transport.go) transport for a good start.\n\nTo test the `lambda` folder, `make test`.\n"
|
|
2876
2876
|
},
|
|
2877
2877
|
"repository": {
|
|
2878
2878
|
"type": "git",
|
|
@@ -3330,6 +3330,6 @@
|
|
|
3330
3330
|
"symbolId": "src/index:S3ArchiveName"
|
|
3331
3331
|
}
|
|
3332
3332
|
},
|
|
3333
|
-
"version": "2.5.
|
|
3334
|
-
"fingerprint": "
|
|
3333
|
+
"version": "2.5.6",
|
|
3334
|
+
"fingerprint": "iMa29QZkXj60xotWUssQvTdWzJLBmSbFLcyDHryTHKw="
|
|
3335
3335
|
}
|
package/README.md
CHANGED
|
@@ -25,6 +25,8 @@ Enable flags: `true`, `1`. e.g. `export CI=1`
|
|
|
25
25
|
|
|
26
26
|
⚠️ If you want to force using prebuilt lambda in CI environment to reduce build time. Try `export FORCE_PREBUILT_LAMBDA=1`.
|
|
27
27
|
|
|
28
|
+
⚠️ The above flags are only available in cdk-ecr-deployment 2.x.
|
|
29
|
+
|
|
28
30
|
## Examples
|
|
29
31
|
|
|
30
32
|
```ts
|
package/changelog.md
CHANGED
|
@@ -1,9 +1,2 @@
|
|
|
1
1
|
|
|
2
|
-
### [2.5.
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
### Bug Fixes
|
|
6
|
-
|
|
7
|
-
* GOPROXY naming conflicts ([303e3b4](https://github.com/cdklabs/cdk-ecr-deployment/commit/303e3b478d78830cdac24e2c8a3b735e2ce74a45))
|
|
8
|
-
* security issues ([2f10629](https://github.com/cdklabs/cdk-ecr-deployment/commit/2f106294febd2d6602b6e43dda4c57af71c779fc))
|
|
9
|
-
* wrong ARG position leading to GOPROXY unset ([66b66e5](https://github.com/cdklabs/cdk-ecr-deployment/commit/66b66e52770f7e37ea48343e95e29d368c52fac4))
|
|
2
|
+
### [2.5.6](https://github.com/cdklabs/cdk-ecr-deployment/compare/v2.5.5...v2.5.6) (2022-09-04)
|
package/lambda/Dockerfile
CHANGED
package/lib/index.js
CHANGED
|
@@ -52,7 +52,7 @@ class DockerImageName {
|
|
|
52
52
|
}
|
|
53
53
|
exports.DockerImageName = DockerImageName;
|
|
54
54
|
_a = JSII_RTTI_SYMBOL_1;
|
|
55
|
-
DockerImageName[_a] = { fqn: "cdk-ecr-deployment.DockerImageName", version: "2.5.
|
|
55
|
+
DockerImageName[_a] = { fqn: "cdk-ecr-deployment.DockerImageName", version: "2.5.6" };
|
|
56
56
|
/**
|
|
57
57
|
* @stability stable
|
|
58
58
|
*/
|
|
@@ -78,7 +78,7 @@ class S3ArchiveName {
|
|
|
78
78
|
}
|
|
79
79
|
exports.S3ArchiveName = S3ArchiveName;
|
|
80
80
|
_b = JSII_RTTI_SYMBOL_1;
|
|
81
|
-
S3ArchiveName[_b] = { fqn: "cdk-ecr-deployment.S3ArchiveName", version: "2.5.
|
|
81
|
+
S3ArchiveName[_b] = { fqn: "cdk-ecr-deployment.S3ArchiveName", version: "2.5.6" };
|
|
82
82
|
/**
|
|
83
83
|
* @stability stable
|
|
84
84
|
*/
|
|
@@ -171,5 +171,5 @@ class ECRDeployment extends constructs_1.Construct {
|
|
|
171
171
|
}
|
|
172
172
|
exports.ECRDeployment = ECRDeployment;
|
|
173
173
|
_c = JSII_RTTI_SYMBOL_1;
|
|
174
|
-
ECRDeployment[_c] = { fqn: "cdk-ecr-deployment.ECRDeployment", version: "2.5.
|
|
174
|
+
ECRDeployment[_c] = { fqn: "cdk-ecr-deployment.ECRDeployment", version: "2.5.6" };
|
|
175
175
|
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\n\n\nimport * as child_process from 'child_process';\nimport * as path from 'path';\nimport { aws_ec2 as ec2, aws_iam as iam, aws_lambda as lambda, Duration, CustomResource, Token } from 'aws-cdk-lib';\nimport { PolicyStatement, AddToPrincipalPolicyResult } from 'aws-cdk-lib/aws-iam';\nimport { Construct } from 'constructs';\nimport { shouldUsePrebuiltLambda } from './config';\n\nexport interface ECRDeploymentProps {\n\n                                                                                                                                                                                                                                                                                                                                                       \n  readonly buildImage?: string;\n                                                \n  readonly src: IImageName;\n\n                                                     \n  readonly dest: IImageName;\n\n                                                                                                                                                                                                                                                                                               \n  readonly memoryLimit?: number;\n\n                                                                                                                  \n  readonly role?: iam.IRole;\n\n                                                                                                   \n  readonly vpc?: ec2.IVpc;\n\n                                                                                                                                                                             \n  readonly vpcSubnets?: ec2.SubnetSelection;\n\n                                                \n  readonly environment?: { [key: string]: string };\n}\n\nexport interface IImageName {\n                                                                                                                   \n  readonly uri: string;\n\n                                                                                                                                                     \n  creds?: string;\n}\n\nfunction getCode(buildImage: string): lambda.AssetCode {\n  if (shouldUsePrebuiltLambda()) {\n    try {\n      console.log('Try to get prebuilt lambda');\n\n      const installScript = path.join(__dirname, '../lambda/install.js');\n      const prebuiltPath = path.join(__dirname, '../lambda/out');\n      child_process.execSync(`${process.argv0} ${installScript} ${prebuiltPath}`);\n\n      return lambda.Code.fromAsset(prebuiltPath);\n    } catch (err) {\n      console.warn(`Can not get prebuilt lambda: ${err}`);\n    }\n  }\n\n  console.log('Build lambda from scratch');\n\n  return lambda.Code.fromDockerBuild(path.join(__dirname, '../lambda'), {\n    buildArgs: {\n      buildImage,\n    },\n  });\n}\n\nexport class DockerImageName implements IImageName {\n  public constructor(private name: string, public creds?: string) { }\n  public get uri(): string { return `docker://${this.name}`; }\n}\n\nexport class S3ArchiveName implements IImageName {\n  private name: string;\n  public constructor(p: string, ref?: string, public creds?: string) {\n    this.name = p;\n    if (ref) {\n      this.name += ':' + ref;\n    }\n  }\n  public get uri(): string { return `s3://${this.name}`; }\n}\n\nexport class ECRDeployment extends Construct {\n  private handler: lambda.SingletonFunction;\n\n  constructor(scope: Construct, id: string, props: ECRDeploymentProps) {\n    super(scope, id);\n    const memoryLimit = props.memoryLimit ?? 512;\n    this.handler = new lambda.SingletonFunction(this, 'CustomResourceHandler', {\n      uuid: this.renderSingletonUuid(memoryLimit),\n      code: getCode(props.buildImage ?? 'public.ecr.aws/sam/build-go1.x:latest'),\n      runtime: lambda.Runtime.GO_1_X,\n      handler: 'main',\n      environment: props.environment,\n      lambdaPurpose: 'Custom::CDKECRDeployment',\n      timeout: Duration.minutes(15),\n      role: props.role,\n      memorySize: memoryLimit,\n      vpc: props.vpc,\n      vpcSubnets: props.vpcSubnets,\n    });\n\n    const handlerRole = this.handler.role;\n    if (!handlerRole) { throw new Error('lambda.SingletonFunction should have created a Role'); }\n\n    handlerRole.addToPrincipalPolicy(\n      new iam.PolicyStatement({\n        effect: iam.Effect.ALLOW,\n        actions: [\n          'ecr:GetAuthorizationToken',\n          'ecr:BatchCheckLayerAvailability',\n          'ecr:GetDownloadUrlForLayer',\n          'ecr:GetRepositoryPolicy',\n          'ecr:DescribeRepositories',\n          'ecr:ListImages',\n          'ecr:DescribeImages',\n          'ecr:BatchGetImage',\n          'ecr:ListTagsForResource',\n          'ecr:DescribeImageScanFindings',\n          'ecr:InitiateLayerUpload',\n          'ecr:UploadLayerPart',\n          'ecr:CompleteLayerUpload',\n          'ecr:PutImage',\n        ],\n        resources: ['*'],\n      }));\n    handlerRole.addToPrincipalPolicy(new iam.PolicyStatement({\n      effect: iam.Effect.ALLOW,\n      actions: [\n        's3:GetObject',\n      ],\n      resources: ['*'],\n    }));\n\n    new CustomResource(this, 'CustomResource', {\n      serviceToken: this.handler.functionArn,\n      resourceType: 'Custom::CDKBucketDeployment',\n      properties: {\n        SrcImage: props.src.uri,\n        SrcCreds: props.src.creds,\n        DestImage: props.dest.uri,\n        DestCreds: props.dest.creds,\n      },\n    });\n  }\n\n  public addToPrincipalPolicy(statement: PolicyStatement): AddToPrincipalPolicyResult {\n    const handlerRole = this.handler.role;\n    if (!handlerRole) { throw new Error('lambda.SingletonFunction should have created a Role'); }\n\n    return handlerRole.addToPrincipalPolicy(statement);\n  }\n\n  private renderSingletonUuid(memoryLimit?: number) {\n    let uuid = 'bd07c930-edb9-4112-a20f-03f096f53666';\n\n    // if user specify a custom memory limit, define another singleton handler\n    // with this configuration. otherwise, it won't be possible to use multiple\n    // configurations since we have a singleton.\n    if (memoryLimit) {\n      if (Token.isUnresolved(memoryLimit)) {\n        throw new Error('Can\\'t use tokens when specifying \"memoryLimit\" since we use it to identify the singleton custom resource handler');\n      }\n\n      uuid += `-${memoryLimit.toString()}MiB`;\n    }\n\n    return uuid;\n  }\n}\n"]}
|
|
@@ -113,11 +113,11 @@ function asPromise(normalizedOptions) {
|
|
|
113
113
|
request._beforeError(new types_1.RequestError(error.message, error, request));
|
|
114
114
|
return;
|
|
115
115
|
}
|
|
116
|
+
globalResponse = response;
|
|
116
117
|
if (!is_response_ok_1.isResponseOk(response)) {
|
|
117
118
|
request._beforeError(new types_1.HTTPError(response));
|
|
118
119
|
return;
|
|
119
120
|
}
|
|
120
|
-
globalResponse = response;
|
|
121
121
|
resolve(request.options.resolveBodyOnly ? response.body : response);
|
|
122
122
|
});
|
|
123
123
|
const onError = (error) => {
|
|
@@ -866,6 +866,14 @@ class Request extends stream_1.Duplex {
|
|
|
866
866
|
const redirectUrl = new url_1.URL(redirectBuffer, url);
|
|
867
867
|
const redirectString = redirectUrl.toString();
|
|
868
868
|
decodeURI(redirectString);
|
|
869
|
+
// eslint-disable-next-line no-inner-declarations
|
|
870
|
+
function isUnixSocketURL(url) {
|
|
871
|
+
return url.protocol === 'unix:' || url.hostname === 'unix';
|
|
872
|
+
}
|
|
873
|
+
if (!isUnixSocketURL(url) && isUnixSocketURL(redirectUrl)) {
|
|
874
|
+
this._beforeError(new RequestError('Cannot redirect to UNIX socket', {}, this));
|
|
875
|
+
return;
|
|
876
|
+
}
|
|
869
877
|
// Redirecting to a different site, clear sensitive data.
|
|
870
878
|
if (redirectUrl.hostname !== url.hostname || redirectUrl.port !== url.port) {
|
|
871
879
|
if ('host' in options.headers) {
|
|
@@ -90,6 +90,14 @@ export declare type OptionsWithPagination<T = unknown, R = unknown> = Merge<Opti
|
|
|
90
90
|
An instance of `got.paginate`.
|
|
91
91
|
*/
|
|
92
92
|
export interface GotPaginate {
|
|
93
|
+
/**
|
|
94
|
+
Same as `GotPaginate.each`.
|
|
95
|
+
*/
|
|
96
|
+
<T, R = unknown>(url: string | URL, options?: OptionsWithPagination<T, R>): AsyncIterableIterator<T>;
|
|
97
|
+
/**
|
|
98
|
+
Same as `GotPaginate.each`.
|
|
99
|
+
*/
|
|
100
|
+
<T, R = unknown>(options?: OptionsWithPagination<T, R>): AsyncIterableIterator<T>;
|
|
93
101
|
/**
|
|
94
102
|
Returns an async iterator.
|
|
95
103
|
|
|
@@ -133,14 +141,6 @@ export interface GotPaginate {
|
|
|
133
141
|
```
|
|
134
142
|
*/
|
|
135
143
|
all: (<T, R = unknown>(url: string | URL, options?: OptionsWithPagination<T, R>) => Promise<T[]>) & (<T, R = unknown>(options?: OptionsWithPagination<T, R>) => Promise<T[]>);
|
|
136
|
-
/**
|
|
137
|
-
Same as `GotPaginate.each`.
|
|
138
|
-
*/
|
|
139
|
-
<T, R = unknown>(url: string | URL, options?: OptionsWithPagination<T, R>): AsyncIterableIterator<T>;
|
|
140
|
-
/**
|
|
141
|
-
Same as `GotPaginate.each`.
|
|
142
|
-
*/
|
|
143
|
-
<T, R = unknown>(options?: OptionsWithPagination<T, R>): AsyncIterableIterator<T>;
|
|
144
144
|
}
|
|
145
145
|
export interface GotRequestFunction {
|
|
146
146
|
(url: string | URL, options?: OptionsOfTextResponseBody): CancelableRequest<Response<string>>;
|
package/package.json
CHANGED
package/releasetag.txt
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
v2.5.
|
|
1
|
+
v2.5.6
|
package/version.txt
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
2.5.
|
|
1
|
+
2.5.6
|