Skip to content

Commit d6012ac

Browse files
authored
fix: default to empty list for docker build extra params metadata (aws#8941)
* fix: default to empty list for docker build extra params metadata * fix: set default consistently for DockerBuildExtraParams
1 parent 2138421 commit d6012ac

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

samcli/lib/build/app_builder.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@ def _build_lambda_image(self, function_name: str, metadata: Dict, architecture:
434434
docker_tag = f"{image_name.lower()}:{tag}"
435435
docker_build_target = metadata.get("DockerBuildTarget", None)
436436
docker_build_args = metadata.get("DockerBuildArgs", {})
437-
docker_build_extra_params = metadata.get("DockerBuildExtraParams", None)
437+
docker_build_extra_params = metadata.get("DockerBuildExtraParams", [])
438438

439439
if not dockerfile or not docker_context:
440440
raise DockerBuildFailed("Docker file or Docker context metadata are missed.")

samcli/lib/samlib/resource_metadata_normalizer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ def _extract_image_asset_metadata(metadata):
191191
SAM_METADATA_DOCKERFILE_KEY: str(dockerfile_path.as_posix()),
192192
SAM_METADATA_DOCKER_CONTEXT_KEY: str(asset_path),
193193
SAM_METADATA_DOCKER_BUILD_ARGS_KEY: metadata.get(ASSET_DOCKERFILE_BUILD_ARGS_KEY, {}),
194-
SAM_METADATA_DOCKER_BUILD_EXTRA_PARAMS_KEY: metadata.get(ASSET_DOCKER_BUILD_EXTRA_PARAMS_KEY, None),
194+
SAM_METADATA_DOCKER_BUILD_EXTRA_PARAMS_KEY: metadata.get(ASSET_DOCKER_BUILD_EXTRA_PARAMS_KEY, []),
195195
}
196196

197197
@staticmethod

0 commit comments

Comments
 (0)