Revert "[RFE] Support for tags from the configuration file (#555)" (#655

) This reverts commit 317b132.
ansible · Feb 21, 2024 · e991c1a · e991c1a
1 parent 0563a9d
commit e991c1a
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 38 deletions.
diff --git a/demo/execution-environment.yml b/demo/execution-environment.yml
@@ -10,8 +10,6 @@ images:
 
 options:
   user: '1000'  # (optional) sets the username or UID
-  # tags:  # (optional) sets tags
-  #   - 'ee_development:latest'
 
 dependencies:
   python_interpreter:

diff --git a/docs/definition.rst b/docs/definition.rst
@@ -361,9 +361,6 @@ builder runtime functionality. Valid keys for this section are:
       This sets the username or UID to use as the default user for the final container image.
       The default value ``1000``.
 
-    ``tags``
-      Specifies the name which is assigned to resulting image if build process completes successfully.
-      The default value is ``ansible-execution-env:latest``.
 
 Example ``options`` section:
 
@@ -379,8 +376,6 @@ Example ``options`` section:
         skip_ansible_check: true
         workdir: /myworkdir
         user: bob
-        tags:
-          - ee_development:latest
 
 version
 ^^^^^^^

diff --git a/src/ansible_builder/cli.py b/src/ansible_builder/cli.py
@@ -194,7 +194,13 @@ def parse_args(args=None):
 
     add_container_options(subparsers)
 
-    return parser.parse_args(args)
+    args = parser.parse_args(args)
+
+    # Tag default must be handled differently. See comment for --tag option.
+    if 'tag' not in vars(args) or not args.tag:
+        args.tag = [constants.default_tag]
+
+    return args
 
 
 class BuildArgAction(argparse.Action):

diff --git a/src/ansible_builder/ee_schema.py b/src/ansible_builder/ee_schema.py
@@ -329,7 +329,7 @@
         },
 
         "options": {
-            "description": "Options that affect the runtime behavior",
+            "description": "Options that effect runtime behavior",
             "type": "object",
             "additionalProperties": False,
             "properties": {
@@ -372,14 +372,6 @@
                         },
                     },
                 },
-                "tags": {
-                    "description": "A list of names to assign to the resulting image if build process completes successfully",
-                    "type": "array",
-                    "items": {
-                        "type": "string"
-                    }
-
-                },
             },
         },
     },
@@ -452,4 +444,3 @@ def _handle_options_defaults(ee_def: dict):
         'cmd': '["bash"]',
     })
     options.setdefault('user', '1000')
-    options.setdefault('tags', [])
diff --git a/src/ansible_builder/main.py b/src/ansible_builder/main.py
@@ -46,13 +46,7 @@ def __init__(self,
         self.definition = UserDefinition(filename=filename)
         self.definition.validate()
 
-        self.tags = [constants.default_tag]
-        if self.definition.version >= 3 and self.definition.options['tags']:
-            self.tags = self.definition.options['tags']
-
-        if tag:
-            self.tags = tag
-
+        self.tags = tag or []
         self.build_context = build_context
         self.build_outputs_dir = os.path.join(
             build_context, constants.user_content_subfolder)

diff --git a/test/unit/test_user_definition.py b/test/unit/test_user_definition.py
@@ -241,19 +241,6 @@ def test_v3_set_user_name(self, exec_env_definition_file):
         value = definition.raw.get('options', {}).get('user')
         assert value == 'bob'
 
-    def test_v3_set_tags(self, exec_env_definition_file):
-        """
-        Test that options.tags sets to tags
-        """
-        path = exec_env_definition_file(
-            "{'version': 3, 'options': {'tags': ['ee_test:latest']}}"
-        )
-        definition = UserDefinition(path)
-        definition.validate()
-
-        value = definition.raw.get('options', {}).get('tags')
-        assert value == ['ee_test:latest']
-
 
 class TestImageDescription: