cdk-ecr-deployment 2.4.1 → 2.4.2

package/.jsii

@@ -2872,7 +2872,7 @@
   },
   "name": "cdk-ecr-deployment",
   "readme": {
-    "markdown": "# cdk-ecr-deployment\n\n[![Release](https://github.com/cdklabs/cdk-ecr-deployment/actions/workflows/release.yml/badge.svg)](https://github.com/cdklabs/cdk-ecr-deployment/actions/workflows/release.yml)\n[![npm version](https://img.shields.io/npm/v/cdk-ecr-deployment)](https://www.npmjs.com/package/cdk-ecr-deployment)\n[![PyPI](https://img.shields.io/pypi/v/cdk-ecr-deployment)](https://pypi.org/project/cdk-ecr-deployment)\n[![npm](https://img.shields.io/npm/dw/cdk-ecr-deployment?label=npm%20downloads)](https://www.npmjs.com/package/cdk-ecr-deployment)\n[![PyPI - Downloads](https://img.shields.io/pypi/dw/cdk-ecr-deployment?label=pypi%20downloads)](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⚠️ Currently construct can authenticate to external registry only with basic auth, but credentials are put as plain text to template and logs. See issue [#171](https://github.com/cdklabs/cdk-ecr-deployment/issues/171).\n\n## Examples\n\nRun [test/integ.ecr-deployment.ts](./test/integ.ecr-deployment.ts)\n\n```shell\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## 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"
+    "markdown": "# cdk-ecr-deployment\n\n[![Release](https://github.com/cdklabs/cdk-ecr-deployment/actions/workflows/release.yml/badge.svg)](https://github.com/cdklabs/cdk-ecr-deployment/actions/workflows/release.yml)\n[![npm version](https://img.shields.io/npm/v/cdk-ecr-deployment)](https://www.npmjs.com/package/cdk-ecr-deployment)\n[![PyPI](https://img.shields.io/pypi/v/cdk-ecr-deployment)](https://pypi.org/project/cdk-ecr-deployment)\n[![npm](https://img.shields.io/npm/dw/cdk-ecr-deployment?label=npm%20downloads)](https://www.npmjs.com/package/cdk-ecr-deployment)\n[![PyPI - Downloads](https://img.shields.io/pypi/dw/cdk-ecr-deployment?label=pypi%20downloads)](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- Refer docker registry secret from aws secrets manager.\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"
   },
   "repository": {
     "type": "git",
@@ -3330,6 +3330,6 @@
       "symbolId": "src/index:S3ArchiveName"
     }
   },
-  "version": "2.4.1",
-  "fingerprint": "AZiJQofRk2hvl18KBQup0uCTcBBYLAp3Vt3kV8uDKvc="
+  "version": "2.4.2",
+  "fingerprint": "JbAV+dwvdoXnK0ddB+JJQL7h72yTWK2wuF26de7at4M="
 }

package/README.md

@@ -12,19 +12,57 @@ CDK construct to synchronize single docker image between docker registries.
 
 ## Features
 
-- Copy image from ECR/external registry to (another) ECR/external registry
-- Copy an archive tarball image from s3 to ECR/external registry
-
-⚠️ Currently construct can authenticate to external registry only with basic auth, but credentials are put as plain text to template and logs. See issue [#171](https://github.com/cdklabs/cdk-ecr-deployment/issues/171).
+- Copy image from ECR/external registry to (another) ECR/external registry.
+- Copy an archive tarball image from s3 to ECR/external registry.
+- Refer docker registry secret from aws secrets manager.
 
 ## Examples
 
-Run [test/integ.ecr-deployment.ts](./test/integ.ecr-deployment.ts)
+```ts
+import { DockerImageAsset } from 'aws-cdk-lib/aws-ecr-assets';
+import * as ecrdeploy from 'cdk-ecr-deployment';
+
+const image = new DockerImageAsset(this, 'CDKDockerImage', {
+  directory: path.join(__dirname, 'docker'),
+});
+
+// Copy from cdk docker image asset to another ECR.
+new ecrdeploy.ECRDeployment(this, 'DeployDockerImage1', {
+  src: new ecrdeploy.DockerImageName(image.imageUri),
+  dest: new ecrdeploy.DockerImageName(`${cdk.Aws.ACCOUNT_ID}.dkr.ecr.us-west-2.amazonaws.com/my-nginx:latest`),
+});
+
+// Copy from docker registry to ECR.
+new ecrdeploy.ECRDeployment(this, 'DeployDockerImage2', {
+  src: new ecrdeploy.DockerImageName('nginx:latest'),
+  dest: new ecrdeploy.DockerImageName(`${cdk.Aws.ACCOUNT_ID}.dkr.ecr.us-west-2.amazonaws.com/my-nginx2:latest`),
+});
+
+// Copy from private docker registry to ECR.
+// The format of secret in aws secrets manager must be plain text! e.g. <username>:<password>
+new ecrdeploy.ECRDeployment(this, 'DeployDockerImage3', {
+  src: new ecrdeploy.DockerImageName('javacs3/nginx:latest', 'username:password'),
+  // src: new ecrdeploy.DockerImageName('javacs3/nginx:latest', 'aws-secrets-manager-secret-name'),
+  // src: new ecrdeploy.DockerImageName('javacs3/nginx:latest', 'arn:aws:secretsmanager:us-west-2:000000000000:secret:id'),
+  dest: new ecrdeploy.DockerImageName(`${cdk.Aws.ACCOUNT_ID}.dkr.ecr.us-west-2.amazonaws.com/my-nginx3:latest`),
+}).addToPrincipalPolicy(new iam.PolicyStatement({
+  effect: iam.Effect.ALLOW,
+  actions: [
+    'secretsmanager:GetSecretValue',
+  ],
+  resources: ['*'],
+}));
+```
+
+## Sample: [test/integ.ecr-deployment.ts](./test/integ.ecr-deployment.ts)
 
 ```shell
+# Run the following command to try the sample.
 NO_PREBUILT_LAMBDA=1 npx cdk deploy -a "npx ts-node -P tsconfig.dev.json --prefer-ts-exts test/integ.ecr-deployment.ts"
 ```
 
+## [API](./API.md)
+
 ## Tech Details & Contribution
 
 The core of this project relies on [containers/image](https://github.com/containers/image) which is used by [Skopeo](https://github.com/containers/skopeo).

package/changelog.md

@@ -1,7 +1,2 @@
 
-### [2.4.1](https://github.com/cdklabs/cdk-ecr-deployment/compare/v2.4.0...v2.4.1) (2022-03-09)
-
-
-### Bug Fixes
-
-* README.md ([aa92eeb](https://github.com/cdklabs/cdk-ecr-deployment/commit/aa92eebe25594fdfae50ececc33631483ab5dd21))
+### [2.4.2](https://github.com/cdklabs/cdk-ecr-deployment/compare/v2.4.1...v2.4.2) (2022-03-20)

package/lib/index.js

@@ -55,7 +55,7 @@ class DockerImageName {
 }
 exports.DockerImageName = DockerImageName;
 _a = JSII_RTTI_SYMBOL_1;
-DockerImageName[_a] = { fqn: "cdk-ecr-deployment.DockerImageName", version: "2.4.1" };
+DockerImageName[_a] = { fqn: "cdk-ecr-deployment.DockerImageName", version: "2.4.2" };
 /**
  * @stability stable
  */
@@ -81,7 +81,7 @@ class S3ArchiveName {
 }
 exports.S3ArchiveName = S3ArchiveName;
 _b = JSII_RTTI_SYMBOL_1;
-S3ArchiveName[_b] = { fqn: "cdk-ecr-deployment.S3ArchiveName", version: "2.4.1" };
+S3ArchiveName[_b] = { fqn: "cdk-ecr-deployment.S3ArchiveName", version: "2.4.2" };
 /**
  * @stability stable
  */
@@ -174,5 +174,5 @@ class ECRDeployment extends constructs_1.Construct {
 }
 exports.ECRDeployment = ECRDeployment;
 _c = JSII_RTTI_SYMBOL_1;
-ECRDeployment[_c] = { fqn: "cdk-ecr-deployment.ECRDeployment", version: "2.4.1" };
+ECRDeployment[_c] = { fqn: "cdk-ecr-deployment.ECRDeployment", version: "2.4.2" };
 //# 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';\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\nconst TRUTHY = ['true', true, 1, '1'];\n\nfunction getCode(buildImage: string): lambda.AssetCode {\n  const { CI, NO_PREBUILT_LAMBDA } = process.env;\n  const isCI = CI && TRUTHY.includes(CI);\n  const isNoPrebuilt = NO_PREBUILT_LAMBDA && TRUTHY.includes(NO_PREBUILT_LAMBDA);\n\n  if (!(isCI || isNoPrebuilt)) {\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"]}

package/package.json

@@ -75,7 +75,7 @@
   ],
   "main": "lib/index.js",
   "license": "Apache-2.0",
-  "version": "2.4.1",
+  "version": "2.4.2",
   "jest": {
     "testMatch": [
       "<rootDir>/src/**/__tests__/**/*.ts?(x)",

package/releasetag.txt

@@ -1 +1 @@
-v2.4.1
+v2.4.2

package/version.txt

@@ -1 +1 @@
-2.4.1
+2.4.2