Only require account ID when git refs are used

When --json-regions and --json-template are used (and the git ref args are not) the account ID argument is unused. Signed-off-by: Tim Lane <[email protected]>
aws · Mar 1, 2021 · 7149af0 · 7149af0
1 parent c7df59d
commit 7149af0
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/util/generate-ami-list.py b/util/generate-ami-list.py
@@ -322,15 +322,18 @@ def parse_args():
     parser.add_argument(
         "--partition", type=str, help="commercial | china | govcloud", required=True, choices=PARTITIONS
     )
-    parser.add_argument("--account-id", type=str, help="AWS account id owning the AMIs", required=True)
+    parser.add_argument("--account-id", type=str, help="AWS account id owning the AMIs", required=False)
     parser.add_argument(
         "--cloudformation-template",
         type=str,
         help="path to output cloudfomation template",
         required=False,
         default="cloudformation/aws-parallelcluster.cfn.json",
     )
-    return parser.parse_args()
+    args = parser.parse_args()
+    if args.cookbook_git_ref and args.node_git_ref and not args.account_id:
+        raise Exception("Must specify value for --account-id when using --cookbook-git-ref and --node-git-ref.")
+    return args
 
 
 def main():