From 76e3067702ad3a4e5839befe400f5a36f9ba0ee0 Mon Sep 17 00:00:00 2001 From: James Sheng Date: Thu, 3 Aug 2023 16:18:22 -0700 Subject: [PATCH 1/6] Add logical id for logging --- aws_lambda_builders/workflow.py | 2 +- aws_lambda_builders/workflows/custom_make/actions.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/aws_lambda_builders/workflow.py b/aws_lambda_builders/workflow.py index 46a249166..79e38ebf9 100644 --- a/aws_lambda_builders/workflow.py +++ b/aws_lambda_builders/workflow.py @@ -363,7 +363,7 @@ def run(self): for action in self.actions: action_info = "{}:{}".format(self.NAME, action.NAME) - LOG.info("Running %s", action_info) + LOG.info("%s: Running %s", self.options["function_name"], action_info) try: action.execute() diff --git a/aws_lambda_builders/workflows/custom_make/actions.py b/aws_lambda_builders/workflows/custom_make/actions.py index 71ff5740b..cde42b0cf 100644 --- a/aws_lambda_builders/workflows/custom_make/actions.py +++ b/aws_lambda_builders/workflows/custom_make/actions.py @@ -92,7 +92,7 @@ def execute(self): try: current_env = self.osutils.environ() - LOG.info("Current Artifacts Directory : %s", self.artifact_dir_path) + LOG.info("%s: Current Artifacts Directory : %s", self.build_logical_id, self.artifact_dir_path) current_env.update({"ARTIFACTS_DIR": self.artifact_dir_path}) # Export environmental variables that might be needed by other binaries used # within the Makefile and also specify the makefile to be used as well. From 44ff2a6435c1bcf7e4b8db9119c89750b13bc0ce Mon Sep 17 00:00:00 2001 From: James Sheng Date: Thu, 3 Aug 2023 16:47:32 -0700 Subject: [PATCH 2/6] Add functionality if function_name does not exist --- aws_lambda_builders/workflow.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aws_lambda_builders/workflow.py b/aws_lambda_builders/workflow.py index 79e38ebf9..6d8bad4b6 100644 --- a/aws_lambda_builders/workflow.py +++ b/aws_lambda_builders/workflow.py @@ -362,8 +362,8 @@ def run(self): for action in self.actions: action_info = "{}:{}".format(self.NAME, action.NAME) - - LOG.info("%s: Running %s", self.options["function_name"], action_info) + function_name = "" if "function_name" not in self.options else self.options["function_name"] + ": " + LOG.info("%sRunning %s", function_name, action_info) try: action.execute() From a5e0fea71c0566f1b457c3311b593dc657e08b0f Mon Sep 17 00:00:00 2001 From: James Sheng Date: Fri, 4 Aug 2023 10:36:04 -0700 Subject: [PATCH 3/6] Added case where build options does not exist --- aws_lambda_builders/workflow.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aws_lambda_builders/workflow.py b/aws_lambda_builders/workflow.py index 6d8bad4b6..88d66e674 100644 --- a/aws_lambda_builders/workflow.py +++ b/aws_lambda_builders/workflow.py @@ -362,7 +362,10 @@ def run(self): for action in self.actions: action_info = "{}:{}".format(self.NAME, action.NAME) - function_name = "" if "function_name" not in self.options else self.options["function_name"] + ": " + self.options = None + function_name = "" + if self.options is not None and "function_name" in self.options: + function_name = "{}: ".format(self.options["function_name"]) LOG.info("%sRunning %s", function_name, action_info) try: From ef0a0a5904244b4db984dcfaf8e34957acdfd107 Mon Sep 17 00:00:00 2001 From: James Sheng Date: Fri, 4 Aug 2023 13:24:02 -0700 Subject: [PATCH 4/6] Use logical-build-id instead --- aws_lambda_builders/workflow.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/aws_lambda_builders/workflow.py b/aws_lambda_builders/workflow.py index 88d66e674..95d9caac3 100644 --- a/aws_lambda_builders/workflow.py +++ b/aws_lambda_builders/workflow.py @@ -362,10 +362,9 @@ def run(self): for action in self.actions: action_info = "{}:{}".format(self.NAME, action.NAME) - self.options = None function_name = "" - if self.options is not None and "function_name" in self.options: - function_name = "{}: ".format(self.options["function_name"]) + if self.options is not None and "build_logical_id" in self.options: + function_name = "{}: ".format(self.options["build_logical_id"]) LOG.info("%sRunning %s", function_name, action_info) try: From cbf230621d0db6c868a1debc9c8903a16c2e737a Mon Sep 17 00:00:00 2001 From: James Sheng Date: Fri, 4 Aug 2023 14:31:18 -0700 Subject: [PATCH 5/6] Removed redundant syntax --- aws_lambda_builders/workflow.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws_lambda_builders/workflow.py b/aws_lambda_builders/workflow.py index 95d9caac3..7bf7673e0 100644 --- a/aws_lambda_builders/workflow.py +++ b/aws_lambda_builders/workflow.py @@ -363,7 +363,7 @@ def run(self): for action in self.actions: action_info = "{}:{}".format(self.NAME, action.NAME) function_name = "" - if self.options is not None and "build_logical_id" in self.options: + if self.options and "build_logical_id" in self.options: function_name = "{}: ".format(self.options["build_logical_id"]) LOG.info("%sRunning %s", function_name, action_info) From 31e46f2542f88fee0d112afed3b303a95e786d04 Mon Sep 17 00:00:00 2001 From: James Sheng Date: Fri, 4 Aug 2023 16:52:32 -0700 Subject: [PATCH 6/6] Formatting Change --- aws_lambda_builders/workflow.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aws_lambda_builders/workflow.py b/aws_lambda_builders/workflow.py index 7bf7673e0..133ff854a 100644 --- a/aws_lambda_builders/workflow.py +++ b/aws_lambda_builders/workflow.py @@ -364,8 +364,8 @@ def run(self): action_info = "{}:{}".format(self.NAME, action.NAME) function_name = "" if self.options and "build_logical_id" in self.options: - function_name = "{}: ".format(self.options["build_logical_id"]) - LOG.info("%sRunning %s", function_name, action_info) + function_name = "{}:".format(self.options["build_logical_id"]) + LOG.info("%s Running %s", function_name, action_info) try: action.execute()