feat(assets): Add deploy-time content hash

.gitignore

@@ -1,22 +1,28 @@
+# VSCode extension
+.vscode/
+/.favorites.json
+
+# TypeScript incremental build states
 *.tsbuildinfo
 
-.vscode
-# VSCode extension
-/.favorites.json 
+# Locak state files & OS specifics
 .DS_Store
-node_modules
+node_modules/
 lerna-debug.log
-dist
-pack
+dist/
+pack/
 .BUILD_COMPLETED
-.local-npm
-.tools
-coverage
+.local-npm/
+.tools/
+coverage/
 .nyc_output
 .LAST_BUILD
 *.sw[a-z]
 *~
 
-# we don't want tsconfig at the root
+# We don't want tsconfig at the root
 /tsconfig.json
+
+# CDK Context & Staging files
 cdk.context.json
+.cdk.staging/

packages/@aws-cdk/assets-docker/lib/adopt-repository/handler.js

@@ -26,10 +26,16 @@ exports.handler = async function(event, context, _callback, respond) {
       }
     }
 
-    const repo = event.ResourceProperties.RepositoryName;
+    let repo = event.ResourceProperties.RepositoryName;
     if (!repo) {
       throw new Error('Missing required property "RepositoryName"');
     }
+    const isRepoUri = repo.match(/^(\d+\.dkr\.ecr\.[^.]+\.[^/]+\/)(.+)$/i);
+    if (isRepoUri) {
+      console.log(`"${repo}" like a repository URI: dropping "${isRepoUri[1]}"`);
+      repo = isRepoUri[2];
+    }
+    console.log('RepositoryName', repo);
 
     const adopter = await getAdopter(repo);
     if (event.RequestType === 'Delete') {

packages/@aws-cdk/assets-docker/lib/image-asset.ts

@@ -29,7 +29,7 @@ export interface DockerImageAssetProps {
  *
  * The image will be created in build time and uploaded to an ECR repository.
  */
-export class DockerImageAsset extends cdk.Construct {
+export class DockerImageAsset extends cdk.Construct implements assets.IAsset {
   /**
    * The full URI of the image (including a tag). Use this reference to pull
    * the asset.
@@ -41,6 +41,9 @@ export class DockerImageAsset extends cdk.Construct {
    */
   public repository: ecr.IRepository;
 
+  public readonly sourceHash: string;
+  public readonly bundleHash: string;
+
   /**
    * Directory where the source files are stored
    */
@@ -63,16 +66,18 @@ export class DockerImageAsset extends cdk.Construct {
     });
 
     this.directory = staging.stagedPath;
+    this.sourceHash = staging.sourceHash;
 
     const imageNameParameter = new cdk.CfnParameter(this, 'ImageName', {
       type: 'String',
       description: `ECR repository name and tag asset "${this.node.path}"`,
     });
 
     const asset: cxapi.ContainerImageAssetMetadataEntry = {
+      id: this.node.uniqueId,
       packaging: 'container-image',
       path: this.directory,
-      id: this.node.uniqueId,
+      sourceHash: this.sourceHash,
       imageNameParameter: imageNameParameter.logicalId,
       repositoryName: props.repositoryName,
     };
@@ -92,5 +97,6 @@ export class DockerImageAsset extends cdk.Construct {
     // haven't already started using the image.
     this.repository = new AdoptedRepository(this, 'AdoptRepository', { repositoryName });
     this.imageUri = this.repository.repositoryUriForTag(imageTag);
+    this.bundleHash = imageTag;
   }
 }