Merge pull request #869 from andrew-glenn/main

andrew-glenn · web-flow · commit 8269647192dd · 2026-01-28T13:24:31.000-06:00
New regions and pre-commit fixes.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,97 +1,98 @@
 exclude: ^(.travis.yml|.pre-commit-config.yaml|.bumpversion.cfg)$
 fail_fast: true
 repos:
-- repo: https://github.com/pre-commit/mirrors-isort
-  rev: v5.10.1
-  hooks:
-  - id: isort
-    # language_version: python3.6
-- repo: https://github.com/ambv/black
-  rev: 22.3.0
-  hooks:
-  - id: black
-    exclude: regions_to_partitions.py
-- repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v2.4.0
-  hooks:
-  - id: check-case-conflict
-  - id: end-of-file-fixer
-  - id: mixed-line-ending
-    args:
-    - --fix=lf
-  - id: trailing-whitespace
-  - id: flake8
-    additional_dependencies:
-    - flake8-bugbear>=19.3.0
-    - flake8-builtins>=1.4.1
-    - flake8-commas>=2.0.0
-    - flake8-comprehensions>=2.1.0
-    - flake8-debugger>=3.1.0
-    - flake8-pep3101>=1.2.1
-    - flake8-print>=3.1.0
-    # language_version: python3.6
-  - id: pretty-format-json
-    args:
-    - --autofix
-    - --indent=4
-    - --no-sort-keys
-  - id: check-merge-conflict
-- repo: https://github.com/pre-commit/pygrep-hooks
-  rev: v1.9.0
-  hooks:
-  - id: python-check-blanket-noqa
-  - id: python-check-mock-methods
-  - id: python-no-log-warn
-- repo: https://github.com/PyCQA/bandit
-  rev: 1.7.4
-  hooks:
-  - id: bandit
-    files: "^taskcat/"
-      #- repo: https://github.com/pre-commit/mirrors-mypy
-      #  rev: v0.761
-      #  hooks:
-      #  - id: mypy
-      #    files: "^taskcat/"
-- repo: local
-  hooks:
-  - id: update-schema
-    name: update-schema
-    description: generate schema from dataclasses
-    entry: ./generate_schema.py
-    language: system
-    pass_filenames: false
-    always_run: true
-  - id: git-secrets-register-aws
-    name: git-secrets-register-aws
-    description: Register AWS patterns with git-secrets
-    entry: git-secrets --register-aws
-    language: system
-    always_run: true
-    pass_filenames: false
-  - id: git-secrets
-    name: git-secrets
-    description: Run git-secrets
-    entry: git-secrets --scan
-    language: system
-    always_run: true
-  - id: update-region-mappings
-    name: update-region-mappings
-    description: update region-partition mappings
-    entry: ./update_partition_region_map.py
-    language: system
-    pass_filenames: false
-    always_run: true
-  - id: pylint-local
-    name: pylint-local
-    description: Run pylint in the local virtualenv
-    entry: pylint "--disable=C0209" "taskcat/" "bin/"
-    language: system
-    pass_filenames: false
-    always_run: true
-  - id: pytest-local
-    name: pytest-local
-    description: Run pytest in the local virtualenv
-    entry: pytest --cov="./taskcat/"
-    language: system
-    pass_filenames: false
-    always_run: true
+  - repo: https://github.com/pre-commit/mirrors-isort
+    rev: v5.10.1
+    hooks:
+      - id: isort
+        # language_version: python3.6
+  - repo: https://github.com/ambv/black
+    rev: 22.3.0
+    hooks:
+      - id: black
+        exclude: regions_to_partitions.py
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v2.4.0
+    hooks:
+      - id: check-case-conflict
+      - id: end-of-file-fixer
+      - id: mixed-line-ending
+        args:
+          - --fix=lf
+      - id: trailing-whitespace
+      - id: flake8
+        additional_dependencies:
+          - flake8-bugbear>=19.3.0
+          - flake8-builtins>=1.4.1
+          - flake8-commas>=2.0.0
+          - flake8-comprehensions>=2.1.0
+          - flake8-debugger>=3.1.0
+          - flake8-pep3101>=1.2.1
+          - flake8-print>=3.1.0
+        # language_version: python3.6
+      - id: pretty-format-json
+        args:
+          - --autofix
+          - --indent=4
+          - --no-sort-keys
+      - id: check-merge-conflict
+  - repo: https://github.com/pre-commit/pygrep-hooks
+    rev: v1.9.0
+    hooks:
+      - id: python-check-blanket-noqa
+      - id: python-check-mock-methods
+      - id: python-no-log-warn
+  - repo: https://github.com/PyCQA/bandit
+    rev: 1.8.6
+    hooks:
+      - id: bandit
+        files:
+          "^taskcat/"
+          #- repo: https://github.com/pre-commit/mirrors-mypy
+          #  rev: v0.761
+          #  hooks:
+          #  - id: mypy
+          #    files: "^taskcat/"
+  - repo: local
+    hooks:
+      - id: update-schema
+        name: update-schema
+        description: generate schema from dataclasses
+        entry: ./generate_schema.py
+        language: system
+        pass_filenames: false
+        always_run: true
+      - id: git-secrets-register-aws
+        name: git-secrets-register-aws
+        description: Register AWS patterns with git-secrets
+        entry: git-secrets --register-aws
+        language: system
+        always_run: true
+        pass_filenames: false
+      - id: git-secrets
+        name: git-secrets
+        description: Run git-secrets
+        entry: git-secrets --scan
+        language: system
+        always_run: true
+      - id: update-region-mappings
+        name: update-region-mappings
+        description: update region-partition mappings
+        entry: ./update_partition_region_map.py
+        language: system
+        pass_filenames: false
+        always_run: true
+      - id: pylint-local
+        name: pylint-local
+        description: Run pylint in the local virtualenv
+        entry: pylint "--disable=C0209" "taskcat/" "bin/"
+        language: system
+        pass_filenames: false
+        always_run: true
+      - id: pytest-local
+        name: pytest-local
+        description: Run pytest in the local virtualenv
+        entry: pytest --cov="./taskcat/"
+        language: system
+        pass_filenames: false
+        always_run: true
diff --git a/.project_automation/static_tests/entrypoint.sh b/.project_automation/static_tests/entrypoint.sh
@@ -10,7 +10,7 @@ git clone https://github.com/awslabs/git-secrets.git
 cd git-secrets
 make install
 cd ${PROJECT_PATH}
-pip install -r dev-requirements.txt  -r requirements.txt
+pip install -r dev-requirements.txt -r requirements.txt
 pre-commit run --all-files
 if [ $? -ne 0 ]; then
   git status
diff --git a/dev-requirements.txt b/dev-requirements.txt
@@ -1,4 +1,4 @@
-pre-commit~=2.9.2
+pre-commit~=4.2.0
 black~=24.3.0
 pylint~=3.2
 pytest-cov~=2.7
diff --git a/pyproject.toml b/pyproject.toml
@@ -3,6 +3,7 @@ version = "0.9.57"
 authors = ["Andrew Glenn", "Jay McConnell", "Shivansh Singh", "Tony Vattathil"]
 description = "An OpenSource Cloudformation Deployment Framework"
 name = "taskcat"
+packages = [{include = "taskcat"}]
 
 [tool.poetry.dependencies]
 pathspec = '0.10.3'
@@ -73,3 +74,7 @@ Installation = "docs/INSTALLATION.md"
 #
 # [[tool.portray.mkdocs.nav]]
 # Usage = "docs/usage/"
+
+[build-system]
+requires = ["poetry-core>=1.0.0"]
+build-backend = "poetry.core.masonry.api"
diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,6 @@
 pathspec==0.10.3
 reprint
+ruamel.yaml
 tabulate>=0.8.2,<1.0
 cfn_lint>=0.78.1,<2.0
 setuptools>=40.4.3
diff --git a/setup.cfg b/setup.cfg
@@ -1,5 +1,5 @@
 [metadata]
-description-file = README.md
+description_file = README.md
 
 [flake8]
 exclude =
diff --git a/taskcat/_cfn/stack_url_helper.py b/taskcat/_cfn/stack_url_helper.py
@@ -1,18 +1,18 @@
 """
-  Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy of this
-  software and associated documentation files (the "Software"), to deal in the Software
-  without restriction, including without limitation the rights to use, copy, modify,
-  merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-  INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-  PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-  HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-  SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this
+software and associated documentation files (the "Software"), to deal in the Software
+without restriction, including without limitation the rights to use, copy, modify,
+merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 """
 
 import json
diff --git a/taskcat/_cli_modules/deploy.py b/taskcat/_cli_modules/deploy.py
@@ -64,7 +64,7 @@ def run(  # noqa: C901
             LOG.info(f"fetching git repo {url}")
             self._git_clone(url, path)
             self._recurse_submodules(path, url)
-        _extra_tags = [(Tag({"Key": "taskcat-installer", "Value": name}))]
+        _extra_tags = [Tag({"Key": "taskcat-installer", "Value": name})]
         Test.run(
             regions=regions,
             no_delete=True,
diff --git a/taskcat/_client_factory.py b/taskcat/_client_factory.py
@@ -173,6 +173,11 @@ def _get_partition(self, profile):
             ("aws", "us-east-1"),
             ("aws-cn", "cn-north-1"),
             ("aws-us-gov", "us-gov-west-1"),
+            ("aws-iso", "us-iso-east-1"),
+            ("aws-iso-b", "us-isob-east-1"),
+            ("aws-iso-e", "eu-isoe-west-1"),
+            ("aws-iso-f", "us-isof-east-1"),
+            ("aws-eusc", "eusc-de-east-1"),
         ]
         for partition, region in partition_regions:
             try:
diff --git a/taskcat/_common_utils.py b/taskcat/_common_utils.py
@@ -22,6 +22,11 @@
     "aws": "amazonaws.com",
     "aws-cn": "amazonaws.com.cn",
     "aws-us-gov": "amazonaws.com",
+    "aws-iso": "c2s.ic.gov",
+    "aws-iso-b": "sc2s.sgov.gov",
+    "aws-iso-e": "cloud.adc-e.uk",
+    "aws-iso-f": "csp.hci.ic.gov",
+    "aws-eusc": "amazonaws.eu",
 }
 
 FIRST_CAP_RE = re.compile("(.)([A-Z][a-z]+)")
diff --git a/taskcat/_config.py b/taskcat/_config.py
@@ -200,7 +200,7 @@ def _dict_from_template(file_path: Path) -> dict:
     # pylint: disable=protected-access
     @staticmethod
     def _dict_from_env_vars(
-        env_vars: Optional[Union[os._Environ, Dict[str, str]]] = None
+        env_vars: Optional[Union[os._Environ, Dict[str, str]]] = None,
     ):
         if env_vars is None:
             env_vars = os.environ
@@ -377,6 +377,16 @@ def _get_bucket_region_for_partition(partition):
             region = "us-gov-east-1"
         elif partition == "aws-cn":
             region = "cn-north-1"
+        elif partition == "aws-iso":
+            region = "us-iso-east-1"
+        elif partition == "aws-iso-b":
+            region = "us-isob-east-1"
+        elif partition == "aws-iso-e":
+            region = "eu-isoe-west-1"
+        elif partition == "aws-iso-f":
+            region = "us-isof-east-1"
+        elif partition == "aws-eusc":
+            region = "eusc-de-east-1"
         return region
 
     def get_rendered_parameters(self, bucket_objects, region_objects, template_objects):
diff --git a/taskcat/_dataclasses.py b/taskcat/_dataclasses.py
@@ -156,8 +156,8 @@ class RegionField(FieldEncoder):
     def json_schema(self):
         return {
             "type": "string",
-            "pattern": r"^(ap|eu|us|sa|ca|cn|af|me|il|mx|us-gov)-(central|south|north|east|"
-            r"west|southeast|southwest|northeast|northwest)-[0-9]$",
+            "pattern": r"^(ap|eu|us|sa|ca|cn|af|me|il|mx|us-gov|us-iso|us-isob|eu-isoe|us-isof|eusc)-([a-z]+-)?("
+            r"central|south|north|east|west|southeast|southwest|northeast|northwest)-[0-9]$",
             "description": "AWS Region name",
             "examples": ["us-east-1"],
         }
diff --git a/taskcat/_lambda_build.py b/taskcat/_lambda_build.py
@@ -176,7 +176,7 @@ def _zip_dir(build_path, output_path):
 
     @staticmethod
     def _docker_build(path, tag):
-        cli = APIClient(os.environ.get('DOCKER_HOST', 'unix://var/run/docker.sock'))
+        cli = APIClient(os.environ.get("DOCKER_HOST", "unix://var/run/docker.sock"))
         build_logs = []
         for line in cli.build(path=str(path), tag=tag):
             build_logs.append(line)
diff --git a/taskcat/_template_params.py b/taskcat/_template_params.py
diff --git a/taskcat/cfg/config_schema.json b/taskcat/cfg/config_schema.json
diff --git a/taskcat/exceptions.py b/taskcat/exceptions.py
diff --git a/taskcat/local_zones.py b/taskcat/local_zones.py
diff --git a/taskcat/regions_to_partitions.py b/taskcat/regions_to_partitions.py

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-pre-commit~=2.9.2`
	`1`	`+pre-commit~=4.2.0`
`2`	`2`	`black~=24.3.0`
`3`	`3`	`pylint~=3.2`
`4`	`4`	`pytest-cov~=2.7`