Merge pull request #8058 from sean-m-sullivan/workflow_label

Workflow label

Reviewed-by: Alan Rominger <arominge@redhat.com>
             https://github.com/AlanCoding

awx_collection/plugins/modules/tower_job_template.py

@@ -480,6 +480,12 @@ def main():
         association_fields['labels'] = []
         for item in labels:
             association_fields['labels'].append(module.resolve_name_to_id('labels', item))
+# Code to use once Issue #7567 is resolved
+#            search_fields = {'name': item}
+#            if organization:
+#                search_fields['organization'] = organization_id
+#            label_id = module.get_one('labels', **{'data': search_fields})
+#            association_fields['labels'].append(label_id)
 
     notifications_start = module.params.get('notification_templates_started')
     if notifications_start is not None:

awx_collection/plugins/modules/tower_workflow_job_template.py

@@ -98,6 +98,11 @@ options:
       description:
         - The definition of the survey associated to the workflow.
       type: dict
+    labels:
+      description:
+        - The labels applied to this job template
+      type: list
+      elements: str
     state:
       description:
         - Desired state of the resource.
@@ -168,6 +173,7 @@ def main():
         ask_limit_on_launch=dict(type='bool'),
         webhook_service=dict(choices=['github', 'gitlab']),
         webhook_credential=dict(),
+        labels=dict(type="list", elements='str'),
         notification_templates_started=dict(type="list", elements='str'),
         notification_templates_success=dict(type="list", elements='str'),
         notification_templates_error=dict(type="list", elements='str'),
@@ -247,6 +253,18 @@ def main():
         for item in notifications_approval:
             association_fields['notification_templates_approvals'].append(module.resolve_name_to_id('notification_templates', item))
 
+    labels = module.params.get('labels')
+    if labels is not None:
+        association_fields['labels'] = []
+        for item in labels:
+            association_fields['labels'].append(module.resolve_name_to_id('labels', item))
+# Code to use once Issue #7567 is resolved
+#            search_fields = {'name': item}
+#            if organization:
+#                search_fields['organization'] = organization_id
+#            label_id = module.get_one('labels', **{'data': search_fields})
+#            association_fields['labels'].append(label_id)
+
     on_change = None
     new_spec = module.params.get('survey')
     if new_spec:

awx_collection/tests/integration/targets/tower_workflow_job_template/tasks/main.yml

@@ -9,6 +9,7 @@
     demo_project_name: "AWX-Collection-tests-tower_workflow_job_template-proj-{{ test_id }}"
     jt1_name: "AWX-Collection-tests-tower_workflow_job_template-jt1-{{ test_id }}"
     jt2_name: "AWX-Collection-tests-tower_workflow_job_template-jt2-{{ test_id }}"
+    lab1: "AWX-Collection-tests-tower_job_template-lab1-{{ test_id }}"
     wfjt_name: "AWX-Collection-tests-tower_workflow_job_template-wfjt-{{ test_id }}"
     email_not: "AWX-Collection-tests-tower_job_template-email-not-{{ test_id }}"
     webhook_not: "AWX-Collection-tests-tower_notification_template-wehbook-not-{{ test_id }}"
@@ -51,6 +52,11 @@
     state: present
   register: result
 
+- name: Create Label
+  tower_label:
+    name: "{{ lab1 }}"
+    organization: Default
+
 - name: Create a Demo Project
   tower_project:
     name: "{{ demo_project_name }}"
@@ -117,6 +123,8 @@
     name: "{{ wfjt_name }}"
     inventory: Demo Inventory
     extra_vars: {'foo': 'bar', 'another-foo': {'barz': 'bar2'}}
+    labels:
+      - "{{ lab1 }}"
   register: result
 
 - assert: