Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Sep 22, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion buildspec.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ phases:

- start_time=`date +%s`
- |
execute-command-if-has-matching-changes "env -u AWS_DEFAULT_REGION tox -e py38 -- tests/integ -m \"not local_mode\" -n 512 --reruns 3 --reruns-delay 5 --durations 50 --boto-config '{\"region_name\": \"us-east-2\"}'" "tests/integ" "tests/scripts" "tests/data" "tests/conftest.py" "tests/__init__.py" "src/*.py" "setup.py" "setup.cfg" "buildspec.yml"
execute-command-if-has-matching-changes "env -u AWS_DEFAULT_REGION tox -e py38 -- tests/integ -m \"not local_mode and not cron\" -k "not byo_airflow_config_uploads_data_source_to_s3_when_inputs_provided" -n 384 --reruns 3 --reruns-delay 15 --durations 50 --boto-config '{\"region_name\": \"us-east-2\"}'" "tests/integ" "tests/scripts" "tests/data" "tests/conftest.py" "tests/__init__.py" "src/*.py" "setup.py" "setup.cfg" "buildspec.yml"
- ./ci-scripts/displaytime.sh 'py38 tests/integ' $start_time

post_build:
Expand Down
6 changes: 6 additions & 0 deletions src/sagemaker/amazon/amazon_estimator.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions src/sagemaker/debugger.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"},
}


Expand Down
10 changes: 10 additions & 0 deletions src/sagemaker/fw_registry.py
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,16 @@
"scikit-learn": "451049120500",
"xgboost": "451049120500",
},
"af-south-1": {
"sparkml-serving": "510948584623",
"scikit-learn": "510948584623",
"xgboost": "510948584623",
},
"eu-south-1": {
"sparkml-serving": "978288397137",
"scikit-learn": "978288397137",
"xgboost": "978288397137",
},
}


Expand Down
14 changes: 12 additions & 2 deletions src/sagemaker/fw_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions src/sagemaker/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 2 additions & 0 deletions src/sagemaker/model_monitor/model_monitoring.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
29 changes: 26 additions & 3 deletions tests/integ/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 = []
Expand Down
2 changes: 2 additions & 0 deletions tests/unit/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,6 @@
"cn-north-1",
"cn-northwest-1",
"us-gov-west-1",
"af-south-1",
"eu-south-1",
]