cdk-ecr-deployment 3.2.0 → 3.2.1

package/lambda/install.js

@@ -29,6 +29,7 @@ function sha256sum(p) {
 }
 
 async function download(url, dest, agent) {
+  remove(dest);
   console.log(`download ${url}`);
   await pipeline(
     got.stream(url, { agent }),
@@ -36,6 +37,10 @@ async function download(url, dest, agent) {
   );
 }
 
+function remove(dest) {
+  console.log(`removing ${dest}`);
+  fs.rmSync(dest, { force: true });
+}
 
 
 (async () => {
@@ -46,18 +51,28 @@ async function download(url, dest, agent) {
   mkdirp(dir);
 
   const bin = path.join(dir, 'bootstrap');
+  const bootstrapExists = fs.existsSync(bin);
+  const size = bootstrapExists ? fs.statSync(bin).size : 0;
+  const oneMB = 1024*1024;
 
-  if (!fs.existsSync(bin)) {
+  // if the file doesn't exist or is obviously broken, download a new version
+  if (!bootstrapExists || size < oneMB) {
     const agent = {};
     agent.https = process.env.HTTPS_PROXY ? new HttpsProxyAgent({proxy: process.env.HTTPS_PROXY}): undefined;
     agent.http = process.env.HTTP_PROXY ? new HttpProxyAgent({proxy: process.env.HTTP_PROXY}): undefined;
 
-    await download(`${rootUrl}/releases/download/v${version}/bootstrap`, bin, agent);
-    const expectedIntegrity = (await got(`${rootUrl}/releases/download/v${version}/bootstrap.sha256`, { agent })).body.trim();
-    const integrity = await sha256sum(bin);
+    try {
+      await download(`${rootUrl}/releases/download/v${version}/bootstrap`, bin, agent);
+      const expectedIntegrity = (await got(`${rootUrl}/releases/download/v${version}/bootstrap.sha256`, { agent })).body.trim();
+      const integrity = await sha256sum(bin);
 
-    if (integrity !== expectedIntegrity) {
-      throw new Error(`Integrity check error: expected ${expectedIntegrity} but got ${integrity}`);
+      if (integrity !== expectedIntegrity) {
+        throw new Error(`Integrity check error: expected ${expectedIntegrity} but got ${integrity}`);
+      }      
+    } catch (err) {
+      // we had a failure downloading or validating integrity of the bootstrap file, so let's remove it to be sure
+      remove(bin);
+      throw err;
     }
   }
 

package/lambda/internal/tarfile/s3file.go

@@ -237,7 +237,7 @@ func NewS3File(cfg aws.Config, s3uri S3Uri) (*S3File, error) {
 		s3uri:  s3uri,
 		client: client,
 		i:      0,
-		size:   output.ContentLength,
+		size:   *output.ContentLength,
 		// The total cache size is `iolimits.CacheBlockCount * iolimits.BlockSize`
 		rcache: NewBlockCache(iolimits.CacheBlockCount),
 	}, nil

package/lib/index.js

@@ -38,7 +38,7 @@ class DockerImageName {
 }
 exports.DockerImageName = DockerImageName;
 _a = JSII_RTTI_SYMBOL_1;
-DockerImageName[_a] = { fqn: "cdk-ecr-deployment.DockerImageName", version: "3.2.0" };
+DockerImageName[_a] = { fqn: "cdk-ecr-deployment.DockerImageName", version: "3.2.1" };
 class S3ArchiveName {
     constructor(p, ref, creds) {
         this.creds = creds;
@@ -51,7 +51,7 @@ class S3ArchiveName {
 }
 exports.S3ArchiveName = S3ArchiveName;
 _b = JSII_RTTI_SYMBOL_1;
-S3ArchiveName[_b] = { fqn: "cdk-ecr-deployment.S3ArchiveName", version: "3.2.0" };
+S3ArchiveName[_b] = { fqn: "cdk-ecr-deployment.S3ArchiveName", version: "3.2.1" };
 class ECRDeployment extends constructs_1.Construct {
     constructor(scope, id, props) {
         super(scope, id);
@@ -141,5 +141,5 @@ class ECRDeployment extends constructs_1.Construct {
 }
 exports.ECRDeployment = ECRDeployment;
 _c = JSII_RTTI_SYMBOL_1;
-ECRDeployment[_c] = { fqn: "cdk-ecr-deployment.ECRDeployment", version: "3.2.0" };
+ECRDeployment[_c] = { fqn: "cdk-ecr-deployment.ECRDeployment", version: "3.2.1" };
 //# 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 { RuntimeFamily } from 'aws-cdk-lib/aws-lambda';\nimport { Construct } from 'constructs';\nimport { shouldUsePrebuiltLambda } from './config';\n\nexport interface ECRDeploymentProps {\n\n  /**\n   * Image to use to build Golang lambda for custom resource, if download fails or is not wanted.\n   *\n   * Might be needed for local build if all images need to come from own registry.\n   *\n   * Note that image should use yum as a package manager and have golang available.\n   *\n   * @default - public.ecr.aws/sam/build-go1.x:latest\n   */\n  readonly buildImage?: string;\n  /**\n   * The source of the docker image.\n   */\n  readonly src: IImageName;\n\n  /**\n   * The destination of the docker image.\n   */\n  readonly dest: IImageName;\n\n  /**\n   * The image architecture to be copied.\n   *\n   * The 'amd64' architecture will be copied by default. Specify the\n   * architecture or architectures to copy here.\n   *\n   * It is currently not possible to copy more than one architecture\n   * at a time: the array you specify must contain exactly one string.\n   *\n   * @default ['amd64']\n   */\n  readonly imageArch?: string[];\n\n  /**\n   * The amount of memory (in MiB) to allocate to the AWS Lambda function which\n   * replicates the files from the CDK bucket to the destination bucket.\n   *\n   * If you are deploying large files, you will need to increase this number\n   * accordingly.\n   *\n   * @default - 512\n   */\n  readonly memoryLimit?: number;\n\n  /**\n   * Execution role associated with this function\n   *\n   * @default - A role is automatically created\n   */\n  readonly role?: iam.IRole;\n\n  /**\n   * The VPC network to place the deployment lambda handler in.\n   *\n   * @default - None\n   */\n  readonly vpc?: ec2.IVpc;\n\n  /**\n   * Where in the VPC to place the deployment lambda handler.\n   * Only used if 'vpc' is supplied.\n   *\n   * @default - the Vpc default strategy if not specified\n   */\n  readonly vpcSubnets?: ec2.SubnetSelection;\n\n  /**\n   * The list of security groups to associate with the Lambda's network interfaces.\n   *\n   * Only used if 'vpc' is supplied.\n   *\n   * @default - If the function is placed within a VPC and a security group is\n   * not specified, either by this or securityGroup prop, a dedicated security\n   * group will be created for this function.\n   */\n  readonly securityGroups?: ec2.SecurityGroup[];\n\n  /**\n   * The lambda function runtime environment.\n   *\n   * @default - lambda.Runtime.PROVIDED_AL2023\n   */\n  readonly lambdaRuntime?: lambda.Runtime;\n\n  /**\n   * The name of the lambda handler.\n   *\n   * @default - bootstrap\n   */\n  readonly lambdaHandler?: string;\n\n  /**\n   * The environment variable to set\n   */\n  readonly environment?: { [key: string]: string };\n}\n\nexport interface IImageName {\n  /**\n   *  The uri of the docker image.\n   *\n   *  The uri spec follows https://github.com/containers/skopeo\n   */\n  readonly uri: string;\n\n  /**\n   * The credentials of the docker image. Format `user:password` or `AWS Secrets Manager secret arn` or `AWS Secrets Manager secret name`.\n   *\n   * If specifying an AWS Secrets Manager secret, the format of the secret should be either plain text (`user:password`) or\n   * JSON (`{\"username\":\"<username>\",\"password\":\"<password>\"}`).\n   *\n   * For more details on JSON format, see https://docs.aws.amazon.com/AmazonECS/latest/developerguide/private-auth.html\n   */\n  creds?: string;\n}\n\nfunction getCode(buildImage: string): lambda.AssetCode {\n  if (shouldUsePrebuiltLambda()) {\n    try {\n      const installScript = path.join(__dirname, '../lambda/install.js');\n      const prebuiltPath = path.join(__dirname, '../lambda/out');\n      child_process.execFileSync(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  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/docker/library/golang:1'),\n      runtime: props.lambdaRuntime ?? new lambda.Runtime('provided.al2023', RuntimeFamily.OTHER), // not using Runtime.PROVIDED_AL2023 to support older CDK versions (< 2.105.0)\n      handler: props.lambdaHandler ?? 'bootstrap',\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      securityGroups: props.securityGroups,\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    if (props.imageArch && props.imageArch.length !== 1) {\n      throw new Error(`imageArch must contain exactly 1 element, got ${JSON.stringify(props.imageArch)}`);\n    }\n    const imageArch = props.imageArch ? props.imageArch[0] : '';\n\n    new CustomResource(this, 'CustomResource', {\n      serviceToken: this.handler.functionArn,\n      // This has been copy/pasted and is a pure lie, but changing it is going to change people's infra!! X(\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        ...imageArch ? { ImageArch: imageArch } : {},\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

@@ -94,7 +94,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "3.2.0",
+  "version": "3.2.1",
   "jest": {
     "coverageProvider": "v8",
     "testMatch": [