From b245cbd00a67b83244404e681f2ed015d6c678ab Mon Sep 17 00:00:00 2001 From: Wing Fung Lau <4760060+hawflau@users.noreply.github.com> Date: Wed, 21 Sep 2022 10:23:23 -0700 Subject: [PATCH 1/2] Fix path of copy script --- samcli/hook_packages/terraform/hooks/prepare/hook.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/samcli/hook_packages/terraform/hooks/prepare/hook.py b/samcli/hook_packages/terraform/hooks/prepare/hook.py index 6c37d797df..690ecd9629 100644 --- a/samcli/hook_packages/terraform/hooks/prepare/hook.py +++ b/samcli/hook_packages/terraform/hooks/prepare/hook.py @@ -145,7 +145,8 @@ def prepare(params: dict) -> dict: ) raise PrepareHookException("There was an error while preparing the Terraform application.") from e except OSError as e: - raise PrepareHookException(f"Unable to create directory {output_dir_path}") from e + # raise PrepareHookException(f"Unable to create directory {output_dir_path}") from e + raise PrepareHookException(f"OSError: {e}") from e def _update_resources_paths(cfn_resources: Dict[str, Any], terraform_application_dir: str) -> None: @@ -803,7 +804,7 @@ def _generate_makefile( # copy copy_terraform_built_artifacts.py script into output directory copy_terraform_built_artifacts_script_path = os.path.join( - Path(os.path.dirname(__file__)).parent, TERRAFORM_BUILD_SCRIPT + Path(os.path.dirname(__file__)).parent.parent, TERRAFORM_BUILD_SCRIPT ) shutil.copy(copy_terraform_built_artifacts_script_path, output_directory_path) From 00ac5be8b4db50dc4ecca3754a33f851d958a312 Mon Sep 17 00:00:00 2001 From: Wing Fung Lau <4760060+hawflau@users.noreply.github.com> Date: Wed, 21 Sep 2022 10:31:01 -0700 Subject: [PATCH 2/2] remove commented line --- samcli/hook_packages/terraform/hooks/prepare/hook.py | 1 - 1 file changed, 1 deletion(-) diff --git a/samcli/hook_packages/terraform/hooks/prepare/hook.py b/samcli/hook_packages/terraform/hooks/prepare/hook.py index 690ecd9629..2bedbd50d5 100644 --- a/samcli/hook_packages/terraform/hooks/prepare/hook.py +++ b/samcli/hook_packages/terraform/hooks/prepare/hook.py @@ -145,7 +145,6 @@ def prepare(params: dict) -> dict: ) raise PrepareHookException("There was an error while preparing the Terraform application.") from e except OSError as e: - # raise PrepareHookException(f"Unable to create directory {output_dir_path}") from e raise PrepareHookException(f"OSError: {e}") from e