fix: add missing account IDs for af-south-1 and eu-south-1

ajaykarpur · ajaykarpur · commit fb2461e81547 · 2020-09-18T13:04:37.000-07:00
diff --git a/src/sagemaker/amazon/amazon_estimator.py b/src/sagemaker/amazon/amazon_estimator.py
@@ -513,6 +513,8 @@ def registry(region_name, algorithm=None):
             "me-south-1": "249704162688",
             "cn-north-1": "390948362332",
             "cn-northwest-1": "387376663083",
+            "af-south-1": "455444449433",
+            "eu-south-1": "257386234256",
         }
     elif algorithm in ["lda"]:
         region_to_accounts = {
@@ -556,6 +558,8 @@ def registry(region_name, algorithm=None):
             "me-south-1": "249704162688",
             "cn-north-1": "390948362332",
             "cn-northwest-1": "387376663083",
+            "af-south-1": "455444449433",
+            "eu-south-1": "257386234256",
         }
     elif algorithm in [
         "xgboost",
@@ -588,6 +592,8 @@ def registry(region_name, algorithm=None):
             "me-south-1": "249704162688",
             "cn-north-1": "390948362332",
             "cn-northwest-1": "387376663083",
+            "af-south-1": "455444449433",
+            "eu-south-1": "257386234256",
         }
     elif algorithm in ["image-classification-neo", "xgboost-neo"]:
         region_to_accounts = NEO_IMAGE_ACCOUNT
diff --git a/src/sagemaker/debugger.py b/src/sagemaker/debugger.py
@@ -48,6 +48,8 @@
     "ca-central-1": {RULES_ECR_REPO_NAME: "519511493484"},
     "cn-north-1": {RULES_ECR_REPO_NAME: "618459771430"},
     "cn-northwest-1": {RULES_ECR_REPO_NAME: "658757709296"},
+    "af-south-1": {RULES_ECR_REPO_NAME: "314341159256"},
+    "eu-south-1": {RULES_ECR_REPO_NAME: "563282790590"},
 }
 
 
diff --git a/src/sagemaker/fw_registry.py b/src/sagemaker/fw_registry.py
@@ -130,6 +130,16 @@
         "scikit-learn": "451049120500",
         "xgboost": "451049120500",
     },
+    "af-south-1": {
+        "sparkml-serving": "510948584623",
+        "scikit-learn": "510948584623",
+        "xgboost": "455444449433",
+    },
+    "eu-south-1": {
+        "sparkml-serving": "978288397137",
+        "scikit-learn": "978288397137",
+        "xgboost": "257386234256",
+    },
 }
 
 
diff --git a/src/sagemaker/fw_utils.py b/src/sagemaker/fw_utils.py
@@ -91,8 +91,18 @@
     "cn-north-1": "727897471807",
     "cn-northwest-1": "727897471807",
 }
-OPT_IN_ACCOUNTS_BY_REGION = {"ap-east-1": "057415533634", "me-south-1": "724002660598"}
-ASIMOV_OPT_IN_ACCOUNTS_BY_REGION = {"ap-east-1": "871362719292", "me-south-1": "217643126080"}
+OPT_IN_ACCOUNTS_BY_REGION = {
+    "ap-east-1": "057415533634",
+    "me-south-1": "724002660598",
+    "af-south-1": "313743910680",
+    "eu-south-1": "048378556238",
+}
+ASIMOV_OPT_IN_ACCOUNTS_BY_REGION = {
+    "ap-east-1": "871362719292",
+    "me-south-1": "217643126080",
+    "af-south-1": "626614931356",
+    "eu-south-1": "692866216735",
+}
 DEFAULT_ACCOUNT = "520713654638"
 ASIMOV_PROD_ACCOUNT = "763104351884"
 ASIMOV_DEFAULT_ACCOUNT = ASIMOV_PROD_ACCOUNT
diff --git a/src/sagemaker/model.py b/src/sagemaker/model.py
@@ -50,6 +50,8 @@
     "cn-north-1": "472730292857",
     "cn-northwest-1": "474822919863",
     "us-gov-west-1": "263933020539",
+    "af-south-1": "774647643957",
+    "eu-south-1": "966458181534",
 }
 
 INFERENTIA_INSTANCE_PREFIX = "ml_inf"
diff --git a/src/sagemaker/model_monitor/model_monitoring.py b/src/sagemaker/model_monitor/model_monitoring.py
@@ -58,6 +58,8 @@
     "cn-north-1": "453000072557",
     "cn-northwest-1": "453252182341",
     "us-gov-west-1": "362178532790",
+    "af-south-1": "875698925577",
+    "eu-south-1": "933208885752",
 }
 
 STATISTICS_JSON_DEFAULT_FILE_NAME = "statistics.json"
diff --git a/tests/integ/__init__.py b/tests/integ/__init__.py
@@ -74,9 +74,32 @@
     "us-west-2",
 ]
 
-NO_LDA_REGIONS = ["eu-west-3", "eu-north-1", "sa-east-1", "ap-east-1", "me-south-1"]
-NO_MARKET_PLACE_REGIONS = ["eu-west-3", "eu-north-1", "sa-east-1", "ap-east-1", "me-south-1"]
-NO_AUTO_ML_REGIONS = ["sa-east-1", "me-south-1", "ap-east-1", "eu-west-3"]
+NO_LDA_REGIONS = [
+    "eu-west-3",
+    "eu-north-1",
+    "sa-east-1",
+    "ap-east-1",
+    "me-south-1",
+    "af-south-1",
+    "eu-south-1",
+]
+NO_MARKET_PLACE_REGIONS = [
+    "eu-west-3",
+    "eu-north-1",
+    "sa-east-1",
+    "ap-east-1",
+    "me-south-1",
+    "af-south-1",
+    "eu-south-1",
+]
+NO_AUTO_ML_REGIONS = [
+    "sa-east-1",
+    "me-south-1",
+    "ap-east-1",
+    "eu-west-3",
+    "af-south-1",
+    "eu-south-1",
+]
 NO_MODEL_MONITORING_REGIONS = ["me-south-1"]
 
 EFS_TEST_ENABLED_REGION = []
diff --git a/tests/unit/__init__.py b/tests/unit/__init__.py
@@ -38,4 +38,6 @@
     "cn-north-1",
     "cn-northwest-1",
     "us-gov-west-1",
+    "af-south-1",
+    "eu-south-1",
 ]

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,8 @@`
`48`	`48`	`"ca-central-1": {RULES_ECR_REPO_NAME: "519511493484"},`
`49`	`49`	`"cn-north-1": {RULES_ECR_REPO_NAME: "618459771430"},`
`50`	`50`	`"cn-northwest-1": {RULES_ECR_REPO_NAME: "658757709296"},`
	`51`	`+ "af-south-1": {RULES_ECR_REPO_NAME: "314341159256"},`
	`52`	`+ "eu-south-1": {RULES_ECR_REPO_NAME: "563282790590"},`
`51`	`53`	`}`
`52`	`54`
`53`	`55`
Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,8 @@`
`50`	`50`	`"cn-north-1": "472730292857",`
`51`	`51`	`"cn-northwest-1": "474822919863",`
`52`	`52`	`"us-gov-west-1": "263933020539",`
	`53`	`+ "af-south-1": "774647643957",`
	`54`	`+ "eu-south-1": "966458181534",`
`53`	`55`	`}`
`54`	`56`
`55`	`57`	`INFERENTIA_INSTANCE_PREFIX = "ml_inf"`
Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,8 @@`
`58`	`58`	`"cn-north-1": "453000072557",`
`59`	`59`	`"cn-northwest-1": "453252182341",`
`60`	`60`	`"us-gov-west-1": "362178532790",`
	`61`	`+ "af-south-1": "875698925577",`
	`62`	`+ "eu-south-1": "933208885752",`
`61`	`63`	`}`
`62`	`64`
`63`	`65`	`STATISTICS_JSON_DEFAULT_FILE_NAME = "statistics.json"`
Original file line number	Diff line number	Diff line change
`@@ -38,4 +38,6 @@`
`38`	`38`	`"cn-north-1",`
`39`	`39`	`"cn-northwest-1",`
`40`	`40`	`"us-gov-west-1",`
	`41`	`+ "af-south-1",`
	`42`	`+ "eu-south-1",`
`41`	`43`	`]`