Merge pull request #6304 from AlanCoding/workflow_role

Add workflow to tower_role module

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul

awx_collection/plugins/modules/tower_role.py

@@ -50,6 +50,10 @@
       description:
         - The job template the role acts on.
       type: str
+    workflow:
+      description:
+        - The job template the role acts on.
+      type: str
     credential:
       description:
         - Credential the role acts on.
@@ -108,6 +112,7 @@ def update_resources(module, p):
         'target_team': 'name',
         'inventory': 'name',
         'job_template': 'name',
+        'workflow': 'name',
         'credential': 'name',
         'organization': 'name',
         'project': 'name',
@@ -133,6 +138,7 @@ def main():
         target_team=dict(),
         inventory=dict(),
         job_template=dict(),
+        workflow=dict(),
         credential=dict(),
         organization=dict(),
         project=dict(),

awx_collection/test/awx/test_role.py

@@ -0,0 +1,37 @@
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
+import pytest
+
+from awx.main.models import WorkflowJobTemplate, User
+
+
+@pytest.mark.django_db
+def test_grant_organization_permission(run_module, admin_user, organization):
+    rando = User.objects.create(username='rando')
+
+    result = run_module('tower_role', {
+        'user': rando.username,
+        'organization': organization.name,
+        'role': 'admin',
+        'state': 'present'
+    }, admin_user)
+    assert not result.get('failed', False), result.get('msg', result)
+
+    assert rando in organization.execute_role
+
+
+@pytest.mark.django_db
+def test_grant_workflow_permission(run_module, admin_user, organization):
+    wfjt = WorkflowJobTemplate.objects.create(organization=organization, name='foo-workflow')
+    rando = User.objects.create(username='rando')
+
+    result = run_module('tower_role', {
+        'user': rando.username,
+        'workflow': wfjt.name,
+        'role': 'execute',
+        'state': 'present'
+    }, admin_user)
+    assert not result.get('failed', False), result.get('msg', result)
+
+    assert rando in wfjt.execute_role

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

@@ -28,6 +28,24 @@
     that:
       - "result is changed"
 
+- name: Create a workflow
+  tower_workflow_template:
+    name: test-role-workflow
+    organization: Default
+    state: present
+
+- name: Add Joe to workflow execute role
+  tower_role:
+    user: joe
+    role: execute
+    workflow: test-role-workflow
+    state: present
+  register: result
+
+- assert:
+    that:
+      - "result is changed"
+
 - name: Delete a User
   tower_user:
     username: joe