cleaning up

awslabs · Oct 15, 2024 · 91177b7 · 91177b7
1 parent 5bfbeea
commit 91177b7
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/servicecatalog_puppet/cli.py b/servicecatalog_puppet/cli.py
@@ -430,7 +430,9 @@ def setup_config(
     else:
         puppet_account_id_to_use = puppet_account_id
     os.environ[environmental_variables.PUPPET_ACCOUNT_ID] = puppet_account_id_to_use
+    print(f"single_account is {single_account}")
     if single_account:
+        print("I AM SETTING single_account uh oh")
         os.environ[environmental_variables.SINGLE_ACCOUNT_ID] = single_account
 
     os.environ[environmental_variables.EXECUTION_MODE] = execution_mode
@@ -639,8 +641,9 @@ def deploy_from_task_reference(
             include_dependencies=subset.get("include_dependencies"),
             include_reverse_dependencies=subset.get("include_reverse_dependencies"),
         )
+    single_account = str(overrides.get("single_account")) if overrides.get("single_account") else None
     params.update(
-        dict(single_account=str(overrides.get("single_account")), subset=overrides,)
+        dict(single_account=single_account, subset=overrides,)
     )
     click.echo(f"Overridden parameters {params}")
 

diff --git a/servicecatalog_puppet/commands/task_reference.py b/servicecatalog_puppet/commands/task_reference.py
@@ -66,6 +66,7 @@ def deploy_from_task_reference(path):
 
     for task_reference, task in all_tasks.items():
         if single_account_id: # running single account mode
+            print("Running in single account mode")
             task_section_name = task.get("section_name")
             task_account_id = task.get("account_id")
             spoke_execution = str(config.get_executor_account_id()) != str(

diff --git a/servicecatalog_puppet/waluigi/shared_tasks/task_topological_generations_without_scheduler.py b/servicecatalog_puppet/waluigi/shared_tasks/task_topological_generations_without_scheduler.py
@@ -154,7 +154,7 @@ def worker_task(
                 for l in serialisation_utils.dump(unwrap(task_details)).split("\n"):
                     logger.error(l)
                 for l in traceback.format_exception(
-                    etype=type(e), value=e, tb=e.__traceback__,
+                    e, value=e, tb=e.__traceback__,
                 ):
                     for sl in l.split("\n"):
                         logger.error(f"{sl}")

diff --git a/servicecatalog_puppet/waluigi/shared_tasks/workers/worker_requiring_scheduler.py b/servicecatalog_puppet/waluigi/shared_tasks/workers/worker_requiring_scheduler.py
@@ -113,7 +113,7 @@ def worker_task(
                             ).split("\n"):
                                 logger.error(l)
                             for l in traceback.format_exception(
-                                etype=type(e), value=e, tb=e.__traceback__,
+                                e, value=e, tb=e.__traceback__,
                             ):
                                 for sl in l.split("\n"):
                                     logger.error(f"{sl}")

diff --git a/servicecatalog_puppet/waluigi/task_mixins/task_executor_mixin.py b/servicecatalog_puppet/waluigi/task_mixins/task_executor_mixin.py
@@ -43,7 +43,7 @@ def on_task_failure(self, exception, duration):
         exception_details = {
             "exception_type": type(exception),
             "exception_stack_trace": traceback.format_exception(
-                etype=type(exception), value=exception, tb=exception.__traceback__,
+                exception, value=exception, tb=exception.__traceback__,
             ),
             "duration": duration,
         }