Merge pull request #804 from jonloza/Added-region_il-central-1

Added Israel (Tel Aviv) - il-central-1, update AZs and updated schemas for new region
aws-ia · Aug 8, 2023 · 7a6ae64 · 7a6ae64
2 parents e24f9f3 + 47a43e9
commit 7a6ae64
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 11 deletions.
diff --git a/taskcat/_dataclasses.py b/taskcat/_dataclasses.py
@@ -156,7 +156,7 @@ class RegionField(FieldEncoder):
     def json_schema(self):
         return {
             "type": "string",
-            "pattern": r"^(ap|eu|us|sa|ca|cn|af|me|us-gov)-(central|south|north|east|"
+            "pattern": r"^(ap|eu|us|sa|ca|cn|af|me|il|us-gov)-(central|south|north|east|"
             r"west|southeast|southwest|northeast|northwest)-[0-9]$",
             "description": "AWS Region name",
             "examples": ["us-east-1"],
@@ -757,4 +757,4 @@ def merge(
 
         config._source = merged_source
         config._propogate_source()  # pylint: disable=protected-access
-        return config
+        return config
diff --git a/taskcat/cfg/config_schema.json b/taskcat/cfg/config_schema.json
@@ -13,7 +13,7 @@
                         "examples": [
                             "us-east-1"
                         ],
-                        "pattern": "^(ap|eu|us|sa|ca|cn|af|me|us-gov)-(central|south|north|east|west|southeast|southwest|northeast|northwest)-[0-9]$",
+                        "pattern": "^(ap|eu|us|sa|ca|cn|af|me|il|us-gov)-(central|south|north|east|west|southeast|southwest|northeast|northwest)-[0-9]$",
                         "type": "string"
                     },
                     "type": "array"
@@ -83,7 +83,7 @@
                         "examples": [
                             "us-east-1"
                         ],
-                        "pattern": "^(ap|eu|us|sa|ca|cn|af|me|us-gov)-(central|south|north|east|west|southeast|southwest|northeast|northwest)-[0-9]$",
+                        "pattern": "^(ap|eu|us|sa|ca|cn|af|me|il|us-gov)-(central|south|north|east|west|southeast|southwest|northeast|northwest)-[0-9]$",
                         "type": "string"
                     },
                     "type": "array"
@@ -144,7 +144,7 @@
                         "examples": [
                             "us-east-1"
                         ],
-                        "pattern": "^(ap|eu|us|sa|ca|cn|af|me|us-gov)-(central|south|north|east|west|southeast|southwest|northeast|northwest)-[0-9]$",
+                        "pattern": "^(ap|eu|us|sa|ca|cn|af|me|il|us-gov)-(central|south|north|east|west|southeast|southwest|northeast|northwest)-[0-9]$",
                         "type": "string"
                     },
                     "type": "array"
@@ -276,7 +276,7 @@
                         "examples": [
                             "us-east-1"
                         ],
-                        "pattern": "^(ap|eu|us|sa|ca|cn|af|me|us-gov)-(central|south|north|east|west|southeast|southwest|northeast|northwest)-[0-9]$",
+                        "pattern": "^(ap|eu|us|sa|ca|cn|af|me|il|us-gov)-(central|south|north|east|west|southeast|southwest|northeast|northwest)-[0-9]$",
                         "type": "string"
                     },
                     "type": "array"
@@ -360,7 +360,7 @@
                         "examples": [
                             "us-east-1"
                         ],
-                        "pattern": "^(ap|eu|us|sa|ca|cn|af|me|us-gov)-(central|south|north|east|west|southeast|southwest|northeast|northwest)-[0-9]$",
+                        "pattern": "^(ap|eu|us|sa|ca|cn|af|me|il|us-gov)-(central|south|north|east|west|southeast|southwest|northeast|northwest)-[0-9]$",
                         "type": "string"
                     },
                     "type": "array"
@@ -444,7 +444,7 @@
                         "examples": [
                             "us-east-1"
                         ],
-                        "pattern": "^(ap|eu|us|sa|ca|cn|af|me|us-gov)-(central|south|north|east|west|southeast|southwest|northeast|northwest)-[0-9]$",
+                        "pattern": "^(ap|eu|us|sa|ca|cn|af|me|il|us-gov)-(central|south|north|east|west|southeast|southwest|northeast|northwest)-[0-9]$",
                         "type": "string"
                     },
                     "type": "array"
@@ -556,4 +556,4 @@
         }
     },
     "type": "object"
-}
+}
diff --git a/taskcat/local_zones.py b/taskcat/local_zones.py
@@ -29,6 +29,8 @@
     "apse1-az2",
     "apse1-az3",
     "apse1-bkk1-az1",
+    "apse1-mnl1-az1",
+    "apse2-akl1-az1",
     "apse2-az1",
     "apse2-az2",
     "apse2-az3",
@@ -70,6 +72,9 @@
     "euw3-az1",
     "euw3-az2",
     "euw3-az3",
+    "ilc1-az1",
+    "ilc1-az2",
+    "ilc1-az3",
     "mec1-az1",
     "mec1-az2",
     "mec1-az3",
@@ -114,7 +119,7 @@
     "usw2-lax1-az1",
     "usw2-lax1-az2",
     "usw2-pdx1-az1",
-    "usw2-phx1-az1",
+    "usw2-phx2-az1",
     "usw2-sea1-az1"
 ]
 
diff --git a/taskcat/regions_to_partitions.py b/taskcat/regions_to_partitions.py
@@ -19,6 +19,7 @@
     "eu-west-1": "aws",
     "eu-west-2": "aws",
     "eu-west-3": "aws",
+    "il-central-1": "aws",
     "me-central-1": "aws",
     "me-south-1": "aws",
     "sa-east-1": "aws",
@@ -57,6 +58,7 @@
         "eu-west-1",
         "eu-west-2",
         "eu-west-3",
+        "il-central-1",
         "me-central-1",
         "me-south-1",
         "sa-east-1",
@@ -79,5 +81,7 @@
     ],
     "aws-iso-b": [
         "us-isob-east-1"
-    ]
+    ],
+    "aws-iso-e": [],
+    "aws-iso-f": []
 }