Merge branch 'develop' into tmp/1678832631/main

Author: hoffa

.cfnlintrc.yaml

@@ -125,3 +125,4 @@ ignore_checks:
   - E2531 # Deprecated runtime; not relevant for transform tests
   - W2531 # EOL runtime; not relevant for transform tests
   - E3001 # Invalid or unsupported Type; common in transform tests since they focus on SAM resources
+  - W2001 # Parameter not used

.github/workflows/build.yml

@@ -7,6 +7,8 @@ on:
       - "feat-*"
   pull_request:
   workflow_dispatch:
+  merge_group:
+    types: [checks_requested]
 
 jobs:
   build:
@@ -22,6 +24,7 @@ jobs:
           - "3.8"
           - "3.9"
           - "3.10"
+          - "3.11"
     steps:
     - uses: actions/checkout@v3
     - uses: actions/setup-python@v4

.github/workflows/check_compatibility.yml

@@ -2,6 +2,8 @@ name: Check compatibility
 
 on:
   pull_request:
+  merge_group:
+    types: [checks_requested]
 
 jobs:
   check-compatibility:

.github/workflows/codeql.yml

@@ -17,6 +17,8 @@ on:
   pull_request:
     # The branches below must be a subset of the branches above
     branches: [ "develop" ]
+  merge_group:
+    types: [checks_requested]
   schedule:
     - cron: '43 23 * * 2'
 

bin/_file_formatter.py

@@ -45,7 +45,7 @@ def config_additional_args(cls) -> None:  # noqa: empty-method-without-abstract-
         """Optionally configure additional args to arg parser."""
 
     def process_file(self, file_path: str) -> None:
-        with open(file_path, "r", encoding="utf-8") as f:
+        with open(file_path, encoding="utf-8") as f:
             file_str = f.read()
             try:
                 formatted_file_str = self.format_str(file_str)

bin/add_transform_test.py

@@ -6,6 +6,7 @@
 import shutil
 import subprocess
 import sys
+from copy import deepcopy
 from pathlib import Path
 from typing import Any, Dict
 
@@ -74,7 +75,7 @@ def replace_aws_partition(partition: str, file_path: str) -> None:
 def generate_transform_test_output_files(input_file_path: str, file_basename: str) -> None:
     output_file_option = file_basename + ".json"
 
-    with open(os.path.join(input_file_path), "r") as f:
+    with open(os.path.join(input_file_path)) as f:
         manifest = yaml_parse(f)  # type: ignore[no-untyped-call]
 
     transform_test_output_paths = {
@@ -86,7 +87,8 @@ def generate_transform_test_output_files(input_file_path: str, file_basename: st
     for partition, (region, output_path) in transform_test_output_paths.items():
         # Set Boto Session Region to guarantee the same hash input as transform tests for API deployment id
         ArnGenerator.BOTO_SESSION_REGION_NAME = region
-        output_fragment = transform(manifest, {}, ManagedPolicyLoader(iam_client))
+        # Implicit API Plugin may alter input template file, thus passing a copy here.
+        output_fragment = transform(deepcopy(manifest), {}, ManagedPolicyLoader(iam_client))
 
         if not CLI_OPTIONS.disable_api_configuration and partition != "aws":
             output_fragment = add_regional_endpoint_configuration_if_needed(output_fragment)

bin/sam-translate.py

@@ -40,7 +40,7 @@
     "--output-template",
     help="Location to store resulting CloudFormation template [default: transformed-template.json].",
     type=Path,
-    default=Path("transformed-template.yaml"),
+    default=Path("transformed-template.json"),
 )
 parser.add_argument(
     "--s3-bucket",
@@ -102,7 +102,7 @@ def package(input_file_path, output_file_path):  # type: ignore[no-untyped-def]
 
 
 def transform_template(input_file_path, output_file_path):  # type: ignore[no-untyped-def]
-    with open(input_file_path, "r") as f:
+    with open(input_file_path) as f:
         sam_template = yaml_parse(f)  # type: ignore[no-untyped-call]
 
     try:

integration/combination/test_api_settings.py

@@ -1,17 +1,12 @@
 import hashlib
+from pathlib import Path
 from unittest.case import skipIf
 
-from integration.config.service_names import REST_API
-from integration.helpers.resource import current_region_does_not_support
-
-try:
-    from pathlib import Path
-except ImportError:
-    from pathlib2 import Path
-
 from parameterized import parameterized
 
+from integration.config.service_names import REST_API
 from integration.helpers.base_test import BaseTest
+from integration.helpers.resource import current_region_does_not_support
 
 
 @skipIf(current_region_does_not_support([REST_API]), "Rest API is not supported in this testing region")

integration/combination/test_api_with_authorizer_apikey.py

@@ -85,7 +85,7 @@ def verify_authorized_request(
         status = response.status_code
         if status != expected_status_code:
             raise StatusCodeError(
-                "Request to {} failed with status: {}, expected status: {}".format(url, status, expected_status_code)
+                f"Request to {url} failed with status: {status}, expected status: {expected_status_code}"
             )
 
         if not header_key or not header_value:

integration/combination/test_api_with_authorizers.py

@@ -444,7 +444,7 @@ def verify_authorized_request(
 
         if status != expected_status_code:
             raise StatusCodeError(
-                "Request to {} failed with status: {}, expected status: {}".format(url, status, expected_status_code)
+                f"Request to {url} failed with status: {status}, expected status: {expected_status_code}"
             )
 
         if not header_key or not header_value: