From 65f2e2c83f2628b59f2f08aa02d88f4a09ba46b5 Mon Sep 17 00:00:00 2001 From: Jack Boynton Date: Tue, 22 Aug 2023 17:52:06 -0400 Subject: [PATCH 1/2] add buildSsh flag to docker build --- packages/cdk-assets/lib/private/handlers/container-images.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/cdk-assets/lib/private/handlers/container-images.ts b/packages/cdk-assets/lib/private/handlers/container-images.ts index 3b21e922aec66..5e28341da3e1c 100644 --- a/packages/cdk-assets/lib/private/handlers/container-images.ts +++ b/packages/cdk-assets/lib/private/handlers/container-images.ts @@ -188,6 +188,7 @@ class ContainerImageBuilder { directory: fullPath, tag: localTagName, buildArgs: source.dockerBuildArgs, + buildSsh: source.dockerBuildSsh, buildSecrets: source.dockerBuildSecrets, target: source.dockerBuildTarget, file: source.dockerFile, From bc2be249c7ef07d31e5e1fa249962c0033e278c2 Mon Sep 17 00:00:00 2001 From: Momo Kornher Date: Wed, 23 Aug 2023 10:39:16 +0100 Subject: [PATCH 2/2] add ssh in more places --- packages/aws-cdk-lib/aws-lambda/test/code.test.ts | 5 ++++- .../core/lib/stack-synthesizers/asset-manifest-builder.ts | 1 + packages/aws-cdk-lib/core/lib/stack-synthesizers/legacy.ts | 2 ++ packages/cdk-assets/lib/private/handlers/container-images.ts | 2 +- 4 files changed, 8 insertions(+), 2 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 index 4c6da0a8b6e86..4b9472693ef18 100644 --- a/packages/aws-cdk-lib/aws-lambda/test/code.test.ts +++ b/packages/aws-cdk-lib/aws-lambda/test/code.test.ts @@ -334,6 +334,7 @@ describe('code', () => { const dockerfilePath = 'Dockerfile'; const dockerBuildTarget = 'stage'; const dockerBuildArgs = { arg1: 'val1', arg2: 'val2' }; + const dockerBuildSsh = 'default'; // when new lambda.Function(stack, 'Fn', { @@ -341,6 +342,7 @@ describe('code', () => { file: dockerfilePath, target: dockerBuildTarget, buildArgs: dockerBuildArgs, + buildSsh: dockerBuildSsh, }), handler: lambda.Handler.FROM_IMAGE, runtime: lambda.Runtime.FROM_IMAGE, @@ -349,9 +351,10 @@ describe('code', () => { // then Template.fromStack(stack).hasResource('AWS::Lambda::Function', { Metadata: { - [cxapi.ASSET_RESOURCE_METADATA_PATH_KEY]: 'asset.a8922a1fd787021d071844bc2b1fe3622372bbdfda823528c00983a806ba0e26', + [cxapi.ASSET_RESOURCE_METADATA_PATH_KEY]: 'asset.4d4e274f69ea222694c68ac0cea32b855247d6bdad3074a5987e3a7a907c4745', [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', }, diff --git a/packages/aws-cdk-lib/core/lib/stack-synthesizers/asset-manifest-builder.ts b/packages/aws-cdk-lib/core/lib/stack-synthesizers/asset-manifest-builder.ts index 4ad800e23ba88..515573bfca5c1 100644 --- a/packages/aws-cdk-lib/core/lib/stack-synthesizers/asset-manifest-builder.ts +++ b/packages/aws-cdk-lib/core/lib/stack-synthesizers/asset-manifest-builder.ts @@ -67,6 +67,7 @@ export class AssetManifestBuilder { directory: asset.directoryName, dockerBuildArgs: asset.dockerBuildArgs, dockerBuildSecrets: asset.dockerBuildSecrets, + dockerBuildSsh: asset.dockerBuildSsh, dockerBuildTarget: asset.dockerBuildTarget, dockerFile: asset.dockerFile, networkMode: asset.networkMode, diff --git a/packages/aws-cdk-lib/core/lib/stack-synthesizers/legacy.ts b/packages/aws-cdk-lib/core/lib/stack-synthesizers/legacy.ts index 740695c966aab..887b32ee5a7c0 100644 --- a/packages/aws-cdk-lib/core/lib/stack-synthesizers/legacy.ts +++ b/packages/aws-cdk-lib/core/lib/stack-synthesizers/legacy.ts @@ -143,6 +143,8 @@ export class LegacyStackSynthesizer extends StackSynthesizer implements IReusabl path: asset.directoryName, sourceHash: asset.sourceHash, buildArgs: asset.dockerBuildArgs, + buildSecrets: asset.dockerBuildSecrets, + buildSsh: asset.dockerBuildSsh, target: asset.dockerBuildTarget, file: asset.dockerFile, networkMode: asset.networkMode, diff --git a/packages/cdk-assets/lib/private/handlers/container-images.ts b/packages/cdk-assets/lib/private/handlers/container-images.ts index 5e28341da3e1c..381c1c3e635b0 100644 --- a/packages/cdk-assets/lib/private/handlers/container-images.ts +++ b/packages/cdk-assets/lib/private/handlers/container-images.ts @@ -188,8 +188,8 @@ class ContainerImageBuilder { directory: fullPath, tag: localTagName, buildArgs: source.dockerBuildArgs, - buildSsh: source.dockerBuildSsh, buildSecrets: source.dockerBuildSecrets, + buildSsh: source.dockerBuildSsh, target: source.dockerBuildTarget, file: source.dockerFile, networkMode: source.networkMode,