Consistent naming

Author: RikishK

metaflow/plugins/aws/batch/batch.py

@@ -188,7 +188,7 @@ def create_job(
         host_volumes=None,
         efs_volumes=None,
         use_tmpfs=None,
-        aws_tags=None,
+        aws_batch_tags=None,
         cli_aws_batch_tags=None,
         tmpfs_tempdir=None,
         tmpfs_size=None,
@@ -344,8 +344,8 @@ def create_job(
                 for tag in cli_aws_batch_tags:
                     job.tag(tag['key'], tag['value'])
 
-            if aws_tags is not None:
-                for tag in aws_tags:
+            if aws_batch_tags is not None:
+                for tag in aws_batch_tags:
                     job.tag(tag['key'], tag['value'])
 
         return job
@@ -417,7 +417,7 @@ def launch_job(
             host_volumes=host_volumes,
             efs_volumes=efs_volumes,
             use_tmpfs=use_tmpfs,
-            aws_tags=aws_tags,
+            aws_batch_tags=aws_tags,
             tmpfs_tempdir=tmpfs_tempdir,
             tmpfs_size=tmpfs_size,
             tmpfs_path=tmpfs_path,

metaflow/plugins/aws/step_functions/step_functions.py

@@ -48,7 +48,7 @@ def __init__(
         event_logger,
         monitor,
         tags=None,
-        aws_tags=None,
+        aws_batch_tags=None,
         namespace=None,
         username=None,
         max_workers=None,
@@ -68,7 +68,7 @@ def __init__(
         self.event_logger = event_logger
         self.monitor = monitor
         self.tags = tags
-        self.aws_tags = aws_tags
+        self.aws_batch_tags = aws_batch_tags
         self.namespace = namespace
         self.username = username
         self.max_workers = max_workers
@@ -834,8 +834,8 @@ def _batch(self, node):
                 swappiness=resources["swappiness"],
                 efa=resources["efa"],
                 use_tmpfs=resources["use_tmpfs"],
-                aws_tags=resources["aws_tags"],
-                cli_aws_batch_tags=self.aws_tags,
+                aws_batch_tags=resources["aws_batch_tags"],
+                cli_aws_batch_tags=self.aws_batch_tags,
                 tmpfs_tempdir=resources["tmpfs_tempdir"],
                 tmpfs_size=resources["tmpfs_size"],
                 tmpfs_path=resources["tmpfs_path"],

metaflow/plugins/aws/step_functions/step_functions_cli.py

@@ -99,8 +99,8 @@ def step_functions(obj, name=None):
     "times to attach multiple tags.",
 )
 @click.option(
-    "--aws-tags",
-    "aws_tags",
+    "--aws-batch-tags",
+    "aws_batch_tags",
     multiple=True,
     default=None,
     help="AWS tags.")
@@ -150,7 +150,7 @@ def step_functions(obj, name=None):
 def create(
     obj,
     tags=None,
-    aws_tags=None,
+    aws_batch_tags=None,
     user_namespace=None,
     only_json=False,
     authorize=None,
@@ -204,7 +204,7 @@ def create(
         token,
         obj.state_machine_name,
         tags,
-        aws_tags,
+        aws_batch_tags,
         user_namespace,
         max_workers,
         workflow_timeout,
@@ -324,7 +324,7 @@ def make_flow(
     token,
     name,
     tags,
-    aws_tags,
+    aws_batch_tags,
     namespace,
     max_workers,
     workflow_timeout,
@@ -348,15 +348,15 @@ def make_flow(
     )[0]
 
 
-    if aws_tags is not None:
-        if not all(isinstance(item, str) for item in aws_tags):
+    if aws_batch_tags is not None:
+        if not all(isinstance(item, str) for item in aws_batch_tags):
             raise MetaflowException("AWS Step Functions --aws-tags all items in list must be strings")
-        for item in aws_tags:
+        for item in aws_batch_tags:
             if len(item.split('=')) != 2:
                 raise MetaflowException("AWS Step Functions --aws-tags strings must be in format 'key=value'")
         aws_tags_list = [
             {'key': item.split('=')[0],
-                'value': item.split('=')[1]} for item in aws_tags
+                'value': item.split('=')[1]} for item in aws_batch_tags
         ]
         for tag in aws_tags_list:
             validate_aws_tag(tag)
@@ -377,7 +377,7 @@ def make_flow(
         obj.event_logger,
         obj.monitor,
         tags=tags,
-        aws_tags=aws_tags_list,
+        aws_batch_tags=aws_tags_list,
         namespace=namespace,
         max_workers=max_workers,
         username=get_username(),