Merged in dev/can/rm-us-west-1-2022-02-03 (pull request elastic#428)

Remove us-west-1 from AMI distribution Approved-by: Gideon Avida
mindw · Feb 4, 2022 · a7702ff · a7702ff
1 parent aa3061e
commit a7702ff
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/build-utils/build_and_distribute_ami.py b/build-utils/build_and_distribute_ami.py
@@ -54,7 +54,6 @@
 DESTINATION_REGIONS = [
     "us-east-1",
     "us-east-2",
-    "us-west-1",
     "eu-north-1",
     "ap-southeast-2",
 ]

diff --git a/build-utils/delete_ami.py b/build-utils/delete_ami.py
@@ -9,7 +9,7 @@
 parser = argparse.ArgumentParser()
 parser.add_argument("ami_ids", nargs="+", help="AMI IDs to delete")
 parser.add_argument("-r", "--region",
-    choices=["us-east-1", "us-east-2", "us-west-1", "us-west-2", "eu-north-1", "ap-southeast-2"],
+    choices=["us-east-1", "us-east-2", "us-west-2", "eu-north-1", "ap-southeast-2"],
     default="us-west-2",
     help="AWS region hosting the AMI. Default: %(default)s")
 args = parser.parse_args()

diff --git a/build-utils/share-ami.py b/build-utils/share-ami.py
@@ -11,7 +11,7 @@
 parser.add_argument("account_id", help="Targe Account ID")
 parser.add_argument("ami_id", nargs="+", help="AMI ID to share")
 parser.add_argument("-r", "--region",
-    choices=["us-east-1", "us-east-2", "us-west-1", "us-west-2", "eu-north-1"],
+    choices=["us-east-1", "us-east-2", "us-west-2", "eu-north-1"],
     default="us-west-2",
     help="AWS region hosting the AMI. Default: %(default)s")
 args = parser.parse_args()