add feedback from luca

aws · Dec 14, 2023 · 81317ba · 81317ba
1 parent e16b8c3
commit 81317ba
Show file tree

Hide file tree

Showing 2 changed files with 62 additions and 0 deletions.
diff --git a/packages/aws-cdk-lib/aws-lambda/test/code.test.ts b/packages/aws-cdk-lib/aws-lambda/test/code.test.ts
@@ -383,6 +383,43 @@ describe('code', () => {
       });
     });
 
+    test('cache disabled', () => {
+      // given
+      const stack = new cdk.Stack();
+      stack.node.setContext(cxapi.ASSET_RESOURCE_METADATA_ENABLED_CONTEXT, true);
+
+      const dockerfilePath = 'Dockerfile';
+      const dockerBuildTarget = 'stage';
+      const dockerBuildArgs = { arg1: 'val1', arg2: 'val2' };
+      const dockerBuildSsh = 'default';
+
+      // when
+      new lambda.Function(stack, 'Fn', {
+        code: lambda.Code.fromAssetImage(path.join(__dirname, 'docker-lambda-handler'), {
+          file: dockerfilePath,
+          target: dockerBuildTarget,
+          buildArgs: dockerBuildArgs,
+          buildSsh: dockerBuildSsh,
+          cacheDisabled: true,
+        }),
+        handler: lambda.Handler.FROM_IMAGE,
+        runtime: lambda.Runtime.FROM_IMAGE,
+      });
+
+      // then
+      Template.fromStack(stack).hasResource('AWS::Lambda::Function', {
+        Metadata: {
+          [cxapi.ASSET_RESOURCE_METADATA_PATH_KEY]: 'asset.da491b551a48a7aaf33f41a3bfe7eb269112a87ba24651a2ff8f2d526ca4466c',
+          [cxapi.ASSET_RESOURCE_METADATA_DOCKERFILE_PATH_KEY]: dockerfilePath,
+          [cxapi.ASSET_RESOURCE_METADATA_DOCKER_BUILD_ARGS_KEY]: dockerBuildArgs,
+          [cxapi.ASSET_RESOURCE_METADATA_DOCKER_BUILD_SSH_KEY]: dockerBuildSsh,
+          [cxapi.ASSET_RESOURCE_METADATA_DOCKER_BUILD_TARGET_KEY]: dockerBuildTarget,
+          [cxapi.ASSET_RESOURCE_METADATA_PROPERTY_KEY]: 'Code.ImageUri',
+          [cxapi.ASSET_RESOURCE_METADATA_DOCKER_CACHE_DISABLED_KEY]: true,
+        },
+      });
+    });
+
     test('fails if asset is bound with a second stack', () => {
       // given
       const app = new cdk.App();

diff --git a/packages/aws-cdk-lib/core/test/assets.test.ts b/packages/aws-cdk-lib/core/test/assets.test.ts
@@ -143,4 +143,29 @@ describe('assets', () => {
     expect(toCloudFormation(stack)).toEqual({ });
 
   });
+
+  test('cached disabled', () => {
+    // WHEN
+    stack.synthesizer.addDockerImageAsset({
+      sourceHash: 'source-hash',
+      directoryName: 'directory-name',
+      dockerCacheDisabled: true,
+    });
+
+    // THEN
+    const assetMetadata = stack.node.metadata.find(({ type }) => type === cxschema.ArtifactMetadataEntryType.ASSET);
+
+    expect(assetMetadata && assetMetadata.data).toBeDefined();
+
+    if (assetMetadata && assetMetadata.data) {
+      const data = assetMetadata.data as cxschema.ContainerImageAssetMetadataEntry;
+      expect(data.packaging).toEqual('container-image');
+      expect(data.path).toEqual('directory-name');
+      expect(data.sourceHash).toEqual('source-hash');
+      expect(data.imageTag).toEqual('source-hash');
+      expect(data.cacheDisabled).toEqual(true);
+    }
+
+    expect(toCloudFormation(stack)).toEqual({ });
+  });
 });