cdk-ecr-deployment 2.4.4 → 2.5.2

package/.gitattributes

@@ -9,7 +9,6 @@
 /.github/workflows/pull-request-lint.yml linguist-generated
 /.github/workflows/release-v1-main.yml linguist-generated
 /.github/workflows/release.yml linguist-generated
-/.github/workflows/stale.yml linguist-generated
 /.github/workflows/upgrade-main.yml linguist-generated
 /.github/workflows/upgrade-v1-main.yml linguist-generated
 /.gitignore linguist-generated

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- 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"
+    "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## 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"
   },
   "repository": {
     "type": "git",
@@ -2901,7 +2901,7 @@
         },
         "locationInModule": {
           "filename": "src/index.ts",
-          "line": 117
+          "line": 112
         },
         "parameters": [
           {
@@ -2925,7 +2925,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "src/index.ts",
-        "line": 116
+        "line": 111
       },
       "name": "DockerImageName",
       "properties": [
@@ -2938,7 +2938,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/index.ts",
-            "line": 118
+            "line": 113
           },
           "name": "uri",
           "overrides": "cdk-ecr-deployment.IImageName",
@@ -2952,7 +2952,7 @@
           },
           "locationInModule": {
             "filename": "src/index.ts",
-            "line": 117
+            "line": 112
           },
           "name": "creds",
           "optional": true,
@@ -2977,7 +2977,7 @@
         },
         "locationInModule": {
           "filename": "src/index.ts",
-          "line": 135
+          "line": 130
         },
         "parameters": [
           {
@@ -3003,7 +3003,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "src/index.ts",
-        "line": 132
+        "line": 127
       },
       "methods": [
         {
@@ -3012,7 +3012,7 @@
           },
           "locationInModule": {
             "filename": "src/index.ts",
-            "line": 196
+            "line": 191
           },
           "name": "addToPrincipalPolicy",
           "parameters": [
@@ -3043,7 +3043,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "src/index.ts",
-        "line": 11
+        "line": 12
       },
       "name": "ECRDeploymentProps",
       "properties": [
@@ -3056,7 +3056,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/index.ts",
-            "line": 31
+            "line": 32
           },
           "name": "dest",
           "type": {
@@ -3072,7 +3072,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/index.ts",
-            "line": 26
+            "line": 27
           },
           "name": "src",
           "type": {
@@ -3090,7 +3090,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/index.ts",
-            "line": 22
+            "line": 23
           },
           "name": "buildImage",
           "optional": true,
@@ -3107,7 +3107,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/index.ts",
-            "line": 69
+            "line": 70
           },
           "name": "environment",
           "optional": true,
@@ -3131,7 +3131,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/index.ts",
-            "line": 42
+            "line": 43
           },
           "name": "memoryLimit",
           "optional": true,
@@ -3149,7 +3149,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/index.ts",
-            "line": 49
+            "line": 50
           },
           "name": "role",
           "optional": true,
@@ -3167,7 +3167,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/index.ts",
-            "line": 56
+            "line": 57
           },
           "name": "vpc",
           "optional": true,
@@ -3186,7 +3186,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/index.ts",
-            "line": 64
+            "line": 65
           },
           "name": "vpcSubnets",
           "optional": true,
@@ -3206,7 +3206,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "src/index.ts",
-        "line": 72
+        "line": 73
       },
       "name": "IImageName",
       "properties": [
@@ -3220,7 +3220,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/index.ts",
-            "line": 78
+            "line": 79
           },
           "name": "uri",
           "type": {
@@ -3236,7 +3236,7 @@
           },
           "locationInModule": {
             "filename": "src/index.ts",
-            "line": 83
+            "line": 84
           },
           "name": "creds",
           "optional": true,
@@ -3259,7 +3259,7 @@
         },
         "locationInModule": {
           "filename": "src/index.ts",
-          "line": 123
+          "line": 118
         },
         "parameters": [
           {
@@ -3290,7 +3290,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "src/index.ts",
-        "line": 121
+        "line": 116
       },
       "name": "S3ArchiveName",
       "properties": [
@@ -3303,7 +3303,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/index.ts",
-            "line": 129
+            "line": 124
           },
           "name": "uri",
           "overrides": "cdk-ecr-deployment.IImageName",
@@ -3317,7 +3317,7 @@
           },
           "locationInModule": {
             "filename": "src/index.ts",
-            "line": 123
+            "line": 118
           },
           "name": "creds",
           "optional": true,
@@ -3330,6 +3330,6 @@
       "symbolId": "src/index:S3ArchiveName"
     }
   },
-  "version": "2.4.4",
-  "fingerprint": "fw61/5k4AEdXKxOOFdmj+FLizlZayt+Y8S5Bym+Xwhs="
+  "version": "2.5.2",
+  "fingerprint": "bRSppJ2K8Dyh9a3S3dRB5Q83RyGsy3rpiAuYziOuIkA="
 }

package/README.md

@@ -12,9 +12,18 @@ 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.
-- Refer docker registry secret from aws secrets manager.
+- Copy image from ECR/external registry to (another) ECR/external registry
+- Copy an archive tarball image from s3 to ECR/external registry
+
+## Environment variables
+
+Enable flags: `true`, `1`. e.g. `export CI=1`
+
+- `CI` indicate if it's CI environment. This flag will enable building lambda from scratch.
+- `NO_PREBUILT_LAMBDA` disable using prebuilt lambda.
+- `FORCE_PREBUILT_LAMBDA` force using prebuilt lambda.
+
+⚠️ If you want to force using prebuilt lambda in CI environment to reduce build time. Try `export FORCE_PREBUILT_LAMBDA=1`.
 
 ## Examples
 

package/changelog.md

@@ -1,2 +1,7 @@
 
-### [2.4.4](https://github.com/cdklabs/cdk-ecr-deployment/compare/v2.4.3...v2.4.4) (2022-04-02)
+### [2.5.2](https://github.com/cdklabs/cdk-ecr-deployment/compare/v2.5.1...v2.5.2) (2022-05-28)
+
+
+### Bug Fixes
+
+* jsii/superchain:node14 not found ([4c41878](https://github.com/cdklabs/cdk-ecr-deployment/commit/4c418788b01e71ae1aa805559be220743ea7bdfe))

package/lambda/Dockerfile

@@ -1,6 +1,7 @@
 # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 ARG buildImage=public.ecr.aws/sam/build-go1.x:latest
+ARG GOPROXY=https://goproxy.cn|https://goproxy.io|direct
 
 FROM ${buildImage}
 
@@ -16,13 +17,13 @@ RUN yum -y install \
 ENV GOOS=linux \
     GOARCH=amd64 \
     GO111MODULE=on \
-    GOPROXY=https://goproxy.cn|https://goproxy.io|direct
+    GOPROXY=${GOPROXY}
 
 WORKDIR /ws
 
 COPY go.mod go.sum ./
 
-RUN go mod download -x
+RUN go mod download
 
 COPY . /ws
 

package/lambda/go.mod

@@ -3,39 +3,29 @@ module cdk-ecr-deployment-handler
 go 1.15
 
 require (
-	github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
-	github.com/Microsoft/go-winio v0.5.1 // indirect
-	github.com/Microsoft/hcsshim v0.9.2 // indirect
-	github.com/aws/aws-lambda-go v1.23.0
-	github.com/aws/aws-sdk-go-v2 v1.14.0
-	github.com/aws/aws-sdk-go-v2/config v1.1.6
-	github.com/aws/aws-sdk-go-v2/internal/ini v1.3.6 // indirect
-	github.com/aws/aws-sdk-go-v2/service/ecr v1.2.2
-	github.com/aws/aws-sdk-go-v2/service/s3 v1.5.0
-	github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.14.0
-	github.com/cespare/xxhash/v2 v2.1.2 // indirect
-	github.com/containerd/cgroups v1.0.3 // indirect
-	github.com/containerd/containerd v1.5.10 // indirect
-	github.com/containers/image/v5 v5.17.0
-	github.com/docker/distribution v2.8.0+incompatible // indirect
-	github.com/docker/docker v20.10.12+incompatible // indirect
+	github.com/BurntSushi/toml v1.1.0 // indirect
+	github.com/aws/aws-lambda-go v1.29.0
+	github.com/aws/aws-sdk-go-v2 v1.16.2
+	github.com/aws/aws-sdk-go-v2/config v1.15.3
+	github.com/aws/aws-sdk-go-v2/service/ecr v1.17.3
+	github.com/aws/aws-sdk-go-v2/service/s3 v1.26.4
+	github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.15.4
+	github.com/containerd/containerd v1.6.2 // indirect
+	github.com/containers/image/v5 v5.21.0
+	github.com/containers/storage v1.39.0 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da
-	github.com/hashicorp/errwrap v1.1.0 // indirect
-	github.com/moby/term v0.0.0-20210610120745-9d4ed1856297 // indirect
+	github.com/gorilla/mux v1.8.0 // indirect
 	github.com/opencontainers/go-digest v1.0.0
-	github.com/opencontainers/image-spec v1.0.3-0.20211202193544-a5463b7f9c84 // indirect
-	github.com/opencontainers/runc v1.1.0 // indirect
+	github.com/opencontainers/runc v1.1.1 // indirect
 	github.com/pkg/errors v0.9.1
-	github.com/prometheus/common v0.30.0 // indirect
-	github.com/prometheus/procfs v0.7.3 // indirect
+	github.com/prometheus/common v0.33.0 // indirect
 	github.com/sirupsen/logrus v1.8.1
-	github.com/stretchr/testify v1.7.0
-	golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
-	golang.org/x/net v0.0.0-20211216030914-fe4d6282115f // indirect
-	golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
-	golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
-	google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect
-	google.golang.org/grpc v1.43.0 // indirect
-	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
-	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
+	github.com/stretchr/testify v1.7.1
+	github.com/vbauerster/mpb/v7 v7.4.1 // indirect
+	go.mozilla.org/pkcs7 v0.0.0-20210826202110-33d05740a352 // indirect
+	golang.org/x/crypto v0.0.0-20220408190544-5352b0902921 // indirect
+	golang.org/x/net v0.0.0-20220407224826-aac1ed45d8e3 // indirect
+	golang.org/x/sys v0.0.0-20220408201424-a24fb2fb8a0f // indirect
+	google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac // indirect
+	gopkg.in/square/go-jose.v2 v2.6.0 // indirect
 )