Revert "style: fix formatting issues across codebase"

This reverts commit ece6393.

Author: bnusunny

samcli/commands/init/interactive_init_flow.py

@@ -193,9 +193,7 @@ def _generate_from_location(
 -----------------------
 Location: {location}
 Output Directory: {output_dir}
-    """.format(
-        location=location, output_dir=output_dir
-    )
+    """.format(location=location, output_dir=output_dir)
     click.echo(summary_msg)
     do_generate(
         location,

samcli/commands/pipeline/bootstrap/cli.py

@@ -338,17 +338,15 @@ def do_cli(
     if interactive:
         if standalone:
             click.echo(
-                dedent(
-                    """\
+                dedent("""\
 
                     sam pipeline bootstrap generates the required AWS infrastructure resources to connect
                     to your CI/CD system. This step must be run for each deployment stage in your pipeline,
                     prior to running the sam pipeline init command.
 
                     We will ask for [1] stage definition, [2] account details, and
                     [3] references to existing resources in order to bootstrap these pipeline resources.
-                    """
-                ),
+                    """),
             )
 
         guided_context = GuidedContext(
@@ -421,26 +419,18 @@ def do_cli(
             config_dir=PIPELINE_CONFIG_DIR, filename=PIPELINE_CONFIG_FILENAME, cmd_names=_get_bootstrap_command_names()
         )
 
-        click.secho(
-            dedent(
-                f"""\
+        click.secho(dedent(f"""\
                 View the definition in {os.path.join(PIPELINE_CONFIG_DIR, PIPELINE_CONFIG_FILENAME)},
                 run sam pipeline bootstrap to generate another set of resources, or proceed to
                 sam pipeline init to create your pipeline configuration file.
-                """
-            )
-        )
+                """))
 
         if not environment.pipeline_user.is_user_provided and not environment.use_oidc_provider:
-            click.secho(
-                dedent(
-                    f"""\
+            click.secho(dedent(f"""\
                     Before running {Colored().bold("sam pipeline init")}, we recommend first setting up AWS credentials
                     in your CI/CD account. Read more about how to do so with your provider in
                     {CONFIG_AWS_CRED_ON_CICD_URL}.
-                    """
-                )
-            )
+                    """))
 
 
 def _get_pipeline_oidc_provider(

samcli/commands/pipeline/bootstrap/guided_context.py

@@ -83,14 +83,10 @@ def __init__(
     def _prompt_account_id(self) -> None:
         profiles = list_available_profiles()
         click.echo("The following AWS credential sources are available to use.")
-        click.echo(
-            dedent(
-                f"""\
+        click.echo(dedent(f"""\
                 To know more about configuration AWS credentials, visit the link below:
                 {CONFIG_AWS_CRED_DOC_URL}\
-                """
-            )
-        )
+                """))
         has_env_creds = os.getenv(EnvProvider.ACCESS_KEY) and os.getenv(EnvProvider.SECRET_KEY)
         click.echo(f"\t1 - Environment variables{' (not available)' if not has_env_creds else ''}")
         for i, profile in enumerate(profiles):

samcli/commands/pipeline/init/interactive_init_flow.py

@@ -58,19 +58,15 @@ def do_interactive(self) -> None:
         runs its specific questionnaire then generates the pipeline config file
         based on the template and user's responses
         """
-        click.echo(
-            dedent(
-                """\
+        click.echo(dedent("""\
 
                 sam pipeline init generates a pipeline configuration file that your CI/CD system
                 can use to deploy serverless applications using AWS SAM.
                 We will guide you through the process to bootstrap resources for each stage,
                 then walk through the details necessary for creating the pipeline config file.
 
                 Please ensure you are in the root folder of your SAM application before you begin.
-                """
-            )
-        )
+                """))
 
         pipeline_template_source_question = Choice(
             key="pipeline-template-source",
@@ -176,9 +172,7 @@ def _prompt_run_bootstrap_within_pipeline_init(
                 "you can still reference other bootstrapped resources.",
                 default=True,
             ):
-                click.secho(
-                    dedent(
-                        """\
+                click.secho(dedent("""\
 
                         For each stage, we will ask for [1] stage definition, [2] account details, and [3]
                         reference application build resources in order to bootstrap these pipeline
@@ -187,9 +181,7 @@ def _prompt_run_bootstrap_within_pipeline_init(
                         We recommend using an individual AWS account profiles for each stage in your
                         pipeline. You can set these profiles up using aws configure or ~/.aws/credentials. See
                         [https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/serverless-getting-started-set-up-credentials.html].
-                        """
-                    )
-                )  # pylint: disable=C0301
+                        """))  # pylint: disable=C0301
 
                 click.echo(Colored().bold(f"\nStage {len(stage_configuration_names) + 1} Setup\n"))
                 do_bootstrap(
@@ -221,15 +213,11 @@ def _prompt_run_bootstrap_within_pipeline_init(
                 )
                 return True
         else:
-            click.echo(
-                dedent(
-                    """\
+            click.echo(dedent("""\
                     To set up stage(s), please quit the process using Ctrl+C and use one of the following commands:
                     sam pipeline init --bootstrap       To be guided through the stage and config file creation process.
                     sam pipeline bootstrap              To specify details for an individual stage.
-                    """
-                )
-            )
+                    """))
             click.prompt(
                 "To reference stage resources bootstrapped in a different account, press enter to proceed", default=""
             )

samcli/commands/publish/command.py

@@ -32,9 +32,7 @@
 for publishing. For more details on this metadata section, see
 {}
 \b
-""".format(
-    SAM_PUBLISH_DOC
-)
+""".format(SAM_PUBLISH_DOC)
 SHORT_HELP = "Publish a packaged AWS SAM template to the AWS Serverless Application Repository."
 SERVERLESSREPO_CONSOLE_URL = "https://console.aws.amazon.com/serverlessrepo/home?region={}#/published-applications/{}"
 SEMANTIC_VERSION_HELP = "Optional. The value provided here overrides SemanticVersion in the template metadata."

samcli/commands/sync/command.py

@@ -316,10 +316,8 @@ def do_cli(
 
     # Note: ADL with use-container is not supported yet. Remove this logic once its supported.
     if use_container and dependency_layer:
-        LOG.info(
-            "Note: Automatic Dependency Layer is not yet supported with use-container. \
-            sam sync will be run without Automatic Dependency Layer."
-        )
+        LOG.info("Note: Automatic Dependency Layer is not yet supported with use-container. \
+            sam sync will be run without Automatic Dependency Layer.")
         dependency_layer = False
 
     build_dir = DEFAULT_BUILD_DIR_WITH_AUTO_DEPENDENCY_LAYER if dependency_layer else DEFAULT_BUILD_DIR

samcli/lib/deploy/deployer.py

@@ -874,6 +874,4 @@ def _gen_deploy_failed_with_rollback_disabled_msg(stack_name):
 =========================
 [*] Fix issues and try deploying again
 [*] Roll back stack to the last known stable state: aws cloudformation rollback-stack --stack-name {stack_name}
-""".format(
-            stack_name=stack_name
-        )
+""".format(stack_name=stack_name)

samcli/lib/observability/xray_traces/xray_event_mappers.py

@@ -26,11 +26,8 @@ def map(self, event: XRayTraceEvent) -> XRayTraceEvent:
         formatted_segments = self.format_segments(event.segments)
         iso_formatted_timestamp = datetime.fromtimestamp(event.timestamp).isoformat()
         revision_info = f"[revision {event.revision}] " if event.revision else ""
-        mapped_message = (
-            f"\nXRay Event {revision_info}at ({iso_formatted_timestamp}) with \
-id ({event.id}) and duration ({event.duration:.3f}s)"
-            f"{formatted_segments}"
-        )
+        mapped_message = f"\nXRay Event {revision_info}at ({iso_formatted_timestamp}) with \
+id ({event.id}) and duration ({event.duration:.3f}s)" f"{formatted_segments}"
         event.message = mapped_message
 
         return event

tests/integration/local/invoke/test_integrations_cli.py

@@ -792,9 +792,7 @@ def _create_config_file(self, profile):
 
     def _create_cred_file(self, profile):
         cred_file_content = "[{}]\naws_access_key_id = someaccesskeyid\naws_secret_access_key = shhhhhthisisasecret \
-        \naws_session_token = sessiontoken".format(
-            profile
-        )
+        \naws_session_token = sessiontoken".format(profile)
         custom_cred = os.path.join(self.config_dir, "customcred")
         with open(custom_cred, "w") as file:
             file.write(cred_file_content)

tests/integration/pipeline/test_init_command.py

@@ -152,9 +152,7 @@ def test_with_pipelineconfig_has_all_stage_values(self, with_bootstrap):
         Path(PIPELINE_CONFIG_DIR).mkdir(parents=True, exist_ok=True)
         pipelineconfig_path = Path(PIPELINE_CONFIG_DIR, PIPELINE_CONFIG_FILENAME)
         with open(pipelineconfig_path, "w") as f:
-            f.write(
-                dedent(
-                    """\
+            f.write(dedent("""\
             version = 0.1
             [default]
             [default.pipeline_bootstrap]
@@ -178,9 +176,7 @@ def test_with_pipelineconfig_has_all_stage_values(self, with_bootstrap):
             artifacts_bucket = "prod-bucket"
             image_repository = "prod-ecr"
             region = "us-west-2"
-            """
-                )
-            )
+            """))
 
         inputs = [
             "1",  # quick start