From 8af315cf29f6c227b4b51dad1325546786f90439 Mon Sep 17 00:00:00 2001
From: Sean Sullivan <ssulliva@redhat.com>
Date: Tue, 11 Aug 2020 08:54:10 -0500
Subject: [PATCH 01/69] Create tower_project_update

Add module to update tower project and wait until synced.
---
 .../plugins/modules/tower_project_update.py   | 146 ++++++++++++++++++
 1 file changed, 146 insertions(+)
 create mode 100644 awx_collection/plugins/modules/tower_project_update.py

diff --git a/awx_collection/plugins/modules/tower_project_update.py b/awx_collection/plugins/modules/tower_project_update.py
new file mode 100644
index 0000000000..1952244c93
--- /dev/null
+++ b/awx_collection/plugins/modules/tower_project_update.py
@@ -0,0 +1,146 @@
+#!/usr/bin/python
+# coding: utf-8 -*-
+
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+from __future__ import absolute_import, division, print_function
+__metaclass__ = type
+
+ANSIBLE_METADATA = {'metadata_version': '1.0',
+                    'status': ['preview'],
+                    'supported_by': 'community'}
+
+DOCUMENTATION = '''
+---
+module: tower_project_update
+author: "Sean Sullivan (@sean-m-sullivan)"
+short_description: Sync a Project in Ansible Tower
+description:
+    - Sync an Ansible Tower Project. See
+      U(https://www.ansible.com/tower) for an overview.
+options:
+    name:
+      description:
+        - The name of the workflow template to run.
+      required: True
+      type: str
+      aliases:
+        - project
+    organization:
+      description:
+        - Organization the workflow job template exists in.
+        - Used to help lookup the object, cannot be modified using this module.
+        - If not provided, will lookup by name only, which does not work with duplicates.
+      type: str
+    wait:
+      description:
+        - Wait for the workflow to complete.
+      default: True
+      type: bool
+    interval:
+      description:
+        - The interval to request an update from Tower.
+      required: False
+      default: 1
+      type: float
+    timeout:
+      description:
+        - If waiting for the workflow to complete this will abort after this
+          amount of seconds
+      type: int
+extends_documentation_fragment: awx.awx.auth
+'''
+
+RETURN = '''
+job_info:
+    description: dictionary containing information about the project updated
+    returned: If project synced
+    type: dict
+'''
+
+
+EXAMPLES = '''
+- name: Launch a workflow with a timeout of 10 seconds
+  tower_project_update:
+    project: "Networking Project"
+    timeout: 10
+
+- name: Launch a Workflow with extra_vars without waiting
+  tower_project_update:
+    project: "Networking Project"
+    wait: False
+'''
+
+from ..module_utils.tower_api import TowerModule
+import json
+import time
+
+
+def main():
+    # Any additional arguments that are not fields of the item can be added here
+    argument_spec = dict(
+        name=dict(required=True, aliases=['project']),
+        organization=dict(),
+        wait=dict(required=False, default=True, type='bool'),
+        interval=dict(required=False, default=1.0, type='float'),
+        timeout=dict(required=False, default=None, type='int'),
+    )
+
+    # Create a module for ourselves
+    module = TowerModule(argument_spec=argument_spec)
+
+    # Extract our parameters
+    name = module.params.get('name')
+    organization = module.params.get('organization')
+    wait = module.params.get('wait')
+    interval = module.params.get('interval')
+    timeout = module.params.get('timeout')
+
+    # Attempt to look up project based on the provided name
+    lookup_data = {'name': name}
+    if organization:
+        lookup_data['organization'] = module.resolve_name_to_id('organizations', organization)
+    project = module.get_one('projects', data=lookup_data)
+
+    if project is None:
+        module.fail_json(msg="Unable to find workflow job template")
+
+    # Launch the job
+    result = module.post_endpoint(project['related']['update'])
+
+    if result['status_code'] != 202:
+        module.fail_json(msg="Failed to update project, see response for details", response=result)
+
+    module.json_output['changed'] = True
+    module.json_output['id'] = result['json']['id']
+    module.json_output['status'] = result['json']['status']
+
+    if not wait:
+        module.exit_json(**module.json_output)
+
+    # Grab our start time to compare against for the timeout
+    start = time.time()
+
+    job_url = result['json']['url']
+    while not result['json']['finished']:
+        # If we are past our time out fail with a message
+        if timeout and timeout < time.time() - start:
+            module.json_output['msg'] = "Monitoring aborted due to timeout"
+            module.fail_json(**module.json_output)
+
+        # Put the process to sleep for our interval
+        time.sleep(interval)
+
+        result = module.get_endpoint(job_url)
+        module.json_output['status'] = result['json']['status']
+
+    # If the update has failed, we want to raise a task failure for that so we get a non-zero response.
+    if result['json']['failed']:
+        module.json_output['msg'] = 'The project "{0}" failed'.format(name)
+        module.fail_json(**module.json_output)
+
+    module.exit_json(**module.json_output)
+
+
+if __name__ == '__main__':
+    main()

From af1fc5a9e9d71733d2b2162fc2ba920ed3481fbc Mon Sep 17 00:00:00 2001
From: sean-m-sullivan <ssulliva@redhat.com>
Date: Tue, 11 Aug 2020 09:28:17 -0500
Subject: [PATCH 02/69] add tests

---
 .../tower_project_update/tasks/main.yml       | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 awx_collection/tests/integration/targets/tower_project_update/tasks/main.yml

diff --git a/awx_collection/tests/integration/targets/tower_project_update/tasks/main.yml b/awx_collection/tests/integration/targets/tower_project_update/tasks/main.yml
new file mode 100644
index 0000000000..be49c6734e
--- /dev/null
+++ b/awx_collection/tests/integration/targets/tower_project_update/tasks/main.yml
@@ -0,0 +1,23 @@
+---
+- name: Update a project without waiting
+  tower_project_update:
+    name: "AWX-Collection-tests-tower_job_template-proj-{{ test_id }}"
+    organization: Default
+    wait: False
+  register: result
+
+- assert:
+    that:
+      - result is changed
+
+- name: Update a project and wait
+  tower_project_update:
+    name: "AWX-Collection-tests-tower_job_template-proj-{{ test_id }}"
+    organization: Default
+    wait: True
+  register: result
+
+- assert:
+    that:
+      - result is changed
+

From 813e38636a18b2055497de64e4414e1dce5e1c94 Mon Sep 17 00:00:00 2001
From: sean-m-sullivan <ssulliva@redhat.com>
Date: Tue, 11 Aug 2020 09:38:18 -0500
Subject: [PATCH 03/69] fix documentation

---
 .../plugins/modules/tower_project_update.py   | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/awx_collection/plugins/modules/tower_project_update.py b/awx_collection/plugins/modules/tower_project_update.py
index 1952244c93..b71d187ff2 100644
--- a/awx_collection/plugins/modules/tower_project_update.py
+++ b/awx_collection/plugins/modules/tower_project_update.py
@@ -21,20 +21,20 @@ description:
 options:
     name:
       description:
-        - The name of the workflow template to run.
+        - The name of the project to update.
       required: True
       type: str
       aliases:
         - project
     organization:
       description:
-        - Organization the workflow job template exists in.
+        - Organization the project exists in.
         - Used to help lookup the object, cannot be modified using this module.
         - If not provided, will lookup by name only, which does not work with duplicates.
       type: str
     wait:
       description:
-        - Wait for the workflow to complete.
+        - Wait for the project to update.
       default: True
       type: bool
     interval:
@@ -45,14 +45,14 @@ options:
       type: float
     timeout:
       description:
-        - If waiting for the workflow to complete this will abort after this
+        - If waiting for the project to update this will abort after this
           amount of seconds
       type: int
 extends_documentation_fragment: awx.awx.auth
 '''
 
 RETURN = '''
-job_info:
+project_info:
     description: dictionary containing information about the project updated
     returned: If project synced
     type: dict
@@ -60,12 +60,12 @@ job_info:
 
 
 EXAMPLES = '''
-- name: Launch a workflow with a timeout of 10 seconds
+- name: Launch a project with a timeout of 10 seconds
   tower_project_update:
     project: "Networking Project"
     timeout: 10
 
-- name: Launch a Workflow with extra_vars without waiting
+- name: Launch a Project with extra_vars without waiting
   tower_project_update:
     project: "Networking Project"
     wait: False
@@ -103,9 +103,9 @@ def main():
     project = module.get_one('projects', data=lookup_data)
 
     if project is None:
-        module.fail_json(msg="Unable to find workflow job template")
+        module.fail_json(msg="Unable to find project")
 
-    # Launch the job
+    # Update the project
     result = module.post_endpoint(project['related']['update'])
 
     if result['status_code'] != 202:
@@ -121,7 +121,7 @@ def main():
     # Grab our start time to compare against for the timeout
     start = time.time()
 
-    job_url = result['json']['url']
+    project_url = result['json']['url']
     while not result['json']['finished']:
         # If we are past our time out fail with a message
         if timeout and timeout < time.time() - start:
@@ -131,7 +131,7 @@ def main():
         # Put the process to sleep for our interval
         time.sleep(interval)
 
-        result = module.get_endpoint(job_url)
+        result = module.get_endpoint(project_url)
         module.json_output['status'] = result['json']['status']
 
     # If the update has failed, we want to raise a task failure for that so we get a non-zero response.

From 69dc0a892f3037f00fd1bd0f9438fdc6678aad10 Mon Sep 17 00:00:00 2001
From: sean-m-sullivan <ssulliva@redhat.com>
Date: Tue, 11 Aug 2020 09:56:08 -0500
Subject: [PATCH 04/69] fix lint

---
 .../integration/targets/tower_project_update/tasks/main.yml      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/awx_collection/tests/integration/targets/tower_project_update/tasks/main.yml b/awx_collection/tests/integration/targets/tower_project_update/tasks/main.yml
index be49c6734e..0693f125d1 100644
--- a/awx_collection/tests/integration/targets/tower_project_update/tasks/main.yml
+++ b/awx_collection/tests/integration/targets/tower_project_update/tasks/main.yml
@@ -20,4 +20,3 @@
 - assert:
     that:
       - result is changed
-

From d6815e51140657f778bc5804282a42f1494eae92 Mon Sep 17 00:00:00 2001
From: Sean Sullivan <ssulliva@redhat.com>
Date: Thu, 20 Aug 2020 10:30:43 -0500
Subject: [PATCH 05/69] Removed reference to sync

Updated references to sync in favour of update.
---
 awx_collection/plugins/modules/tower_project_update.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/awx_collection/plugins/modules/tower_project_update.py b/awx_collection/plugins/modules/tower_project_update.py
index b71d187ff2..6d98c00c77 100644
--- a/awx_collection/plugins/modules/tower_project_update.py
+++ b/awx_collection/plugins/modules/tower_project_update.py
@@ -14,9 +14,9 @@ DOCUMENTATION = '''
 ---
 module: tower_project_update
 author: "Sean Sullivan (@sean-m-sullivan)"
-short_description: Sync a Project in Ansible Tower
+short_description: Update a Project in Ansible Tower
 description:
-    - Sync an Ansible Tower Project. See
+    - Update a Ansible Tower Project. See
       U(https://www.ansible.com/tower) for an overview.
 options:
     name:

From 3794f095cfefef72ed87ee483b937716e00f2443 Mon Sep 17 00:00:00 2001
From: sean-m-sullivan <ssulliva@redhat.com>
Date: Sat, 22 Aug 2020 13:43:14 -0500
Subject: [PATCH 06/69] update to tower_project_update

---
 .../plugins/modules/tower_project_update.py   | 20 +++++----
 .../tower_project_update/tasks/main.yml       | 41 +++++++++++++++++--
 2 files changed, 50 insertions(+), 11 deletions(-)

diff --git a/awx_collection/plugins/modules/tower_project_update.py b/awx_collection/plugins/modules/tower_project_update.py
index 6d98c00c77..e9f85321d5 100644
--- a/awx_collection/plugins/modules/tower_project_update.py
+++ b/awx_collection/plugins/modules/tower_project_update.py
@@ -52,10 +52,16 @@ extends_documentation_fragment: awx.awx.auth
 '''
 
 RETURN = '''
-project_info:
-    description: dictionary containing information about the project updated
-    returned: If project synced
-    type: dict
+id:
+    description: project id of the updated project
+    returned: success
+    type: int
+    sample: 86
+status:
+    description: status of the updated project
+    returned: success
+    type: str
+    sample: pending
 '''
 
 
@@ -81,9 +87,9 @@ def main():
     argument_spec = dict(
         name=dict(required=True, aliases=['project']),
         organization=dict(),
-        wait=dict(required=False, default=True, type='bool'),
-        interval=dict(required=False, default=1.0, type='float'),
-        timeout=dict(required=False, default=None, type='int'),
+        wait=dict(default=True, type='bool'),
+        interval=dict(default=1.0, type='float'),
+        timeout=dict(default=None, type='int'),
     )
 
     # Create a module for ourselves
diff --git a/awx_collection/tests/integration/targets/tower_project_update/tasks/main.yml b/awx_collection/tests/integration/targets/tower_project_update/tasks/main.yml
index 0693f125d1..82ef03b9b0 100644
--- a/awx_collection/tests/integration/targets/tower_project_update/tasks/main.yml
+++ b/awx_collection/tests/integration/targets/tower_project_update/tasks/main.yml
@@ -1,9 +1,31 @@
 ---
+- name: Generate a random string for test
+  set_fact:
+    test_id: "{{ lookup('password', '/dev/null chars=ascii_letters length=16') }}"
+  when: test_id is not defined
+
+- name: Generate names
+  set_fact:
+    project_name1: "AWX-Collection-tests-tower_project_update-project-{{ test_id }}"
+
+- name: Create a git project without credentials without waiting
+  tower_project:
+    name: "{{ project_name1 }}"
+    organization: Default
+    scm_type: git
+    scm_url: https://github.com/ansible/test-playbooks
+    wait: false
+  register: result
+
+- assert:
+    that:
+      - result is changed
+
 - name: Update a project without waiting
   tower_project_update:
-    name: "AWX-Collection-tests-tower_job_template-proj-{{ test_id }}"
+    name: "{{ project_name1 }}"
     organization: Default
-    wait: False
+    wait: false
   register: result
 
 - assert:
@@ -12,11 +34,22 @@
 
 - name: Update a project and wait
   tower_project_update:
-    name: "AWX-Collection-tests-tower_job_template-proj-{{ test_id }}"
+    name: "{{ project_name1 }}"
     organization: Default
-    wait: True
+    wait: true
   register: result
 
 - assert:
     that:
       - result is changed
+
+- name: Delete the test project 1
+  tower_project:
+    name: "{{ project_name1 }}"
+    organization: Default
+    state: absent
+  register: result
+
+- assert:
+    that:
+      - result is changed
\ No newline at end of file

From cda05c4f03528d770ccb81dc72d46a315531ca45 Mon Sep 17 00:00:00 2001
From: Sean Sullivan <ssulliva@redhat.com>
Date: Sat, 22 Aug 2020 20:16:27 -0500
Subject: [PATCH 07/69] Updated test for lint

Updated test for lint
---
 .../integration/targets/tower_project_update/tasks/main.yml     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/awx_collection/tests/integration/targets/tower_project_update/tasks/main.yml b/awx_collection/tests/integration/targets/tower_project_update/tasks/main.yml
index 82ef03b9b0..e7a03ce4c9 100644
--- a/awx_collection/tests/integration/targets/tower_project_update/tasks/main.yml
+++ b/awx_collection/tests/integration/targets/tower_project_update/tasks/main.yml
@@ -52,4 +52,4 @@
 
 - assert:
     that:
-      - result is changed
\ No newline at end of file
+      - result is changed

From 90e8d5697ecdc3f584ef396417ae53793f605915 Mon Sep 17 00:00:00 2001
From: Alex Corey <alex.swansboro@gmail.com>
Date: Mon, 24 Aug 2020 11:17:24 -0400
Subject: [PATCH 08/69] Adds fix to load template details screen even for users
 without webhook key permissions

---
 awx/ui_next/src/api/models/JobTemplates.js    |  4 +
 .../src/api/models/WorkflowJobTemplates.js    |  4 +
 awx/ui_next/src/screens/Template/Template.jsx | 17 ++--
 .../src/screens/Template/Template.test.jsx    | 86 +++++++++++++++++--
 .../screens/Template/WorkflowJobTemplate.jsx  | 16 +++-
 .../Template/WorkflowJobTemplate.test.jsx     | 19 +++-
 .../Template/shared/data.job_template.json    |  3 +-
 7 files changed, 132 insertions(+), 17 deletions(-)

diff --git a/awx/ui_next/src/api/models/JobTemplates.js b/awx/ui_next/src/api/models/JobTemplates.js
index 0e2eba8079..2ea8c1137d 100644
--- a/awx/ui_next/src/api/models/JobTemplates.js
+++ b/awx/ui_next/src/api/models/JobTemplates.js
@@ -23,6 +23,10 @@ class JobTemplates extends SchedulesMixin(
     return this.http.post(`${this.baseUrl}${id}/launch/`, data);
   }
 
+  readTemplateOptions(id) {
+    return this.http.options(`${this.baseUrl}/${id}/`);
+  }
+
   readLaunch(id) {
     return this.http.get(`${this.baseUrl}${id}/launch/`);
   }
diff --git a/awx/ui_next/src/api/models/WorkflowJobTemplates.js b/awx/ui_next/src/api/models/WorkflowJobTemplates.js
index 3074608796..d074900f58 100644
--- a/awx/ui_next/src/api/models/WorkflowJobTemplates.js
+++ b/awx/ui_next/src/api/models/WorkflowJobTemplates.js
@@ -12,6 +12,10 @@ class WorkflowJobTemplates extends SchedulesMixin(NotificationsMixin(Base)) {
     return this.http.get(`${this.baseUrl}${id}/webhook_key/`);
   }
 
+  readWorkflowJobTemplateOptions(id) {
+    return this.http.options(`${this.baseUrl}/${id}/`);
+  }
+
   updateWebhookKey(id) {
     return this.http.post(`${this.baseUrl}${id}/webhook_key/`);
   }
diff --git a/awx/ui_next/src/screens/Template/Template.jsx b/awx/ui_next/src/screens/Template/Template.jsx
index 2358fb109b..12629ebe51 100644
--- a/awx/ui_next/src/screens/Template/Template.jsx
+++ b/awx/ui_next/src/screens/Template/Template.jsx
@@ -36,18 +36,23 @@ function Template({ i18n, me, setBreadcrumb }) {
     request: loadTemplateAndRoles,
   } = useRequest(
     useCallback(async () => {
-      const [{ data }, notifAdminRes] = await Promise.all([
+      const [{ data }, actions, notifAdminRes] = await Promise.all([
         JobTemplatesAPI.readDetail(templateId),
+        JobTemplatesAPI.readTemplateOptions(templateId),
         OrganizationsAPI.read({
           page_size: 1,
           role_level: 'notification_admin_role',
         }),
       ]);
-      if (data.webhook_service && data?.related?.webhook_key) {
-        const {
-          data: { webhook_key },
-        } = await JobTemplatesAPI.readWebhookKey(templateId);
-        data.webhook_key = webhook_key;
+
+      if (actions.data.actions.PUT) {
+        if (data.webhook_service && data?.related?.webhook_key) {
+          const {
+            data: { webhook_key },
+          } = await JobTemplatesAPI.readWebhookKey(templateId);
+
+          data.webhook_key = webhook_key;
+        }
       }
       setBreadcrumb(data);
 
diff --git a/awx/ui_next/src/screens/Template/Template.test.jsx b/awx/ui_next/src/screens/Template/Template.test.jsx
index 8176e4486a..a38209db75 100644
--- a/awx/ui_next/src/screens/Template/Template.test.jsx
+++ b/awx/ui_next/src/screens/Template/Template.test.jsx
@@ -18,11 +18,16 @@ const mockMe = {
   is_system_auditor: false,
 };
 describe('<Template />', () => {
+  let wrapper;
   beforeEach(() => {
     JobTemplatesAPI.readDetail.mockResolvedValue({
       data: mockJobTemplateData,
     });
-
+    JobTemplatesAPI.readTemplateOptions.mockResolvedValue({
+      data: {
+        actions: { PUT: true },
+      },
+    });
     OrganizationsAPI.read.mockResolvedValue({
       data: {
         count: 1,
@@ -35,21 +40,33 @@ describe('<Template />', () => {
         ],
       },
     });
+    JobTemplatesAPI.readWebhookKey.mockResolvedValue({
+      data: {
+        webhook_key: 'key',
+      },
+    });
+  });
+  afterEach(() => {
+    jest.clearAllMocks();
+    wrapper.unmount();
   });
   test('initially renders succesfully', async () => {
     await act(async () => {
-      mountWithContexts(<Template setBreadcrumb={() => {}} me={mockMe} />);
+      wrapper = mountWithContexts(
+        <Template setBreadcrumb={() => {}} me={mockMe} />
+      );
     });
   });
   test('When component mounts API is called and the response is put in state', async () => {
     await act(async () => {
-      mountWithContexts(<Template setBreadcrumb={() => {}} me={mockMe} />);
+      wrapper = mountWithContexts(
+        <Template setBreadcrumb={() => {}} me={mockMe} />
+      );
     });
     expect(JobTemplatesAPI.readDetail).toBeCalled();
     expect(OrganizationsAPI.read).toBeCalled();
   });
   test('notifications tab shown for admins', async done => {
-    let wrapper;
     await act(async () => {
       wrapper = mountWithContexts(
         <Template setBreadcrumb={() => {}} me={mockMe} />
@@ -74,7 +91,6 @@ describe('<Template />', () => {
       },
     });
 
-    let wrapper;
     await act(async () => {
       wrapper = mountWithContexts(
         <Template setBreadcrumb={() => {}} me={mockMe} />
@@ -93,7 +109,7 @@ describe('<Template />', () => {
     const history = createMemoryHistory({
       initialEntries: ['/templates/job_template/1/foobar'],
     });
-    let wrapper;
+
     await act(async () => {
       wrapper = mountWithContexts(
         <Template setBreadcrumb={() => {}} me={mockMe} />,
@@ -117,4 +133,62 @@ describe('<Template />', () => {
 
     await waitForElement(wrapper, 'ContentError', el => el.length === 1);
   });
+  test('should call to get webhook key', async () => {
+    const history = createMemoryHistory({
+      initialEntries: ['/templates/job_template/1/foobar'],
+    });
+    await act(async () => {
+      wrapper = mountWithContexts(
+        <Template setBreadcrumb={() => {}} me={mockMe} />,
+        {
+          context: {
+            router: {
+              history,
+              route: {
+                location: history.location,
+                match: {
+                  params: { id: 1 },
+                  url: '/templates/job_template/1/foobar',
+                  path: '/templates/job_template/1/foobar',
+                },
+              },
+            },
+          },
+        }
+      );
+    });
+    expect(JobTemplatesAPI.readWebhookKey).toHaveBeenCalled();
+  });
+  test('should not call to get webhook key', async () => {
+    JobTemplatesAPI.readTemplateOptions.mockResolvedValueOnce({
+      data: {
+        actions: {},
+      },
+    });
+
+    const history = createMemoryHistory({
+      initialEntries: ['/templates/job_template/1/foobar'],
+    });
+    await act(async () => {
+      wrapper = mountWithContexts(
+        <Template setBreadcrumb={() => {}} me={mockMe} />,
+        {
+          context: {
+            router: {
+              history,
+              route: {
+                location: history.location,
+                match: {
+                  params: { id: 1 },
+                  url: '/templates/job_template/1/foobar',
+                  path: '/templates/job_template/1/foobar',
+                },
+              },
+            },
+          },
+        }
+      );
+    });
+    expect(JobTemplatesAPI.readWebhookKey).not.toHaveBeenCalled();
+  });
 });
diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplate.jsx b/awx/ui_next/src/screens/Template/WorkflowJobTemplate.jsx
index 8f19ebb6d3..fa061ac912 100644
--- a/awx/ui_next/src/screens/Template/WorkflowJobTemplate.jsx
+++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplate.jsx
@@ -56,10 +56,20 @@ class WorkflowJobTemplate extends Component {
 
     this.setState({ contentError: null });
     try {
-      const { data } = await WorkflowJobTemplatesAPI.readDetail(id);
+      const [
+        { data },
+        {
+          data: { actions },
+        },
+      ] = await Promise.all([
+        WorkflowJobTemplatesAPI.readDetail(id),
+        WorkflowJobTemplatesAPI.readWorkflowJobTemplateOptions(id),
+      ]);
       let webhookKey;
-      if (data?.webhook_service && data?.related?.webhook_key) {
-        webhookKey = await WorkflowJobTemplatesAPI.readWebhookKey(id);
+      if (actions.PUT) {
+        if (data?.webhook_service && data?.related?.webhook_key) {
+          webhookKey = await WorkflowJobTemplatesAPI.readWebhookKey(id);
+        }
       }
       if (data?.summary_fields?.webhook_credential) {
         const {
diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplate.test.jsx b/awx/ui_next/src/screens/Template/WorkflowJobTemplate.test.jsx
index a0400ca772..e3e66bf8c1 100644
--- a/awx/ui_next/src/screens/Template/WorkflowJobTemplate.test.jsx
+++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplate.test.jsx
@@ -59,6 +59,7 @@ describe('<WorkflowJobTemplate/>', () => {
         },
       },
     });
+
     WorkflowJobTemplatesAPI.readWebhookKey.mockResolvedValue({
       data: { webhook_key: 'WebHook Key' },
     });
@@ -74,6 +75,9 @@ describe('<WorkflowJobTemplate/>', () => {
     });
   });
   beforeEach(() => {
+    WorkflowJobTemplatesAPI.readWorkflowJobTemplateOptions.mockResolvedValue({
+      data: { actions: { PUT: {} } },
+    });
     history = createMemoryHistory({
       initialEntries: ['/templates/workflow_job_template/1/details'],
     });
@@ -95,13 +99,18 @@ describe('<WorkflowJobTemplate/>', () => {
       );
     });
   });
-
+  afterEach(() => {
+    jest.clearAllMocks();
+    wrapper.unmount();
+  });
   test('calls api to get workflow job template data', async () => {
     expect(wrapper.find('WorkflowJobTemplate').length).toBe(1);
     expect(WorkflowJobTemplatesAPI.readDetail).toBeCalledWith('1');
     wrapper.update();
     await sleep(0);
     expect(WorkflowJobTemplatesAPI.readWebhookKey).toBeCalledWith('1');
+    expect(WorkflowJobTemplatesAPI.readWorkflowJobTemplateOptions).toBeCalled();
+
     expect(CredentialsAPI.readDetail).toBeCalledWith(1234567);
     expect(OrganizationsAPI.read).toBeCalledWith({
       page_size: 1,
@@ -144,4 +153,12 @@ describe('<WorkflowJobTemplate/>', () => {
       tabs.forEach(t => expect(tc.prop(`aria-label=[${t}]`)));
     });
   });
+  test('should not call for webhook key', async () => {
+    WorkflowJobTemplatesAPI.readWorkflowJobTemplateOptions.mockResolvedValueOnce(
+      {
+        data: { actions: {} },
+      }
+    );
+    expect(WorkflowJobTemplatesAPI.readWebhookKey).not.toBeCalled();
+  });
 });
diff --git a/awx/ui_next/src/screens/Template/shared/data.job_template.json b/awx/ui_next/src/screens/Template/shared/data.job_template.json
index 4d0cdb6aae..804c3b72a2 100644
--- a/awx/ui_next/src/screens/Template/shared/data.job_template.json
+++ b/awx/ui_next/src/screens/Template/shared/data.job_template.json
@@ -24,7 +24,8 @@
         "instance_groups": "/api/v2/job_templates/7/instance_groups/",
         "slice_workflow_jobs": "/api/v2/job_templates/7/slice_workflow_jobs/",
         "copy": "/api/v2/job_templates/7/copy/",
-        "webhook_receiver": "/api/v2/job_templates/7/github/"
+        "webhook_receiver": "/api/v2/job_templates/7/github/",
+        "webhook_key": "/api/v2/job_templates/7/webhook_key/"
     },
     "summary_fields": {
         "inventory": {

From 13f3292af08944c3b483fa5bdceb823f7b26b171 Mon Sep 17 00:00:00 2001
From: sean-m-sullivan <ssulliva@redhat.com>
Date: Tue, 25 Aug 2020 07:04:27 -0500
Subject: [PATCH 09/69] updated test

---
 .../integration/targets/tower_project_update/tasks/main.yml     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/awx_collection/tests/integration/targets/tower_project_update/tasks/main.yml b/awx_collection/tests/integration/targets/tower_project_update/tasks/main.yml
index e7a03ce4c9..1b98e2e74f 100644
--- a/awx_collection/tests/integration/targets/tower_project_update/tasks/main.yml
+++ b/awx_collection/tests/integration/targets/tower_project_update/tasks/main.yml
@@ -41,7 +41,7 @@
 
 - assert:
     that:
-      - result is changed
+      - result is successful
 
 - name: Delete the test project 1
   tower_project:

From bed3a9ee4134e51a50dde7f43c8fb3c6cdfeef00 Mon Sep 17 00:00:00 2001
From: sean-m-sullivan <ssulliva@redhat.com>
Date: Wed, 26 Aug 2020 08:11:51 -0500
Subject: [PATCH 10/69] added id lookup

---
 .../plugins/modules/tower_project_update.py   | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/awx_collection/plugins/modules/tower_project_update.py b/awx_collection/plugins/modules/tower_project_update.py
index e9f85321d5..4978052e5c 100644
--- a/awx_collection/plugins/modules/tower_project_update.py
+++ b/awx_collection/plugins/modules/tower_project_update.py
@@ -21,7 +21,7 @@ description:
 options:
     name:
       description:
-        - The name of the project to update.
+        - The name or id of the project to update.
       required: True
       type: str
       aliases:
@@ -102,14 +102,19 @@ def main():
     interval = module.params.get('interval')
     timeout = module.params.get('timeout')
 
-    # Attempt to look up project based on the provided name
-    lookup_data = {'name': name}
-    if organization:
-        lookup_data['organization'] = module.resolve_name_to_id('organizations', organization)
-    project = module.get_one('projects', data=lookup_data)
-
-    if project is None:
-        module.fail_json(msg="Unable to find project")
+    # Attempt to look up project based on the provided name or id
+    if name.isnumeric():
+        results = module.get_endpoint('projects', **{'data': {'id': name}})
+        project = results['json']['results'][0]
+        if project is None:
+            module.fail_json(msg="Unable to find project")
+    else:
+        lookup_data = {'name': name}
+        if organization:
+            lookup_data['organization'] = module.resolve_name_to_id('organizations', organization)
+        project = module.get_one('projects', data=lookup_data)
+        if project is None:
+            module.fail_json(msg="Unable to find project")
 
     # Update the project
     result = module.post_endpoint(project['related']['update'])

From 5d4413041eae9f41c6e6d862dc9d66777c66b4ae Mon Sep 17 00:00:00 2001
From: sean-m-sullivan <ssulliva@redhat.com>
Date: Tue, 1 Sep 2020 14:59:16 -0500
Subject: [PATCH 11/69] update to wait

---
 .../plugins/modules/tower_project_update.py   | 25 +++++++------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/awx_collection/plugins/modules/tower_project_update.py b/awx_collection/plugins/modules/tower_project_update.py
index 4978052e5c..b4a81b6aac 100644
--- a/awx_collection/plugins/modules/tower_project_update.py
+++ b/awx_collection/plugins/modules/tower_project_update.py
@@ -132,23 +132,16 @@ def main():
     # Grab our start time to compare against for the timeout
     start = time.time()
 
-    project_url = result['json']['url']
-    while not result['json']['finished']:
-        # If we are past our time out fail with a message
-        if timeout and timeout < time.time() - start:
-            module.json_output['msg'] = "Monitoring aborted due to timeout"
-            module.fail_json(**module.json_output)
+    if not wait:
+        module.exit_json(**module.json_output)
 
-        # Put the process to sleep for our interval
-        time.sleep(interval)
-
-        result = module.get_endpoint(project_url)
-        module.json_output['status'] = result['json']['status']
-
-    # If the update has failed, we want to raise a task failure for that so we get a non-zero response.
-    if result['json']['failed']:
-        module.json_output['msg'] = 'The project "{0}" failed'.format(name)
-        module.fail_json(**module.json_output)
+    # Invoke wait function
+    module.wait_on_url(
+        url=result['json']['url'],
+        object_name=name,
+        object_type='Project Update',
+        timeout=timeout, interval=interval
+    )
 
     module.exit_json(**module.json_output)
 

From d95d8121f9ccd190aba129f88b71a2908ac53e78 Mon Sep 17 00:00:00 2001
From: sean-m-sullivan <ssulliva@redhat.com>
Date: Tue, 1 Sep 2020 15:22:14 -0500
Subject: [PATCH 12/69] added to no endpoints for module

---
 awx_collection/test/awx/test_completeness.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/awx_collection/test/awx/test_completeness.py b/awx_collection/test/awx/test_completeness.py
index 92a743daf4..d55c5a41db 100644
--- a/awx_collection/test/awx/test_completeness.py
+++ b/awx_collection/test/awx/test_completeness.py
@@ -24,7 +24,7 @@ no_module_for_endpoint = []
 # Some modules work on the related fields of an endpoint. These modules will not have an auto-associated endpoint
 no_endpoint_for_module = [
     'tower_import', 'tower_meta', 'tower_export', 'tower_job_launch', 'tower_job_wait', 'tower_job_list',
-    'tower_license', 'tower_ping', 'tower_receive', 'tower_send', 'tower_workflow_launch', 'tower_job_cancel',
+    'tower_license', 'tower_ping', 'tower_project_update', 'tower_receive', 'tower_send', 'tower_workflow_launch', 'tower_job_cancel',
     'tower_workflow_template',
 ]
 

From d269a6d23302b6a471a654b3fb54c572338facb6 Mon Sep 17 00:00:00 2001
From: sean-m-sullivan <ssulliva@redhat.com>
Date: Tue, 1 Sep 2020 15:59:04 -0500
Subject: [PATCH 13/69] update

---
 awx_collection/plugins/modules/tower_project_update.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/awx_collection/plugins/modules/tower_project_update.py b/awx_collection/plugins/modules/tower_project_update.py
index b4a81b6aac..c08cfbb76e 100644
--- a/awx_collection/plugins/modules/tower_project_update.py
+++ b/awx_collection/plugins/modules/tower_project_update.py
@@ -111,7 +111,7 @@ def main():
     else:
         lookup_data = {'name': name}
         if organization:
-            lookup_data['organization'] = module.resolve_name_to_id('organizations', organization)
+            lookup_data['organization'] = module.get_one_by_name_or_id('organizations', organization)
         project = module.get_one('projects', data=lookup_data)
         if project is None:
             module.fail_json(msg="Unable to find project")

From 300a4510ac9db4d6e312316b416284bf9bba4e50 Mon Sep 17 00:00:00 2001
From: sean-m-sullivan <ssulliva@redhat.com>
Date: Tue, 1 Sep 2020 15:59:53 -0500
Subject: [PATCH 14/69] update completness

---
 awx_collection/test/awx/test_completeness.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/awx_collection/test/awx/test_completeness.py b/awx_collection/test/awx/test_completeness.py
index d55c5a41db..f1caa611f3 100644
--- a/awx_collection/test/awx/test_completeness.py
+++ b/awx_collection/test/awx/test_completeness.py
@@ -15,7 +15,7 @@ import re
 # Normally a read-only endpoint should not have a module (i.e. /api/v2/me) but sometimes we reuse a name
 # For example, we have a tower_role module but /api/v2/roles is a read only endpoint.
 # This list indicates which read-only endpoints have associated modules with them.
-read_only_endpoints_with_modules = ['tower_settings', 'tower_role']
+read_only_endpoints_with_modules = ['tower_settings', 'tower_role', 'tower_project_update']
 
 # If a module should not be created for an endpoint and the endpoint is not read-only add it here
 # THINK HARD ABOUT DOING THIS
@@ -24,7 +24,7 @@ no_module_for_endpoint = []
 # Some modules work on the related fields of an endpoint. These modules will not have an auto-associated endpoint
 no_endpoint_for_module = [
     'tower_import', 'tower_meta', 'tower_export', 'tower_job_launch', 'tower_job_wait', 'tower_job_list',
-    'tower_license', 'tower_ping', 'tower_project_update', 'tower_receive', 'tower_send', 'tower_workflow_launch', 'tower_job_cancel',
+    'tower_license', 'tower_ping', 'tower_receive', 'tower_send', 'tower_workflow_launch', 'tower_job_cancel',
     'tower_workflow_template',
 ]
 

From 532447ed40b7e145922866cabecc8b074a1cc4e5 Mon Sep 17 00:00:00 2001
From: sean-m-sullivan <ssulliva@redhat.com>
Date: Tue, 1 Sep 2020 16:43:58 -0500
Subject: [PATCH 15/69] update to tower module

---
 awx_collection/plugins/modules/tower_project_update.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/awx_collection/plugins/modules/tower_project_update.py b/awx_collection/plugins/modules/tower_project_update.py
index c08cfbb76e..fc150cb00d 100644
--- a/awx_collection/plugins/modules/tower_project_update.py
+++ b/awx_collection/plugins/modules/tower_project_update.py
@@ -77,7 +77,7 @@ EXAMPLES = '''
     wait: False
 '''
 
-from ..module_utils.tower_api import TowerModule
+from ..module_utils.tower_api import TowerAPIModule
 import json
 import time
 
@@ -93,7 +93,7 @@ def main():
     )
 
     # Create a module for ourselves
-    module = TowerModule(argument_spec=argument_spec)
+    module = TowerAPIModule(argument_spec=argument_spec)
 
     # Extract our parameters
     name = module.params.get('name')
@@ -111,7 +111,7 @@ def main():
     else:
         lookup_data = {'name': name}
         if organization:
-            lookup_data['organization'] = module.get_one_by_name_or_id('organizations', organization)
+            lookup_data['organization'] = module.resolve_name_to_id('organizations', organization)
         project = module.get_one('projects', data=lookup_data)
         if project is None:
             module.fail_json(msg="Unable to find project")

From e2bf3a02874165c370980a13cd9d82d6bd19bd58 Mon Sep 17 00:00:00 2001
From: sean-m-sullivan <ssulliva@redhat.com>
Date: Wed, 2 Sep 2020 07:19:11 -0500
Subject: [PATCH 16/69] update to use isdigit and updated tests

---
 .../plugins/modules/tower_project_update.py       |  6 +++---
 .../targets/tower_project_update/tasks/main.yml   | 15 +++++++++++++--
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/awx_collection/plugins/modules/tower_project_update.py b/awx_collection/plugins/modules/tower_project_update.py
index fc150cb00d..3586a27340 100644
--- a/awx_collection/plugins/modules/tower_project_update.py
+++ b/awx_collection/plugins/modules/tower_project_update.py
@@ -103,11 +103,11 @@ def main():
     timeout = module.params.get('timeout')
 
     # Attempt to look up project based on the provided name or id
-    if name.isnumeric():
+    if name.isdigit():
         results = module.get_endpoint('projects', **{'data': {'id': name}})
+        if results['json']['count'] == 0:
+            module.fail_json(msg='Could not find Project with ID: {0}'.format(name))        
         project = results['json']['results'][0]
-        if project is None:
-            module.fail_json(msg="Unable to find project")
     else:
         lookup_data = {'name': name}
         if organization:
diff --git a/awx_collection/tests/integration/targets/tower_project_update/tasks/main.yml b/awx_collection/tests/integration/targets/tower_project_update/tasks/main.yml
index 1b98e2e74f..08b9852018 100644
--- a/awx_collection/tests/integration/targets/tower_project_update/tasks/main.yml
+++ b/awx_collection/tests/integration/targets/tower_project_update/tasks/main.yml
@@ -15,11 +15,11 @@
     scm_type: git
     scm_url: https://github.com/ansible/test-playbooks
     wait: false
-  register: result
+  register: project_create_result
 
 - assert:
     that:
-      - result is changed
+      - project_create_result is changed
 
 - name: Update a project without waiting
   tower_project_update:
@@ -43,6 +43,17 @@
     that:
       - result is successful
 
+- name: Update a project by ID
+  tower_project_update:
+    name: "{{ project_create_result.id }}"
+    organization: Default
+    wait: true
+  register: result
+
+- assert:
+    that:
+      - result is successful
+
 - name: Delete the test project 1
   tower_project:
     name: "{{ project_name1 }}"

From 5478c5f2fb37c4473a4c8a91d359e8598124d272 Mon Sep 17 00:00:00 2001
From: sean-m-sullivan <ssulliva@redhat.com>
Date: Wed, 2 Sep 2020 08:30:09 -0500
Subject: [PATCH 17/69] linting

---
 awx_collection/plugins/modules/tower_project_update.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/awx_collection/plugins/modules/tower_project_update.py b/awx_collection/plugins/modules/tower_project_update.py
index 3586a27340..cc32446d65 100644
--- a/awx_collection/plugins/modules/tower_project_update.py
+++ b/awx_collection/plugins/modules/tower_project_update.py
@@ -106,7 +106,7 @@ def main():
     if name.isdigit():
         results = module.get_endpoint('projects', **{'data': {'id': name}})
         if results['json']['count'] == 0:
-            module.fail_json(msg='Could not find Project with ID: {0}'.format(name))        
+            module.fail_json(msg='Could not find Project with ID: {0}'.format(name))
         project = results['json']['results'][0]
     else:
         lookup_data = {'name': name}

From 371276b2e166d7a5f6654ea799df280340fdab3c Mon Sep 17 00:00:00 2001
From: Elton de Souza <48670536+e-desouza@users.noreply.github.com>
Date: Wed, 2 Sep 2020 21:11:46 -0400
Subject: [PATCH 18/69] Update from pip to pip3

---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 42516b9a15..bd3da38b51 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -80,7 +80,7 @@ For Linux platforms, refer to the following from Docker:
 If you're not using Docker for Mac, or Docker for Windows, you may need, or choose to, install the Docker compose Python module separately, in which case you'll need to run the following:
 
 ```bash
-(host)$ pip install docker-compose
+(host)$ pip3 install docker-compose
 ```
 
 #### Frontend Development

From a6d26d7dab8965d23dd4f34b9fed3b6de2039207 Mon Sep 17 00:00:00 2001
From: Ryan Petrello <rpetrell@redhat.com>
Date: Thu, 3 Sep 2020 09:48:43 -0400
Subject: [PATCH 19/69] add the ability to prevent SAML auto-population
 behavior

---
 awx/settings/defaults.py                  |  1 +
 awx/sso/conf.py                           | 11 ++++++
 awx/sso/pipeline.py                       | 27 +++++++++++--
 awx/sso/tests/functional/test_pipeline.py | 47 ++++++++++++++++++++++-
 4 files changed, 82 insertions(+), 4 deletions(-)

diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py
index 5aa0b834ea..8d42af1ae4 100644
--- a/awx/settings/defaults.py
+++ b/awx/settings/defaults.py
@@ -477,6 +477,7 @@ SOCIAL_AUTH_SAML_PIPELINE = _SOCIAL_AUTH_PIPELINE_BASE + (
     'awx.sso.pipeline.update_user_orgs',
     'awx.sso.pipeline.update_user_teams',
 )
+SAML_AUTO_CREATE_OBJECTS = True
 
 SOCIAL_AUTH_LOGIN_URL = '/'
 SOCIAL_AUTH_LOGIN_REDIRECT_URL = '/sso/complete/'
diff --git a/awx/sso/conf.py b/awx/sso/conf.py
index c408d72b40..3406787f6b 100644
--- a/awx/sso/conf.py
+++ b/awx/sso/conf.py
@@ -919,6 +919,17 @@ def get_saml_entity_id():
     return settings.TOWER_URL_BASE
 
 
+register(
+    'SAML_AUTO_CREATE_OBJECTS',
+    field_class=fields.BooleanField,
+    default=True,
+    label=_('Automatically Create Organizations and Teams on SAML Login'),
+    help_text=_('When enabled (the default), mapped Organizations and Teams '
+                'will be created automatically on successful SAML login.'),
+    category=_('SAML'),
+    category_slug='saml',
+)
+
 register(
     'SOCIAL_AUTH_SAML_CALLBACK_URL',
     field_class=fields.CharField,
diff --git a/awx/sso/pipeline.py b/awx/sso/pipeline.py
index 6d7e05da90..3e73974474 100644
--- a/awx/sso/pipeline.py
+++ b/awx/sso/pipeline.py
@@ -10,6 +10,7 @@ import logging
 from social_core.exceptions import AuthException
 
 # Django
+from django.core.exceptions import ObjectDoesNotExist
 from django.utils.translation import ugettext_lazy as _
 from django.db.models import Q
 
@@ -80,11 +81,18 @@ def _update_m2m_from_expression(user, related, expr, remove=True):
 
 def _update_org_from_attr(user, related, attr, remove, remove_admins, remove_auditors):
     from awx.main.models import Organization
+    from django.conf import settings
 
     org_ids = []
 
     for org_name in attr:
-        org = Organization.objects.get_or_create(name=org_name)[0]
+        try:
+            if settings.SAML_AUTO_CREATE_OBJECTS:
+                org = Organization.objects.get_or_create(name=org_name)[0]
+            else:
+                org = Organization.objects.get(name=org_name)
+        except ObjectDoesNotExist:
+            continue
 
         org_ids.append(org.id)
         getattr(org, related).members.add(user)
@@ -199,11 +207,24 @@ def update_user_teams_by_saml_attr(backend, details, user=None, *args, **kwargs)
 
             if organization_alias:
                 organization_name = organization_alias
-            org = Organization.objects.get_or_create(name=organization_name)[0]
+
+            try:
+                if settings.SAML_AUTO_CREATE_OBJECTS:
+                    org = Organization.objects.get_or_create(name=organization_name)[0]
+                else:
+                    org = Organization.objects.get(name=organization_name)
+            except ObjectDoesNotExist:
+                continue
 
             if team_alias:
                 team_name = team_alias
-            team = Team.objects.get_or_create(name=team_name, organization=org)[0]
+            try:
+                if settings.SAML_AUTO_CREATE_OBJECTS:
+                    team = Team.objects.get_or_create(name=team_name, organization=org)[0]
+                else:
+                    team = Team.objects.get(name=team_name, organization=org)
+            except ObjectDoesNotExist:
+                continue
 
             team_ids.append(team.id)
             team.member_role.members.add(user)
diff --git a/awx/sso/tests/functional/test_pipeline.py b/awx/sso/tests/functional/test_pipeline.py
index 06d5503db8..e691939752 100644
--- a/awx/sso/tests/functional/test_pipeline.py
+++ b/awx/sso/tests/functional/test_pipeline.py
@@ -174,8 +174,15 @@ class TestSAMLAttr():
         return (o1, o2, o3)
 
     @pytest.fixture
-    def mock_settings(self):
+    def mock_settings(self, request):
+        fixture_args = request.node.get_closest_marker('fixture_args')
+        if fixture_args and 'autocreate' in fixture_args.kwargs:
+            autocreate = fixture_args.kwargs['autocreate']
+        else:
+            autocreate = True
+
         class MockSettings():
+            SAML_AUTO_CREATE_OBJECTS = autocreate
             SOCIAL_AUTH_SAML_ORGANIZATION_ATTR = {
                 'saml_attr': 'memberOf',
                 'saml_admin_attr': 'admins',
@@ -304,3 +311,41 @@ class TestSAMLAttr():
             assert Team.objects.get(
                 name='Yellow_Alias', organization__name='Default4_Alias').member_role.members.count() == 1
 
+    @pytest.mark.fixture_args(autocreate=False)
+    def test_autocreate_disabled(self, users, kwargs, mock_settings):
+        kwargs['response']['attributes']['memberOf'] = ['Default1', 'Default2', 'Default3']
+        kwargs['response']['attributes']['groups'] = ['Blue', 'Red', 'Green']
+        with mock.patch('django.conf.settings', mock_settings):
+            for u in users:
+                update_user_orgs_by_saml_attr(None, None, u, **kwargs)
+                update_user_teams_by_saml_attr(None, None, u, **kwargs)
+                assert Organization.objects.count() == 0
+                assert Team.objects.count() == 0
+
+            # precreate everything
+            o1 = Organization.objects.create(name='Default1')
+            o2 = Organization.objects.create(name='Default2')
+            o3 = Organization.objects.create(name='Default3')
+            Team.objects.create(name='Blue', organization_id=o1.id)
+            Team.objects.create(name='Blue', organization_id=o2.id)
+            Team.objects.create(name='Blue', organization_id=o3.id)
+            Team.objects.create(name='Red', organization_id=o1.id)
+            Team.objects.create(name='Green', organization_id=o1.id)
+            Team.objects.create(name='Green', organization_id=o3.id)
+
+            for u in users:
+                update_user_orgs_by_saml_attr(None, None, u, **kwargs)
+                update_user_teams_by_saml_attr(None, None, u, **kwargs)
+
+        assert o1.member_role.members.count() == 3
+        assert o2.member_role.members.count() == 3
+        assert o3.member_role.members.count() == 3
+
+        assert Team.objects.get(name='Blue', organization__name='Default1').member_role.members.count() == 3
+        assert Team.objects.get(name='Blue', organization__name='Default2').member_role.members.count() == 3
+        assert Team.objects.get(name='Blue', organization__name='Default3').member_role.members.count() == 3
+
+        assert Team.objects.get(name='Red', organization__name='Default1').member_role.members.count() == 3
+
+        assert Team.objects.get(name='Green', organization__name='Default1').member_role.members.count() == 3
+        assert Team.objects.get(name='Green', organization__name='Default3').member_role.members.count() == 3

From b01d204137bd66326db4005d30463681fe947a6c Mon Sep 17 00:00:00 2001
From: Ryan Petrello <rpetrell@redhat.com>
Date: Thu, 3 Sep 2020 13:02:10 -0400
Subject: [PATCH 20/69] if redis is unreachable, set instance capacity to zero

---
 awx/main/models/ha.py                  |  9 +++++++++
 awx/main/tests/functional/test_jobs.py | 17 ++++++++++++++++-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/awx/main/models/ha.py b/awx/main/models/ha.py
index ac7df97e10..4b6d8926e9 100644
--- a/awx/main/models/ha.py
+++ b/awx/main/models/ha.py
@@ -12,6 +12,7 @@ from django.utils.translation import ugettext_lazy as _
 from django.conf import settings
 from django.utils.timezone import now, timedelta
 
+import redis
 from solo.models import SingletonModel
 
 from awx import __version__ as awx_application_version
@@ -152,6 +153,14 @@ class Instance(HasPolicyEditsMixin, BaseModel):
             self.capacity = get_system_task_capacity(self.capacity_adjustment)
         else:
             self.capacity = 0
+
+        try:
+            # if redis is down for some reason, that means we can't persist
+            # playbook event data; we should consider this a zero capacity event
+            redis.Redis.from_url(settings.BROKER_URL).ping()
+        except redis.ConnectionError:
+            self.capacity = 0
+
         self.cpu = cpu[0]
         self.memory = mem[0]
         self.cpu_capacity = cpu[1]
diff --git a/awx/main/tests/functional/test_jobs.py b/awx/main/tests/functional/test_jobs.py
index 2bc10fa0df..b4754a6803 100644
--- a/awx/main/tests/functional/test_jobs.py
+++ b/awx/main/tests/functional/test_jobs.py
@@ -1,3 +1,4 @@
+import redis
 import pytest
 from unittest import mock
 import json
@@ -25,7 +26,8 @@ def test_orphan_unified_job_creation(instance, inventory):
 @mock.patch('awx.main.utils.common.get_mem_capacity', lambda: (8000,62))
 def test_job_capacity_and_with_inactive_node():
     i = Instance.objects.create(hostname='test-1')
-    i.refresh_capacity()
+    with mock.patch.object(redis.client.Redis, 'ping', lambda self: True):
+        i.refresh_capacity()
     assert i.capacity == 62
     i.enabled = False
     i.save()
@@ -35,6 +37,19 @@ def test_job_capacity_and_with_inactive_node():
         assert i.capacity == 0
 
 
+@pytest.mark.django_db
+@mock.patch('awx.main.utils.common.get_cpu_capacity', lambda: (2,8))
+@mock.patch('awx.main.utils.common.get_mem_capacity', lambda: (8000,62))
+def test_job_capacity_with_redis_disabled():
+    i = Instance.objects.create(hostname='test-1')
+
+    def _raise(self):
+        raise redis.ConnectionError()
+    with mock.patch.object(redis.client.Redis, 'ping', _raise):
+        i.refresh_capacity()
+    assert i.capacity == 0
+
+
 @pytest.mark.django_db
 def test_job_type_name():
     job = Job.objects.create()

From 2d2108b1de5b6acdafd750701e55798ec32b0a65 Mon Sep 17 00:00:00 2001
From: mabashian <mabashia@redhat.com>
Date: Fri, 21 Aug 2020 08:08:51 -0400
Subject: [PATCH 21/69] Support file upload/drag and drop on credential
 mutliline fields

---
 awx/ui_next/src/index.jsx                     |  6 ++--
 .../Credential/shared/CredentialForm.test.jsx | 22 +++++++++++--
 .../CredentialFormFields/CredentialField.jsx  | 32 +++++++++++++------
 3 files changed, 45 insertions(+), 15 deletions(-)

diff --git a/awx/ui_next/src/index.jsx b/awx/ui_next/src/index.jsx
index ad616077ef..866269098b 100644
--- a/awx/ui_next/src/index.jsx
+++ b/awx/ui_next/src/index.jsx
@@ -7,8 +7,8 @@ import { BrandName } from './variables';
 document.title = `Ansible ${BrandName}`;
 
 ReactDOM.render(
-  <React.StrictMode>
-    <App />
-  </React.StrictMode>,
+  // <React.StrictMode>
+  <App />,
+  // </React.StrictMode>,
   document.getElementById('app') || document.createElement('div')
 );
diff --git a/awx/ui_next/src/screens/Credential/shared/CredentialForm.test.jsx b/awx/ui_next/src/screens/Credential/shared/CredentialForm.test.jsx
index f4360e75ba..1959c308e2 100644
--- a/awx/ui_next/src/screens/Credential/shared/CredentialForm.test.jsx
+++ b/awx/ui_next/src/screens/Credential/shared/CredentialForm.test.jsx
@@ -163,7 +163,7 @@ describe('<CredentialForm />', () => {
         wrapper.find('textarea#credential-ssh_key_data').prop('value')
       ).toBe('');
       await act(async () => {
-        wrapper.find('FileUpload').invoke('onChange')({
+        wrapper.find('FileUpload#credential-gce-file').invoke('onChange')({
           name: 'foo.json',
           text: () =>
             '{"client_email":"testemail@ansible.com","project_id":"test123","private_key":"-----BEGIN PRIVATE KEY-----\\nAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\\n-----END PRIVATE KEY-----\\n"}',
@@ -184,7 +184,9 @@ describe('<CredentialForm />', () => {
     });
     test('should clear expected fields when file clear button clicked', async () => {
       await act(async () => {
-        wrapper.find('FileUploadField').invoke('onClearButtonClick')();
+        wrapper
+          .find('FileUploadField#credential-gce-file')
+          .invoke('onClearButtonClick')();
       });
       wrapper.update();
       expect(wrapper.find('input#credential-username').prop('value')).toBe('');
@@ -193,6 +195,20 @@ describe('<CredentialForm />', () => {
         wrapper.find('textarea#credential-ssh_key_data').prop('value')
       ).toBe('');
     });
+    test('should update field when RSA Private Key file uploaded', async () => {
+      await act(async () => {
+        wrapper.find('FileUpload#credential-ssh_key_data').invoke('onChange')(
+          '-----BEGIN PRIVATE KEY-----\\nBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB\\n-----END PRIVATE KEY-----\\n',
+          'foo.key'
+        );
+      });
+      wrapper.update();
+      expect(
+        wrapper.find('textarea#credential-ssh_key_data').prop('value')
+      ).toBe(
+        '-----BEGIN PRIVATE KEY-----\\nBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB\\n-----END PRIVATE KEY-----\\n'
+      );
+    });
     test('should show error when error thrown parsing JSON', async () => {
       await act(async () => {
         await wrapper
@@ -204,7 +220,7 @@ describe('<CredentialForm />', () => {
         'Select a JSON formatted service account key to autopopulate the following fields.'
       );
       await act(async () => {
-        wrapper.find('FileUpload').invoke('onChange')({
+        wrapper.find('FileUpload#credential-gce-file').invoke('onChange')({
           name: 'foo.json',
           text: () => '{not good json}',
         });
diff --git a/awx/ui_next/src/screens/Credential/shared/CredentialFormFields/CredentialField.jsx b/awx/ui_next/src/screens/Credential/shared/CredentialFormFields/CredentialField.jsx
index 51c9dfa02d..b5203bc72a 100644
--- a/awx/ui_next/src/screens/Credential/shared/CredentialFormFields/CredentialField.jsx
+++ b/awx/ui_next/src/screens/Credential/shared/CredentialFormFields/CredentialField.jsx
@@ -1,12 +1,13 @@
-import React from 'react';
+import React, { useState } from 'react';
 import { useField, useFormikContext } from 'formik';
 import { shape, string } from 'prop-types';
+import styled from 'styled-components';
 import { withI18n } from '@lingui/react';
 import { t } from '@lingui/macro';
 import {
+  FileUpload as PFFileUpload,
   FormGroup,
   InputGroup,
-  TextArea,
   TextInput,
 } from '@patternfly/react-core';
 import { FieldTooltip, PasswordInput } from '../../../../components/FormField';
@@ -16,19 +17,32 @@ import { required } from '../../../../util/validators';
 import { CredentialPluginField } from './CredentialPlugins';
 import BecomeMethodField from './BecomeMethodField';
 
+const FileUpload = styled(PFFileUpload)`
+  flex-grow: 1;
+`;
+
 function CredentialInput({ fieldOptions, credentialKind, ...rest }) {
-  const [subFormField, meta] = useField(`inputs.${fieldOptions.id}`);
+  const [fileName, setFileName] = useState('');
+  const [fileIsUploading, setFileIsUploading] = useState(false);
+  const [subFormField, meta, helpers] = useField(`inputs.${fieldOptions.id}`);
   const isValid = !(meta.touched && meta.error);
   if (fieldOptions.multiline) {
+    const handleFileChange = (value, filename) => {
+      helpers.setValue(value);
+      setFileName(filename);
+    };
+
     return (
-      <TextArea
+      <FileUpload
         {...subFormField}
         id={`credential-${fieldOptions.id}`}
-        rows={6}
-        resizeOrientation="vertical"
-        onChange={(value, event) => {
-          subFormField.onChange(event);
-        }}
+        type="text"
+        filename={fileName}
+        onChange={handleFileChange}
+        onReadStarted={() => setFileIsUploading(true)}
+        onReadFinished={() => setFileIsUploading(false)}
+        isLoading={fileIsUploading}
+        allowEditingUploadedText
         validated={isValid ? 'default' : 'error'}
       />
     );

From e5f9ed827b797f14e285d87e4add083fd76b7e15 Mon Sep 17 00:00:00 2001
From: mabashian <mabashia@redhat.com>
Date: Fri, 21 Aug 2020 08:19:13 -0400
Subject: [PATCH 22/69] Undo commenting out of strictmode

---
 awx/ui_next/src/index.jsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/awx/ui_next/src/index.jsx b/awx/ui_next/src/index.jsx
index 866269098b..ad616077ef 100644
--- a/awx/ui_next/src/index.jsx
+++ b/awx/ui_next/src/index.jsx
@@ -7,8 +7,8 @@ import { BrandName } from './variables';
 document.title = `Ansible ${BrandName}`;
 
 ReactDOM.render(
-  // <React.StrictMode>
-  <App />,
-  // </React.StrictMode>,
+  <React.StrictMode>
+    <App />
+  </React.StrictMode>,
   document.getElementById('app') || document.createElement('div')
 );

From 72dbd10c2ab8417517bb394a11a6071028e1926b Mon Sep 17 00:00:00 2001
From: beeankha <bstohrer@redhat.com>
Date: Thu, 27 Aug 2020 17:28:31 -0400
Subject: [PATCH 23/69] Initial commit for new inventory sync module

---
 .../modules/tower_inventory_source_update.py  | 100 ++++++++++++++++++
 awx_collection/test/awx/test_completeness.py  |   6 +-
 .../tasks/main.yml                            |  80 ++++++++++++++
 3 files changed, 183 insertions(+), 3 deletions(-)
 create mode 100644 awx_collection/plugins/modules/tower_inventory_source_update.py
 create mode 100644 awx_collection/tests/integration/targets/tower_inventory_source_update/tasks/main.yml

diff --git a/awx_collection/plugins/modules/tower_inventory_source_update.py b/awx_collection/plugins/modules/tower_inventory_source_update.py
new file mode 100644
index 0000000000..818011a0a3
--- /dev/null
+++ b/awx_collection/plugins/modules/tower_inventory_source_update.py
@@ -0,0 +1,100 @@
+#!/usr/bin/python
+# coding: utf-8 -*-
+
+# (c) 2020, Bianca Henderson <bianca@redhat.com>
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+from __future__ import absolute_import, division, print_function
+__metaclass__ = type
+
+
+ANSIBLE_METADATA = {'metadata_version': '1.1',
+                    'status': ['preview'],
+                    'supported_by': 'community'}
+
+
+DOCUMENTATION = '''
+---
+module: tower_inventory_source_update
+author: "Bianca Henderson (@beeankha)"
+short_description: Update inventory source(s).
+description:
+    - Update Ansible Tower inventory source(s). See
+      U(https://www.ansible.com/tower) for an overview.
+options:
+    inventory:
+      description:
+        - Name of the inventory that contains the inventory source(s) to update.
+      required: True
+      type: str
+    inventory_source:
+      description:
+        - The name of the inventory source to update.
+      required: True
+      type: str
+extends_documentation_fragment: awx.awx.auth
+'''
+
+EXAMPLES = '''
+- name: Update a single inventory source
+  tower_inventory_source_update:
+    inventory: "My Inventory"
+    inventory_source: "Example Inventory Source"
+
+- name: Update all inventory sources
+  tower_inventory_source_update:
+    inventory: "My Other Inventory"
+    inventory_source: "{{ item }}"
+  loop: "{{ query('awx.awx.tower_api', 'inventory_sources', query_params={ 'inventory': 30 }, return_ids=True ) }}"
+'''
+
+RETURN = '''
+id:
+    description: id of the inventory update
+    returned: success
+    type: int
+    sample: 86
+status:
+    description: status of the inventory update
+    returned: success
+    type: str
+    sample: pending
+'''
+
+from ..module_utils.tower_api import TowerAPIModule
+
+
+def main():
+    # Any additional arguments that are not fields of the item can be added here
+    argument_spec = dict(
+        inventory=dict(required=True),
+        inventory_source=dict(required=True),
+    )
+
+    # Create a module for ourselves
+    module = TowerAPIModule(argument_spec=argument_spec)
+
+    # Extract our parameters
+    inventory = module.params.get('inventory')
+    inventory_source = module.params.get('inventory_source')
+
+    # Attempt to look up the inventory the user specified (these will fail the module if not found)
+    inventory_object = module.get_one_by_name_or_id('inventories', inventory)
+    # Return all inventory sources related to the specified inventory
+    inventory_source_object = module.get_one_by_name_or_id(inventory_object['related']['inventory_sources'], inventory_source)
+
+    # Sync the inventory source(s)
+    inventory_source_update_results = module.post_endpoint(inventory_source_object['related']['update'], **{'data': {}})
+
+    if inventory_source_update_results['status_code'] != 202:
+        module.fail_json(msg="Failed to update inventory source, see response for details", **{'response': inventory_source_update_results})
+
+    module.exit_json(**{
+        'changed': True,
+        'id': inventory_source_update_results['json']['id'],
+        'status': inventory_source_update_results['json']['status'],
+    })
+
+
+if __name__ == '__main__':
+    main()
diff --git a/awx_collection/test/awx/test_completeness.py b/awx_collection/test/awx/test_completeness.py
index 2f1fc80d4d..f656db63b3 100644
--- a/awx_collection/test/awx/test_completeness.py
+++ b/awx_collection/test/awx/test_completeness.py
@@ -23,9 +23,9 @@ no_module_for_endpoint = []
 
 # Some modules work on the related fields of an endpoint. These modules will not have an auto-associated endpoint
 no_endpoint_for_module = [
-    'tower_import', 'tower_meta', 'tower_export', 'tower_job_launch', 'tower_job_wait', 'tower_job_list',
-    'tower_license', 'tower_ping', 'tower_receive', 'tower_send', 'tower_workflow_launch', 'tower_job_cancel',
-    'tower_workflow_template',
+    'tower_import', 'tower_meta', 'tower_export', 'tower_inventory_source_update', 'tower_job_launch', 'tower_job_wait',
+    'tower_job_list', 'tower_license', 'tower_ping', 'tower_receive', 'tower_send', 'tower_workflow_launch',
+    'tower_job_cancel', 'tower_workflow_template',
 ]
 
 # Global module parameters we can ignore
diff --git a/awx_collection/tests/integration/targets/tower_inventory_source_update/tasks/main.yml b/awx_collection/tests/integration/targets/tower_inventory_source_update/tasks/main.yml
new file mode 100644
index 0000000000..9f32195936
--- /dev/null
+++ b/awx_collection/tests/integration/targets/tower_inventory_source_update/tasks/main.yml
@@ -0,0 +1,80 @@
+---
+- name: Generate a test ID
+  set_fact:
+    test_id: "{{ lookup('password', '/dev/null chars=ascii_letters length=16') }}"
+
+- name: Generate names
+  set_fact:
+    project_name: "AWX-Collection-tests-tower_inventory_source_update-project-{{ test_id }}"
+    inv_name: "AWX-Collection-tests-tower_inventory_source_update-inv-{{ test_id }}"
+    inv_source1: "AWX-Collection-tests-tower_inventory_source_update-source1-{{ test_id }}"
+    inv_source2: "AWX-Collection-tests-tower_inventory_source_update-source2-{{ test_id }}"
+
+
+- block:
+  - name: Create a git project without credentials
+    tower_project:
+      name: "{{ project_name }}"
+      organization: Default
+      scm_type: git
+      scm_url: https://github.com/ansible/test-playbooks
+      wait: true
+
+  - name: Create an Inventory
+    tower_inventory:
+      name: "{{ inv_name }}"
+      organization: Default
+      state: present
+    register: created_inventory
+
+  - name: Create an Inventory Source
+    tower_inventory_source:
+      name: "{{ inv_source1 }}"
+      source: scm
+      source_project: "{{ project_name }}"
+      source_path: inventories/inventory.ini
+      description: Source for Test inventory
+      inventory: "{{ inv_name }}"
+
+  - name: Create Another Inventory Source
+    tower_inventory_source:
+      name: "{{ inv_source2 }}"
+      source: scm
+      source_project: "{{ project_name }}"
+      source_path: inventories/create_10_hosts.ini
+      description: Source for Test inventory
+      inventory: "{{ inv_name }}"
+
+  - name: Test Inventory Source Update
+    tower_inventory_source_update:
+      inventory: "{{ inv_name }}"
+      inventory_source: "{{ inv_source1 }}"
+    register: result
+
+  - assert:
+      that:
+        - "result is changed"
+
+  - name: Test Inventory Source Update for All Sources
+    tower_inventory_source_update:
+      inventory: "{{ inv_name }}"
+      inventory_source: "{{ item }}"
+    loop: "{{ query('awx.awx.tower_api', 'inventory_sources', query_params={ 'inventory': created_inventory.id }, return_ids=True ) }}"
+    register: result
+
+  - assert:
+      that:
+        - "result is changed"
+
+  always:
+    - name: Delete Inventory
+      tower_inventory:
+        name: "{{ inv_name }}"
+        organization: Default
+        state: absent
+
+    - name: Delete Project
+      tower_project:
+        name: "{{ project_name }}"
+        organization: Default
+        state: absent

From 65e0ed8c77287bb2b199e40ea56a53a15f944426 Mon Sep 17 00:00:00 2001
From: beeankha <bstohrer@redhat.com>
Date: Thu, 27 Aug 2020 19:07:18 -0400
Subject: [PATCH 24/69] Fix linter error

---
 .../tasks/main.yml                            | 92 +++++++++----------
 1 file changed, 46 insertions(+), 46 deletions(-)

diff --git a/awx_collection/tests/integration/targets/tower_inventory_source_update/tasks/main.yml b/awx_collection/tests/integration/targets/tower_inventory_source_update/tasks/main.yml
index 9f32195936..2a5fb76d6b 100644
--- a/awx_collection/tests/integration/targets/tower_inventory_source_update/tasks/main.yml
+++ b/awx_collection/tests/integration/targets/tower_inventory_source_update/tasks/main.yml
@@ -12,59 +12,59 @@
 
 
 - block:
-  - name: Create a git project without credentials
-    tower_project:
-      name: "{{ project_name }}"
-      organization: Default
-      scm_type: git
-      scm_url: https://github.com/ansible/test-playbooks
-      wait: true
+    - name: Create a git project without credentials
+      tower_project:
+        name: "{{ project_name }}"
+        organization: Default
+        scm_type: git
+        scm_url: https://github.com/ansible/test-playbooks
+        wait: true
 
-  - name: Create an Inventory
-    tower_inventory:
-      name: "{{ inv_name }}"
-      organization: Default
-      state: present
-    register: created_inventory
+    - name: Create an Inventory
+      tower_inventory:
+        name: "{{ inv_name }}"
+        organization: Default
+        state: present
+      register: created_inventory
 
-  - name: Create an Inventory Source
-    tower_inventory_source:
-      name: "{{ inv_source1 }}"
-      source: scm
-      source_project: "{{ project_name }}"
-      source_path: inventories/inventory.ini
-      description: Source for Test inventory
-      inventory: "{{ inv_name }}"
+    - name: Create an Inventory Source
+      tower_inventory_source:
+        name: "{{ inv_source1 }}"
+        source: scm
+        source_project: "{{ project_name }}"
+        source_path: inventories/inventory.ini
+        description: Source for Test inventory
+        inventory: "{{ inv_name }}"
 
-  - name: Create Another Inventory Source
-    tower_inventory_source:
-      name: "{{ inv_source2 }}"
-      source: scm
-      source_project: "{{ project_name }}"
-      source_path: inventories/create_10_hosts.ini
-      description: Source for Test inventory
-      inventory: "{{ inv_name }}"
+    - name: Create Another Inventory Source
+      tower_inventory_source:
+        name: "{{ inv_source2 }}"
+        source: scm
+        source_project: "{{ project_name }}"
+        source_path: inventories/create_10_hosts.ini
+        description: Source for Test inventory
+        inventory: "{{ inv_name }}"
 
-  - name: Test Inventory Source Update
-    tower_inventory_source_update:
-      inventory: "{{ inv_name }}"
-      inventory_source: "{{ inv_source1 }}"
-    register: result
+    - name: Test Inventory Source Update
+      tower_inventory_source_update:
+        inventory: "{{ inv_name }}"
+        inventory_source: "{{ inv_source1 }}"
+      register: result
 
-  - assert:
-      that:
-        - "result is changed"
+    - assert:
+        that:
+          - "result is changed"
 
-  - name: Test Inventory Source Update for All Sources
-    tower_inventory_source_update:
-      inventory: "{{ inv_name }}"
-      inventory_source: "{{ item }}"
-    loop: "{{ query('awx.awx.tower_api', 'inventory_sources', query_params={ 'inventory': created_inventory.id }, return_ids=True ) }}"
-    register: result
+    - name: Test Inventory Source Update for All Sources
+      tower_inventory_source_update:
+        inventory: "{{ inv_name }}"
+        inventory_source: "{{ item }}"
+      loop: "{{ query('awx.awx.tower_api', 'inventory_sources', query_params={ 'inventory': created_inventory.id }, return_ids=True ) }}"
+      register: result
 
-  - assert:
-      that:
-        - "result is changed"
+    - assert:
+        that:
+          - "result is changed"
 
   always:
     - name: Delete Inventory

From 1ce5d7d539af59f50fc38332b533b641ae63f8da Mon Sep 17 00:00:00 2001
From: beeankha <bstohrer@redhat.com>
Date: Tue, 1 Sep 2020 11:35:37 -0400
Subject: [PATCH 25/69] Add ability to look up inventory sources by org name/ID

---
 .../plugins/modules/tower_inventory_source.py | 15 ++++++++++
 .../modules/tower_inventory_source_update.py  | 13 +++++++++
 awx_collection/test/awx/test_completeness.py  |  3 +-
 .../tasks/main.yml                            | 29 +++++++++++++++++--
 4 files changed, 56 insertions(+), 4 deletions(-)

diff --git a/awx_collection/plugins/modules/tower_inventory_source.py b/awx_collection/plugins/modules/tower_inventory_source.py
index 4755670291..bf52996211 100644
--- a/awx_collection/plugins/modules/tower_inventory_source.py
+++ b/awx_collection/plugins/modules/tower_inventory_source.py
@@ -128,6 +128,10 @@ options:
         - list of notifications to send on error
       type: list
       elements: str
+    organization:
+      description:
+        - Name of organization for project.
+      type: str
 extends_documentation_fragment: awx.awx.auth
 '''
 
@@ -140,6 +144,7 @@ EXAMPLES = '''
     credential: previously-created-credential
     overwrite: True
     update_on_launch: True
+    organization: Default
     source_vars:
       private: false
 '''
@@ -168,6 +173,10 @@ def main():
         enabled_value=dict(),
         host_filter=dict(),
         credential=dict(),
+        source_regions=dict(),
+        instance_filters=dict(),
+        group_by=dict(),
+        organization=dict(),
         overwrite=dict(type='bool'),
         overwrite_vars=dict(type='bool'),
         custom_virtualenv=dict(),
@@ -195,6 +204,12 @@ def main():
     source_project = module.params.get('source_project')
     state = module.params.get('state')
 
+    new_fields = {}
+    organization_id = None
+    organization = module.params.get('organization')
+    if organization:
+        organization_id = module.get_one_by_name_or_id('organizations', organization)
+
     # Attempt to look up inventory source based on the provided name and inventory ID
     inventory_id = module.resolve_name_to_id('inventories', inventory)
     inventory_source = module.get_one('inventory_sources', **{
diff --git a/awx_collection/plugins/modules/tower_inventory_source_update.py b/awx_collection/plugins/modules/tower_inventory_source_update.py
index 818011a0a3..f38e3b6039 100644
--- a/awx_collection/plugins/modules/tower_inventory_source_update.py
+++ b/awx_collection/plugins/modules/tower_inventory_source_update.py
@@ -32,6 +32,11 @@ options:
         - The name of the inventory source to update.
       required: True
       type: str
+    organization:
+      description:
+        - Name of organization for project.
+      type: str
+      required: False
 extends_documentation_fragment: awx.awx.auth
 '''
 
@@ -40,6 +45,7 @@ EXAMPLES = '''
   tower_inventory_source_update:
     inventory: "My Inventory"
     inventory_source: "Example Inventory Source"
+    organization: Default
 
 - name: Update all inventory sources
   tower_inventory_source_update:
@@ -69,6 +75,7 @@ def main():
     argument_spec = dict(
         inventory=dict(required=True),
         inventory_source=dict(required=True),
+        organization=dict(),
     )
 
     # Create a module for ourselves
@@ -78,6 +85,12 @@ def main():
     inventory = module.params.get('inventory')
     inventory_source = module.params.get('inventory_source')
 
+    new_fields = {}
+    organization_id = None
+    organization = module.params.get('organization')
+    if organization:
+        organization_id = module.get_one_by_name_or_id('organizations', organization)
+
     # Attempt to look up the inventory the user specified (these will fail the module if not found)
     inventory_object = module.get_one_by_name_or_id('inventories', inventory)
     # Return all inventory sources related to the specified inventory
diff --git a/awx_collection/test/awx/test_completeness.py b/awx_collection/test/awx/test_completeness.py
index f656db63b3..ab8c1547f8 100644
--- a/awx_collection/test/awx/test_completeness.py
+++ b/awx_collection/test/awx/test_completeness.py
@@ -43,7 +43,8 @@ no_api_parameter_ok = {
     # /survey spec is now how we handle associations
     # We take an organization here to help with the lookups only
     'tower_job_template': ['survey_spec', 'organization'],
-    # Organization is how we looking job templates
+    'tower_inventory_source': ['organization'],
+    # Organization is how we are looking up job templates
     'tower_workflow_job_template_node': ['organization'],
     # Survey is how we handle associations
     'tower_workflow_job_template': ['survey'],
diff --git a/awx_collection/tests/integration/targets/tower_inventory_source_update/tasks/main.yml b/awx_collection/tests/integration/targets/tower_inventory_source_update/tasks/main.yml
index 2a5fb76d6b..7207541838 100644
--- a/awx_collection/tests/integration/targets/tower_inventory_source_update/tasks/main.yml
+++ b/awx_collection/tests/integration/targets/tower_inventory_source_update/tasks/main.yml
@@ -9,13 +9,20 @@
     inv_name: "AWX-Collection-tests-tower_inventory_source_update-inv-{{ test_id }}"
     inv_source1: "AWX-Collection-tests-tower_inventory_source_update-source1-{{ test_id }}"
     inv_source2: "AWX-Collection-tests-tower_inventory_source_update-source2-{{ test_id }}"
+    org_name: "AWX-Collection-tests-tower_inventory_source_update-org-{{ test_id }}"
 
 
 - block:
+
+    - name: "Create a new organization"
+      tower_organization:
+        name: "{{ org_name }}"
+      register: created_org
+
     - name: Create a git project without credentials
       tower_project:
         name: "{{ project_name }}"
-        organization: Default
+        organization: "{{ org_name }}"
         scm_type: git
         scm_url: https://github.com/ansible/test-playbooks
         wait: true
@@ -23,7 +30,14 @@
     - name: Create an Inventory
       tower_inventory:
         name: "{{ inv_name }}"
-        organization: Default
+        organization: "{{ org_name }}"
+        state: present
+      register: created_inventory
+
+    - name: Create another inventory w/ same name
+      tower_inventory:
+        name: "{{ inv_name }}"
+        organization: "{{ org_name }}"
         state: present
       register: created_inventory
 
@@ -34,21 +48,24 @@
         source_project: "{{ project_name }}"
         source_path: inventories/inventory.ini
         description: Source for Test inventory
+        organization: "{{ created_org.id }}"
         inventory: "{{ inv_name }}"
 
-    - name: Create Another Inventory Source
+    - name: Create Another Inventory Source (for testing org-based lookup)
       tower_inventory_source:
         name: "{{ inv_source2 }}"
         source: scm
         source_project: "{{ project_name }}"
         source_path: inventories/create_10_hosts.ini
         description: Source for Test inventory
+        organization: Default
         inventory: "{{ inv_name }}"
 
     - name: Test Inventory Source Update
       tower_inventory_source_update:
         inventory: "{{ inv_name }}"
         inventory_source: "{{ inv_source1 }}"
+        organization: Default
       register: result
 
     - assert:
@@ -59,6 +76,7 @@
       tower_inventory_source_update:
         inventory: "{{ inv_name }}"
         inventory_source: "{{ item }}"
+        organization: "{{ created_org.id }}"
       loop: "{{ query('awx.awx.tower_api', 'inventory_sources', query_params={ 'inventory': created_inventory.id }, return_ids=True ) }}"
       register: result
 
@@ -78,3 +96,8 @@
         name: "{{ project_name }}"
         organization: Default
         state: absent
+
+    - name: "Remove the organization"
+      tower_organization:
+        name: "{{ org_name }}"
+        state: absent

From b78dea3e4b369d0843e473472b04d1c979c169ce Mon Sep 17 00:00:00 2001
From: beeankha <bstohrer@redhat.com>
Date: Tue, 1 Sep 2020 16:56:29 -0400
Subject: [PATCH 26/69] Add wait ability to the module

---
 .../plugins/modules/tower_inventory_source.py |  5 +--
 .../modules/tower_inventory_source_update.py  | 31 ++++++++++++++++++-
 .../tasks/main.yml                            |  1 +
 3 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/awx_collection/plugins/modules/tower_inventory_source.py b/awx_collection/plugins/modules/tower_inventory_source.py
index bf52996211..eb316fd9ca 100644
--- a/awx_collection/plugins/modules/tower_inventory_source.py
+++ b/awx_collection/plugins/modules/tower_inventory_source.py
@@ -130,7 +130,7 @@ options:
       elements: str
     organization:
       description:
-        - Name of organization for project.
+        - Name of the inventory source's inventory's organization.
       type: str
 extends_documentation_fragment: awx.awx.auth
 '''
@@ -173,9 +173,6 @@ def main():
         enabled_value=dict(),
         host_filter=dict(),
         credential=dict(),
-        source_regions=dict(),
-        instance_filters=dict(),
-        group_by=dict(),
         organization=dict(),
         overwrite=dict(type='bool'),
         overwrite_vars=dict(type='bool'),
diff --git a/awx_collection/plugins/modules/tower_inventory_source_update.py b/awx_collection/plugins/modules/tower_inventory_source_update.py
index f38e3b6039..c8ac301ef3 100644
--- a/awx_collection/plugins/modules/tower_inventory_source_update.py
+++ b/awx_collection/plugins/modules/tower_inventory_source_update.py
@@ -34,9 +34,25 @@ options:
       type: str
     organization:
       description:
-        - Name of organization for project.
+        - Name of the inventory source's inventory's organization.
       type: str
       required: False
+    wait:
+      description:
+        - Wait for the job to complete.
+      default: False
+      type: bool
+    interval:
+      description:
+        - The interval to request an update from Tower.
+      required: False
+      default: 1
+      type: float
+    timeout:
+      description:
+        - If waiting for the job to complete this will abort after this
+          amount of seconds
+      type: int
 extends_documentation_fragment: awx.awx.auth
 '''
 
@@ -76,6 +92,9 @@ def main():
         inventory=dict(required=True),
         inventory_source=dict(required=True),
         organization=dict(),
+        wait=dict(default=False, type='bool'),
+        interval=dict(default=1.0, type='float'),
+        timeout=dict(default=None, type='int'),
     )
 
     # Create a module for ourselves
@@ -84,6 +103,9 @@ def main():
     # Extract our parameters
     inventory = module.params.get('inventory')
     inventory_source = module.params.get('inventory_source')
+    wait = module.params.get('wait')
+    interval = module.params.get('interval')
+    timeout = module.params.get('timeout')
 
     new_fields = {}
     organization_id = None
@@ -102,6 +124,13 @@ def main():
     if inventory_source_update_results['status_code'] != 202:
         module.fail_json(msg="Failed to update inventory source, see response for details", **{'response': inventory_source_update_results})
 
+    inventory_source_update_results = module.wait_on_url(
+        url=inventory_source_update_results['json']['url'],
+        object_name=inventory_object,
+        object_type='inventory_update',
+        timeout=timeout, interval=interval
+    )
+
     module.exit_json(**{
         'changed': True,
         'id': inventory_source_update_results['json']['id'],
diff --git a/awx_collection/tests/integration/targets/tower_inventory_source_update/tasks/main.yml b/awx_collection/tests/integration/targets/tower_inventory_source_update/tasks/main.yml
index 7207541838..fd6cd48f2f 100644
--- a/awx_collection/tests/integration/targets/tower_inventory_source_update/tasks/main.yml
+++ b/awx_collection/tests/integration/targets/tower_inventory_source_update/tasks/main.yml
@@ -77,6 +77,7 @@
         inventory: "{{ inv_name }}"
         inventory_source: "{{ item }}"
         organization: "{{ created_org.id }}"
+        wait: true
       loop: "{{ query('awx.awx.tower_api', 'inventory_sources', query_params={ 'inventory': created_inventory.id }, return_ids=True ) }}"
       register: result
 

From 7764f1c1a53cf0efc17adb04744125f1f773c6e4 Mon Sep 17 00:00:00 2001
From: beeankha <bstohrer@redhat.com>
Date: Wed, 2 Sep 2020 22:05:25 -0400
Subject: [PATCH 27/69] Fix inv source org lookup, adjust unit tests (since org
 is now required for inv source module), update README, edit typos in
 test-related README

---
 awx/main/tests/factories/README.md            |  4 +-
 .../plugins/modules/tower_inventory_source.py | 36 +++++++++------
 .../modules/tower_inventory_source_update.py  | 46 ++++++++++++-------
 .../test/awx/test_inventory_source.py         | 40 ++++++----------
 .../tower_inventory_source/tasks/main.yml     |  2 +
 .../tasks/main.yml                            | 13 +++---
 .../template_galaxy/templates/README.md.j2    |  1 +
 7 files changed, 75 insertions(+), 67 deletions(-)

diff --git a/awx/main/tests/factories/README.md b/awx/main/tests/factories/README.md
index c451c02598..916c996cfa 100644
--- a/awx/main/tests/factories/README.md
+++ b/awx/main/tests/factories/README.md
@@ -52,11 +52,11 @@ patterns
 --------
 
 `mk` functions are single object fixtures. They should create only a single object with the minimum deps.
-They should also accept a `persited` flag, if they must be persisted to work, they raise an error if persisted=False
+They should also accept a `persisted` flag, if they must be persisted to work, they raise an error if persisted=False
 
 `generate` and `apply` functions are helpers that build up the various parts of a `create` functions objects. These
 should be useful for more than one create function to use and should explicitly accept all of the values needed
-to execute. These functions should also be robust and have very speciifc error reporting about constraints and/or
+to execute. These functions should also be robust and have very specific error reporting about constraints and/or
 bad values.
 
 `create` functions compose many of the `mk` and `generate` functions to make different object
diff --git a/awx_collection/plugins/modules/tower_inventory_source.py b/awx_collection/plugins/modules/tower_inventory_source.py
index eb316fd9ca..7c7c506826 100644
--- a/awx_collection/plugins/modules/tower_inventory_source.py
+++ b/awx_collection/plugins/modules/tower_inventory_source.py
@@ -131,6 +131,7 @@ options:
     organization:
       description:
         - Name of the inventory source's inventory's organization.
+      required: True
       type: str
 extends_documentation_fragment: awx.awx.auth
 '''
@@ -173,7 +174,7 @@ def main():
         enabled_value=dict(),
         host_filter=dict(),
         credential=dict(),
-        organization=dict(),
+        organization=dict(required=True),
         overwrite=dict(type='bool'),
         overwrite_vars=dict(type='bool'),
         custom_virtualenv=dict(),
@@ -196,29 +197,34 @@ def main():
     name = module.params.get('name')
     new_name = module.params.get('new_name')
     inventory = module.params.get('inventory')
+    organization = module.params.get('organization')
     source_script = module.params.get('source_script')
     credential = module.params.get('credential')
     source_project = module.params.get('source_project')
     state = module.params.get('state')
 
-    new_fields = {}
-    organization_id = None
-    organization = module.params.get('organization')
-    if organization:
-        organization_id = module.get_one_by_name_or_id('organizations', organization)
-
     # Attempt to look up inventory source based on the provided name and inventory ID
-    inventory_id = module.resolve_name_to_id('inventories', inventory)
-    inventory_source = module.get_one('inventory_sources', **{
+    org_id = module.resolve_name_to_id('organizations', organization)
+    inventory_object = module.get_one('inventories', **{
+        'data': {
+            'name': inventory,
+            'organization': org_id,
+        }
+    })
+
+    if not inventory_object:
+        module.fail_json(msg='The specified inventory was not found.')
+
+    inventory_source_object = module.get_one('inventory_sources', **{
         'data': {
             'name': name,
-            'inventory': inventory_id,
+            'inventory': inventory_object['id'],
         }
     })
 
     if state == 'absent':
         # If the state was absent we can let the module delete it if needed, the module will handle exiting from this
-        module.delete_if_needed(inventory_source)
+        module.delete_if_needed(inventory_source_object)
 
     # Attempt to look up associated field items the user specified.
     association_fields = {}
@@ -244,7 +250,7 @@ def main():
     # Create the data that gets sent for create and update
     inventory_source_fields = {
         'name': new_name if new_name else name,
-        'inventory': inventory_id,
+        'inventory': inventory_object['id'],
     }
 
     # Attempt to look up the related items the user specified (these will fail the module if not found)
@@ -273,12 +279,12 @@ def main():
         inventory_source_fields['source_vars'] = dumps(inventory_source_fields['source_vars'])
 
     # Sanity check on arguments
-    if state == 'present' and not inventory_source and not inventory_source_fields['source']:
+    if state == 'present' and not inventory_source_object and not inventory_source_fields['source']:
         module.fail_json(msg="If creating a new inventory source, the source param must be present")
 
-    # If the state was present we can let the module build or update the existing inventory_source, this will return on its own
+    # If the state was present we can let the module build or update the existing inventory_source_object, this will return on its own
     module.create_or_update_if_needed(
-        inventory_source, inventory_source_fields,
+        inventory_source_object, inventory_source_fields,
         endpoint='inventory_sources', item_type='inventory source',
         associations=association_fields
     )
diff --git a/awx_collection/plugins/modules/tower_inventory_source_update.py b/awx_collection/plugins/modules/tower_inventory_source_update.py
index c8ac301ef3..6f9cdf6de1 100644
--- a/awx_collection/plugins/modules/tower_inventory_source_update.py
+++ b/awx_collection/plugins/modules/tower_inventory_source_update.py
@@ -36,7 +36,7 @@ options:
       description:
         - Name of the inventory source's inventory's organization.
       type: str
-      required: False
+      required: True
     wait:
       description:
         - Wait for the job to complete.
@@ -91,7 +91,7 @@ def main():
     argument_spec = dict(
         inventory=dict(required=True),
         inventory_source=dict(required=True),
-        organization=dict(),
+        organization=dict(required=True),
         wait=dict(default=False, type='bool'),
         interval=dict(default=1.0, type='float'),
         timeout=dict(default=None, type='int'),
@@ -103,20 +103,31 @@ def main():
     # Extract our parameters
     inventory = module.params.get('inventory')
     inventory_source = module.params.get('inventory_source')
+    organization = module.params.get('organization')
     wait = module.params.get('wait')
     interval = module.params.get('interval')
     timeout = module.params.get('timeout')
 
-    new_fields = {}
-    organization_id = None
-    organization = module.params.get('organization')
-    if organization:
-        organization_id = module.get_one_by_name_or_id('organizations', organization)
+    org_id = module.resolve_name_to_id('organizations', organization)
+    inventory_object = module.get_one('inventories', **{
+        'data': {
+            'name': inventory,
+            'organization': org_id,
+        }
+    })
 
-    # Attempt to look up the inventory the user specified (these will fail the module if not found)
-    inventory_object = module.get_one_by_name_or_id('inventories', inventory)
-    # Return all inventory sources related to the specified inventory
-    inventory_source_object = module.get_one_by_name_or_id(inventory_object['related']['inventory_sources'], inventory_source)
+    if not inventory_object:
+        module.fail_json(msg='The specified inventory was not found.')
+
+    inventory_source_object = module.get_one('inventory_sources', **{
+        'data': {
+            'name': inventory_source,
+            'inventory': inventory_object['id'],
+        }
+    })
+
+    if not inventory_source_object:
+        module.fail_json(msg='The specified inventory source was not found.')
 
     # Sync the inventory source(s)
     inventory_source_update_results = module.post_endpoint(inventory_source_object['related']['update'], **{'data': {}})
@@ -124,12 +135,13 @@ def main():
     if inventory_source_update_results['status_code'] != 202:
         module.fail_json(msg="Failed to update inventory source, see response for details", **{'response': inventory_source_update_results})
 
-    inventory_source_update_results = module.wait_on_url(
-        url=inventory_source_update_results['json']['url'],
-        object_name=inventory_object,
-        object_type='inventory_update',
-        timeout=timeout, interval=interval
-    )
+    if wait:
+        inventory_source_update_results = module.wait_on_url(
+            url=inventory_source_update_results['json']['url'],
+            object_name=inventory_object,
+            object_type='inventory_update',
+            timeout=timeout, interval=interval
+        )
 
     module.exit_json(**{
         'changed': True,
diff --git a/awx_collection/test/awx/test_inventory_source.py b/awx_collection/test/awx/test_inventory_source.py
index b27653fb94..b1b362efad 100644
--- a/awx_collection/test/awx/test_inventory_source.py
+++ b/awx_collection/test/awx/test_inventory_source.py
@@ -24,11 +24,12 @@ def project(base_inventory):
 
 
 @pytest.mark.django_db
-def test_inventory_source_create(run_module, admin_user, base_inventory, project):
+def test_inventory_source_create(run_module, admin_user, base_inventory, project, organization):
     source_path = '/var/lib/awx/example_source_path/'
     result = run_module('tower_inventory_source', dict(
         name='foo',
         inventory=base_inventory.name,
+        organization='test-org',
         state='present',
         source='scm',
         source_path=source_path,
@@ -45,30 +46,6 @@ def test_inventory_source_create(run_module, admin_user, base_inventory, project
     }
 
 
-@pytest.mark.django_db
-def test_create_inventory_source_implied_org(run_module, admin_user):
-    org = Organization.objects.create(name='test-org')
-    inv = Inventory.objects.create(name='test-inv', organization=org)
-
-    # Credential is not required for ec2 source, because of IAM roles
-    result = run_module('tower_inventory_source', dict(
-        name='Test Inventory Source',
-        inventory='test-inv',
-        source='ec2',
-        state='present'
-    ), admin_user)
-    assert result.pop('changed', None), result
-
-    inv_src = InventorySource.objects.get(name='Test Inventory Source')
-    assert inv_src.inventory == inv
-
-    result.pop('invocation')
-    assert result == {
-        "name": "Test Inventory Source",
-        "id": inv_src.id,
-    }
-
-
 @pytest.mark.django_db
 def test_create_inventory_source_multiple_orgs(run_module, admin_user):
     org = Organization.objects.create(name='test-org')
@@ -80,7 +57,8 @@ def test_create_inventory_source_multiple_orgs(run_module, admin_user):
 
     result = run_module('tower_inventory_source', dict(
         name='Test Inventory Source',
-        inventory=inv2.id,
+        inventory=inv2.name,
+        organization='test-org-number-two',
         source='ec2',
         state='present'
     ), admin_user)
@@ -104,6 +82,7 @@ def test_create_inventory_source_with_venv(run_module, admin_user, base_inventor
         result = run_module('tower_inventory_source', dict(
             name='foo',
             inventory=base_inventory.name,
+            organization='test-org',
             state='present',
             source='scm',
             source_project=project.name,
@@ -120,7 +99,7 @@ def test_create_inventory_source_with_venv(run_module, admin_user, base_inventor
 
 
 @pytest.mark.django_db
-def test_custom_venv_no_op(run_module, admin_user, base_inventory, mocker, project):
+def test_custom_venv_no_op(run_module, admin_user, base_inventory, mocker, project, organization):
     """If the inventory source is modified, then it should not blank fields
     unrelated to the params that the user passed.
     This enforces assumptions about the behavior of the AnsibleModule
@@ -140,6 +119,7 @@ def test_custom_venv_no_op(run_module, admin_user, base_inventory, mocker, proje
             name='foo',
             description='this is the changed description',
             inventory=base_inventory.name,
+            organization='test-org',
             source='scm',  # is required, but behavior is arguable
             state='present',
             source_project=project.name,
@@ -156,6 +136,7 @@ def test_falsy_value(run_module, admin_user, base_inventory):
     result = run_module('tower_inventory_source', dict(
         name='falsy-test',
         inventory=base_inventory.name,
+        organization='test-org',
         source='ec2',
         update_on_launch=True
     ), admin_user)
@@ -168,6 +149,7 @@ def test_falsy_value(run_module, admin_user, base_inventory):
     result = run_module('tower_inventory_source', dict(
         name='falsy-test',
         inventory=base_inventory.name,
+        organization='test-org',
         # source='ec2',
         update_on_launch=False
     ), admin_user)
@@ -203,6 +185,7 @@ def test_missing_required_credential(run_module, admin_user, base_inventory):
     result = run_module('tower_inventory_source', dict(
         name='Test Azure Source',
         inventory=base_inventory.name,
+        organization='test-org',
         source='azure_rm',
         state='present'
     ), admin_user)
@@ -216,6 +199,7 @@ def test_source_project_not_for_cloud(run_module, admin_user, base_inventory, pr
     result = run_module('tower_inventory_source', dict(
         name='Test ec2 Inventory Source',
         inventory=base_inventory.name,
+        organization='test-org',
         source='ec2',
         state='present',
         source_project=project.name
@@ -230,6 +214,7 @@ def test_source_path_not_for_cloud(run_module, admin_user, base_inventory):
     result = run_module('tower_inventory_source', dict(
         name='Test ec2 Inventory Source',
         inventory=base_inventory.name,
+        organization='test-org',
         source='ec2',
         state='present',
         source_path='where/am/I'
@@ -243,6 +228,7 @@ def test_source_path_not_for_cloud(run_module, admin_user, base_inventory):
 def test_scm_source_needs_project(run_module, admin_user, base_inventory):
     result = run_module('tower_inventory_source', dict(
         name='SCM inventory without project',
+        organization='test-org',
         inventory=base_inventory.name,
         state='present',
         source='scm',
diff --git a/awx_collection/tests/integration/targets/tower_inventory_source/tasks/main.yml b/awx_collection/tests/integration/targets/tower_inventory_source/tasks/main.yml
index fb5f33c3ca..738d432711 100644
--- a/awx_collection/tests/integration/targets/tower_inventory_source/tasks/main.yml
+++ b/awx_collection/tests/integration/targets/tower_inventory_source/tasks/main.yml
@@ -31,6 +31,7 @@
     credential: "{{ openstack_cred }}"
     overwrite: true
     update_on_launch: true
+    organization: Default
     source_vars:
       private: false
     source: openstack
@@ -47,6 +48,7 @@
     credential: "Does Not Exit"
     source_project: "Does Not Exist"
     source_script: "Does Not Exist"
+    organization: Default
     state: absent
 
 - assert:
diff --git a/awx_collection/tests/integration/targets/tower_inventory_source_update/tasks/main.yml b/awx_collection/tests/integration/targets/tower_inventory_source_update/tasks/main.yml
index fd6cd48f2f..01b29a0cf0 100644
--- a/awx_collection/tests/integration/targets/tower_inventory_source_update/tasks/main.yml
+++ b/awx_collection/tests/integration/targets/tower_inventory_source_update/tasks/main.yml
@@ -32,12 +32,11 @@
         name: "{{ inv_name }}"
         organization: "{{ org_name }}"
         state: present
-      register: created_inventory
 
     - name: Create another inventory w/ same name
       tower_inventory:
         name: "{{ inv_name }}"
-        organization: "{{ org_name }}"
+        organization: Default
         state: present
       register: created_inventory
 
@@ -64,7 +63,7 @@
     - name: Test Inventory Source Update
       tower_inventory_source_update:
         inventory: "{{ inv_name }}"
-        inventory_source: "{{ inv_source1 }}"
+        inventory_source: "{{ inv_source2 }}"
         organization: Default
       register: result
 
@@ -75,10 +74,12 @@
     - name: Test Inventory Source Update for All Sources
       tower_inventory_source_update:
         inventory: "{{ inv_name }}"
-        inventory_source: "{{ item }}"
-        organization: "{{ created_org.id }}"
+        inventory_source: "{{ item.name }}"
+        organization: Default
         wait: true
-      loop: "{{ query('awx.awx.tower_api', 'inventory_sources', query_params={ 'inventory': created_inventory.id }, return_ids=True ) }}"
+      loop: "{{ query('awx.awx.tower_api', 'inventory_sources', query_params={ 'inventory': created_inventory.id }, expect_objects=True, return_objects=True) }}"
+      loop_control:
+        label: "{{ item.name }}"
       register: result
 
     - assert:
diff --git a/awx_collection/tools/roles/template_galaxy/templates/README.md.j2 b/awx_collection/tools/roles/template_galaxy/templates/README.md.j2
index 8a5743d34f..e1de06ec97 100644
--- a/awx_collection/tools/roles/template_galaxy/templates/README.md.j2
+++ b/awx_collection/tools/roles/template_galaxy/templates/README.md.j2
@@ -104,6 +104,7 @@ The following notes are changes that may require changes to playbooks:
  - The `notification_configuration` parameter of `tower_notification_template` has changed from a string to a dict. Please use the `lookup` plugin to read an existing file into a dict.
  - `tower_credential` no longer supports passing a file name to ssh_key_data.
  - The HipChat `notification_type` has been removed and can no longer be created using the `tower_notification_template` module.
+ - The `tower_inventory_source` module now requires the `organization` parameter in order to specify the inventory source's inventory's organization.
 
 {% if collection_package | lower() == "awx" %}
 ## Running Unit Tests

From 013b411a0a37894eff17032fcfaf0459c806cf33 Mon Sep 17 00:00:00 2001
From: Ryan Petrello <rpetrell@redhat.com>
Date: Fri, 4 Sep 2020 10:42:53 -0400
Subject: [PATCH 28/69] remove old fact scanning plugins

---
 awx/main/tasks.py                         |   5 -
 awx/playbooks/scan_facts.yml              |  36 ----
 awx/plugins/library/scan_files.py         | 166 -------------------
 awx/plugins/library/scan_insights.py      |  66 --------
 awx/plugins/library/scan_packages.py      | 111 -------------
 awx/plugins/library/scan_services.py      | 190 ----------------------
 awx/plugins/library/win_scan_files.ps1    | 102 ------------
 awx/plugins/library/win_scan_packages.ps1 |  66 --------
 awx/plugins/library/win_scan_services.ps1 |  30 ----
 9 files changed, 772 deletions(-)
 delete mode 100644 awx/playbooks/scan_facts.yml
 delete mode 100644 awx/plugins/library/scan_files.py
 delete mode 100755 awx/plugins/library/scan_insights.py
 delete mode 100755 awx/plugins/library/scan_packages.py
 delete mode 100644 awx/plugins/library/scan_services.py
 delete mode 100644 awx/plugins/library/win_scan_files.ps1
 delete mode 100644 awx/plugins/library/win_scan_packages.ps1
 delete mode 100644 awx/plugins/library/win_scan_services.ps1

diff --git a/awx/main/tasks.py b/awx/main/tasks.py
index 0c7b219371..2857b00c57 100644
--- a/awx/main/tasks.py
+++ b/awx/main/tasks.py
@@ -1632,11 +1632,6 @@ class RunJob(BaseTask):
         # callbacks to work.
         env['JOB_ID'] = str(job.pk)
         env['INVENTORY_ID'] = str(job.inventory.pk)
-        if job.use_fact_cache:
-            library_source = self.get_path_to('..', 'plugins', 'library')
-            library_dest = os.path.join(private_data_dir, 'library')
-            copy_tree(library_source, library_dest)
-            env['ANSIBLE_LIBRARY'] = library_dest
         if job.project:
             env['PROJECT_REVISION'] = job.project.scm_revision
         env['ANSIBLE_RETRY_FILES_ENABLED'] = "False"
diff --git a/awx/playbooks/scan_facts.yml b/awx/playbooks/scan_facts.yml
deleted file mode 100644
index 884760f717..0000000000
--- a/awx/playbooks/scan_facts.yml
+++ /dev/null
@@ -1,36 +0,0 @@
----
-- hosts: all
-  vars:
-    scan_use_checksum: false
-    scan_use_recursive: false
-  tasks:
-
-    - name: "Scan packages (Unix/Linux)"
-      scan_packages:
-        os_family: '{{ ansible_os_family }}'
-      when: ansible_os_family != "Windows"
-    - name: "Scan services (Unix/Linux)"
-      scan_services:
-      when: ansible_os_family != "Windows"
-    - name: "Scan files (Unix/Linux)"
-      scan_files:
-        paths: '{{ scan_file_paths }}'
-        get_checksum: '{{ scan_use_checksum }}'
-        recursive: '{{ scan_use_recursive }}'
-      when: scan_file_paths is defined and ansible_os_family != "Windows"
-    - name: "Scan Insights for Machine ID (Unix/Linux)"
-      scan_insights:
-      when: ansible_os_family != "Windows"
-
-    - name: "Scan packages (Windows)"
-      win_scan_packages:
-      when: ansible_os_family == "Windows"
-    - name: "Scan services (Windows)"
-      win_scan_services:
-      when: ansible_os_family == "Windows"
-    - name: "Scan files (Windows)"
-      win_scan_files:
-        paths: '{{ scan_file_paths }}'
-        get_checksum: '{{ scan_use_checksum }}'
-        recursive: '{{ scan_use_recursive }}'
-      when: scan_file_paths is defined and ansible_os_family == "Windows"
diff --git a/awx/plugins/library/scan_files.py b/awx/plugins/library/scan_files.py
deleted file mode 100644
index b3b07ad64a..0000000000
--- a/awx/plugins/library/scan_files.py
+++ /dev/null
@@ -1,166 +0,0 @@
-#!/usr/bin/env python
-
-import os
-import stat
-from ansible.module_utils.basic import * # noqa
-
-DOCUMENTATION = '''
----
-module: scan_files
-short_description: Return file state information as fact data for a directory tree
-description:
-     - Return file state information recursively for a directory tree on the filesystem
-version_added: "1.9"
-options:
-  path:
-    description: The path containing files to be analyzed
-    required: true
-    default: null
-  recursive:
-    description: scan this directory and all subdirectories
-    required: false
-    default: no
-  get_checksum:
-    description: Checksum files that you can access
-    required: false
-    default: false
-requirements: [ ]
-author: Matthew Jones
-'''
-
-EXAMPLES = '''
-# Example fact output:
-# host | success >> {
-#     "ansible_facts": {
-#         "files": [
-#             {
-#                 "atime": 1427313854.0755742,
-#                 "checksum": "cf7566e6149ad9af91e7589e0ea096a08de9c1e5",
-#                 "ctime": 1427129299.22948,
-#                 "dev": 51713,
-#                 "gid": 0,
-#                 "inode": 149601,
-#                 "isblk": false,
-#                 "ischr": false,
-#                 "isdir": false,
-#                 "isfifo": false,
-#                 "isgid": false,
-#                 "islnk": false,
-#                 "isreg": true,
-#                 "issock": false,
-#                 "isuid": false,
-#                 "mode": "0644",
-#                 "mtime": 1427112663.0321455,
-#                 "nlink": 1,
-#                 "path": "/var/log/dmesg.1.gz",
-#                 "rgrp": true,
-#                 "roth": true,
-#                 "rusr": true,
-#                 "size": 28,
-#                 "uid": 0,
-#                 "wgrp": false,
-#                 "woth": false,
-#                 "wusr": true,
-#                 "xgrp": false,
-#                 "xoth": false,
-#                 "xusr": false
-#             },
-#             {
-#                 "atime": 1427314385.1155744,
-#                 "checksum": "16fac7be61a6e4591a33ef4b729c5c3302307523",
-#                 "ctime": 1427384148.5755742,
-#                 "dev": 51713,
-#                 "gid": 43,
-#                 "inode": 149564,
-#                 "isblk": false,
-#                 "ischr": false,
-#                 "isdir": false,
-#                 "isfifo": false,
-#                 "isgid": false,
-#                 "islnk": false,
-#                 "isreg": true,
-#                 "issock": false,
-#                 "isuid": false,
-#                 "mode": "0664",
-#                 "mtime": 1427384148.5755742,
-#                 "nlink": 1,
-#                 "path": "/var/log/wtmp",
-#                 "rgrp": true,
-#                 "roth": true,
-#                 "rusr": true,
-#                 "size": 48768,
-#                 "uid": 0,
-#                 "wgrp": true,
-#                 "woth": false,
-#                 "wusr": true,
-#                 "xgrp": false,
-#                 "xoth": false,
-#                 "xusr": false
-#             },
-'''
-
-
-def main():
-    module = AnsibleModule(  # noqa
-        argument_spec = dict(paths=dict(required=True, type='list'),
-                             recursive=dict(required=False, default='no', type='bool'),
-                             get_checksum=dict(required=False, default='no', type='bool')))
-    files = []
-    paths = module.params.get('paths')
-    for path in paths:
-        path = os.path.expanduser(path)
-        if not os.path.exists(path) or not os.path.isdir(path):
-            module.fail_json(msg = "Given path must exist and be a directory")
-
-        get_checksum = module.params.get('get_checksum')
-        should_recurse = module.params.get('recursive')
-        if not should_recurse:
-            path_list = [os.path.join(path, subpath) for subpath in os.listdir(path)]
-        else:
-            path_list = [os.path.join(w_path, f) for w_path, w_names, w_file in os.walk(path) for f in w_file]
-        for filepath in path_list:
-            try:
-                st = os.stat(filepath)
-            except OSError:
-                continue
-
-            mode = st.st_mode
-            d = {
-                'path'     : filepath,
-                'mode'     : "%04o" % stat.S_IMODE(mode),
-                'isdir'    : stat.S_ISDIR(mode),
-                'ischr'    : stat.S_ISCHR(mode),
-                'isblk'    : stat.S_ISBLK(mode),
-                'isreg'    : stat.S_ISREG(mode),
-                'isfifo'   : stat.S_ISFIFO(mode),
-                'islnk'    : stat.S_ISLNK(mode),
-                'issock'   : stat.S_ISSOCK(mode),
-                'uid'      : st.st_uid,
-                'gid'      : st.st_gid,
-                'size'     : st.st_size,
-                'inode'    : st.st_ino,
-                'dev'      : st.st_dev,
-                'nlink'    : st.st_nlink,
-                'atime'    : st.st_atime,
-                'mtime'    : st.st_mtime,
-                'ctime'    : st.st_ctime,
-                'wusr'     : bool(mode & stat.S_IWUSR),
-                'rusr'     : bool(mode & stat.S_IRUSR),
-                'xusr'     : bool(mode & stat.S_IXUSR),
-                'wgrp'     : bool(mode & stat.S_IWGRP),
-                'rgrp'     : bool(mode & stat.S_IRGRP),
-                'xgrp'     : bool(mode & stat.S_IXGRP),
-                'woth'     : bool(mode & stat.S_IWOTH),
-                'roth'     : bool(mode & stat.S_IROTH),
-                'xoth'     : bool(mode & stat.S_IXOTH),
-                'isuid'    : bool(mode & stat.S_ISUID),
-                'isgid'    : bool(mode & stat.S_ISGID),
-            }
-            if get_checksum and stat.S_ISREG(mode) and os.access(filepath, os.R_OK):
-                d['checksum'] = module.sha1(filepath)
-            files.append(d)
-    results = dict(ansible_facts=dict(files=files))
-    module.exit_json(**results)
-
-
-main()
diff --git a/awx/plugins/library/scan_insights.py b/awx/plugins/library/scan_insights.py
deleted file mode 100755
index f7b7919bca..0000000000
--- a/awx/plugins/library/scan_insights.py
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/usr/bin/env python
-
-from ansible.module_utils.basic import * # noqa
-
-DOCUMENTATION = '''
----
-module: scan_insights
-short_description: Return insights id as fact data
-description:
-    - Inspects the /etc/redhat-access-insights/machine-id file for insights id and returns the found id as fact data
-version_added: "2.3"
-options:
-requirements: [ ]
-author: Chris Meyers
-'''
-
-EXAMPLES = '''
-# Example fact output:
-# host | success >> {
-#    "ansible_facts": {
-#        "insights": {
-#           "system_id": "4da7d1f8-14f3-4cdc-acd5-a3465a41f25d"
-#        }, ... }
-'''
-
-
-INSIGHTS_SYSTEM_ID_FILE='/etc/redhat-access-insights/machine-id'
-
-
-def get_system_id(filname):
-    system_id = None
-    try:
-        f = open(INSIGHTS_SYSTEM_ID_FILE, "r")
-    except IOError:
-        return None
-    else:
-        try:
-            data = f.readline()
-            system_id = str(data)
-        except (IOError, ValueError):
-            pass
-        finally:
-            f.close()
-            if system_id:
-                system_id = system_id.strip()
-            return system_id
-
-
-def main():
-    module = AnsibleModule(  # noqa
-        argument_spec = dict()
-    )
-
-    system_id = get_system_id(INSIGHTS_SYSTEM_ID_FILE)
-
-    results = {
-        'ansible_facts': {
-            'insights': {
-                'system_id': system_id
-            }
-        }
-    }
-    module.exit_json(**results)
-
-
-main()
diff --git a/awx/plugins/library/scan_packages.py b/awx/plugins/library/scan_packages.py
deleted file mode 100755
index d0b544bb9f..0000000000
--- a/awx/plugins/library/scan_packages.py
+++ /dev/null
@@ -1,111 +0,0 @@
-#!/usr/bin/env python
-
-from ansible.module_utils.basic import * # noqa
-
-DOCUMENTATION = '''
----
-module: scan_packages
-short_description: Return installed packages information as fact data
-description:
-    - Return information about installed packages as fact data
-version_added: "1.9"
-options:
-requirements: [ ]
-author: Matthew Jones
-'''
-
-EXAMPLES = '''
-# Example fact output:
-# host | success >> {
-#    "ansible_facts": {
-#        "packages": {
-#              "libbz2-1.0": [
-#                {
-#                  "version": "1.0.6-5",
-#                  "source": "apt",
-#                  "arch": "amd64",
-#                  "name": "libbz2-1.0"
-#                }
-#              ],
-#              "patch": [
-#                {
-#                  "version": "2.7.1-4ubuntu1",
-#                  "source": "apt",
-#                  "arch": "amd64",
-#                  "name": "patch"
-#                }
-#              ],
-#              "gcc-4.8-base": [
-#                {
-#                  "version": "4.8.2-19ubuntu1",
-#                  "source": "apt",
-#                  "arch": "amd64",
-#                  "name": "gcc-4.8-base"
-#                },
-#                {
-#                  "version": "4.9.2-19ubuntu1",
-#                  "source": "apt",
-#                  "arch": "amd64",
-#                  "name": "gcc-4.8-base"
-#                }
-#              ]
-#       }
-'''
-
-
-def rpm_package_list():
-    import rpm
-    trans_set = rpm.TransactionSet()
-    installed_packages = {}
-    for package in trans_set.dbMatch():
-        package_details = dict(name=package[rpm.RPMTAG_NAME],
-                               version=package[rpm.RPMTAG_VERSION],
-                               release=package[rpm.RPMTAG_RELEASE],
-                               epoch=package[rpm.RPMTAG_EPOCH],
-                               arch=package[rpm.RPMTAG_ARCH],
-                               source='rpm')
-        if package_details['name'] not in installed_packages:
-            installed_packages[package_details['name']] = [package_details]
-        else:
-            installed_packages[package_details['name']].append(package_details)
-    return installed_packages
-
-
-def deb_package_list():
-    import apt
-    apt_cache = apt.Cache()
-    installed_packages = {}
-    apt_installed_packages = [pk for pk in apt_cache.keys() if apt_cache[pk].is_installed]
-    for package in apt_installed_packages:
-        ac_pkg = apt_cache[package].installed
-        package_details = dict(name=package,
-                               version=ac_pkg.version,
-                               arch=ac_pkg.architecture,
-                               source='apt')
-        if package_details['name'] not in installed_packages:
-            installed_packages[package_details['name']] = [package_details]
-        else:
-            installed_packages[package_details['name']].append(package_details)
-    return installed_packages
-
-
-def main():
-    module = AnsibleModule(  # noqa
-        argument_spec = dict(os_family=dict(required=True))
-    )
-    ans_os = module.params['os_family']
-    if ans_os in ('RedHat', 'Suse', 'openSUSE Leap'):
-        packages = rpm_package_list()
-    elif ans_os == 'Debian':
-        packages = deb_package_list()
-    else:
-        packages = None
-
-    if packages is not None:
-        results = dict(ansible_facts=dict(packages=packages))
-    else:
-        results = dict(skipped=True, msg="Unsupported Distribution")
-    module.exit_json(**results)
-
-
-main()
diff --git a/awx/plugins/library/scan_services.py b/awx/plugins/library/scan_services.py
deleted file mode 100644
index 5d8ccdbb74..0000000000
--- a/awx/plugins/library/scan_services.py
+++ /dev/null
@@ -1,190 +0,0 @@
-#!/usr/bin/env python
-
-import re
-from ansible.module_utils.basic import * # noqa
-
-DOCUMENTATION = '''
----
-module: scan_services
-short_description: Return service state information as fact data
-description:
-     - Return service state information as fact data for various service management utilities
-version_added: "1.9"
-options:
-requirements: [ ]
-author: Matthew Jones
-'''
-
-EXAMPLES = '''
-- monit: scan_services
-# Example fact output:
-# host | success >> {
-#    "ansible_facts": {
-#	"services": {
-#            "network": {
-#                    "source": "sysv",
-#                    "state": "running",
-#                    "name": "network"
-#            },
-#            "arp-ethers.service": {
-#                    "source": "systemd",
-#                    "state": "stopped",
-#                    "name": "arp-ethers.service"
-#            }
-#	}
-#   }
-'''
-
-
-class BaseService(object):
-
-    def __init__(self, module):
-        self.module = module
-        self.incomplete_warning = False
-
-
-class ServiceScanService(BaseService):
-
-    def gather_services(self):
-        services = {}
-        service_path = self.module.get_bin_path("service")
-        if service_path is None:
-            return None
-        initctl_path = self.module.get_bin_path("initctl")
-        chkconfig_path = self.module.get_bin_path("chkconfig")
-
-        # sysvinit
-        if service_path is not None and chkconfig_path is None:
-            rc, stdout, stderr = self.module.run_command("%s --status-all 2>&1 | grep -E \"\\[ (\\+|\\-) \\]\"" % service_path, use_unsafe_shell=True)
-            for line in stdout.split("\n"):
-                line_data = line.split()
-                if len(line_data) < 4:
-                    continue # Skipping because we expected more data
-                service_name = " ".join(line_data[3:])
-                if line_data[1] == "+":
-                    service_state = "running"
-                else:
-                    service_state = "stopped"
-                services[service_name] = {"name": service_name, "state": service_state, "source": "sysv"}
-
-        # Upstart
-        if initctl_path is not None and chkconfig_path is None:
-            p = re.compile(r'^\s?(?P<name>.*)\s(?P<goal>\w+)\/(?P<state>\w+)(\,\sprocess\s(?P<pid>[0-9]+))?\s*$')
-            rc, stdout, stderr = self.module.run_command("%s list" % initctl_path)
-            real_stdout = stdout.replace("\r","")
-            for line in real_stdout.split("\n"):
-                m = p.match(line)
-                if not m:
-                    continue
-                service_name = m.group('name')
-                service_goal = m.group('goal')
-                service_state = m.group('state')
-                if m.group('pid'):
-                    pid = m.group('pid')
-                else:
-                    pid = None  # NOQA
-                payload = {"name": service_name, "state": service_state, "goal": service_goal, "source": "upstart"}
-                services[service_name] = payload
-
-        # RH sysvinit
-        elif chkconfig_path is not None:
-            #print '%s --status-all | grep -E "is (running|stopped)"' % service_path
-            p = re.compile(
-                r'(?P<service>.*?)\s+[0-9]:(?P<rl0>on|off)\s+[0-9]:(?P<rl1>on|off)\s+[0-9]:(?P<rl2>on|off)\s+'
-                r'[0-9]:(?P<rl3>on|off)\s+[0-9]:(?P<rl4>on|off)\s+[0-9]:(?P<rl5>on|off)\s+[0-9]:(?P<rl6>on|off)')
-            rc, stdout, stderr = self.module.run_command('%s' % chkconfig_path, use_unsafe_shell=True)
-            # Check for special cases where stdout does not fit pattern
-            match_any = False
-            for line in stdout.split('\n'):
-                if p.match(line):
-                    match_any = True
-            if not match_any:
-                p_simple = re.compile(r'(?P<service>.*?)\s+(?P<rl0>on|off)')
-                match_any = False
-                for line in stdout.split('\n'):
-                    if p_simple.match(line):
-                        match_any = True
-                if match_any:
-                    # Try extra flags " -l --allservices" needed for SLES11
-                    rc, stdout, stderr = self.module.run_command('%s -l --allservices' % chkconfig_path, use_unsafe_shell=True)
-                elif '--list' in stderr:
-                    # Extra flag needed for RHEL5
-                    rc, stdout, stderr = self.module.run_command('%s --list' % chkconfig_path, use_unsafe_shell=True)
-            for line in stdout.split('\n'):
-                m = p.match(line)
-                if m:
-                    service_name = m.group('service')
-                    service_state = 'stopped'
-                    if m.group('rl3') == 'on':
-                        rc, stdout, stderr = self.module.run_command('%s %s status' % (service_path, service_name), use_unsafe_shell=True)
-                        service_state = rc
-                        if rc in (0,):
-                            service_state = 'running'
-                        #elif rc in (1,3):
-                        else:
-                            if 'root' in stderr or 'permission' in stderr.lower() or 'not in sudoers' in stderr.lower():
-                                self.incomplete_warning = True
-                                continue
-                            else:
-                                service_state = 'stopped'
-                    service_data = {"name": service_name, "state": service_state, "source": "sysv"}
-                    services[service_name] = service_data
-        return services
-
-
-class SystemctlScanService(BaseService):
-
-    def systemd_enabled(self):
-        # Check if init is the systemd command, using comm as cmdline could be symlink
-        try:
-            f = open('/proc/1/comm', 'r')
-        except IOError:
-            # If comm doesn't exist, old kernel, no systemd
-            return False
-        for line in f:
-            if 'systemd' in line:
-                return True
-        return False
-
-    def gather_services(self):
-        services = {}
-        if not self.systemd_enabled():
-            return None
-        systemctl_path = self.module.get_bin_path("systemctl", opt_dirs=["/usr/bin", "/usr/local/bin"])
-        if systemctl_path is None:
-            return None
-        rc, stdout, stderr = self.module.run_command("%s list-unit-files --type=service | tail -n +2 | head -n -2" % systemctl_path, use_unsafe_shell=True)
-        for line in stdout.split("\n"):
-            line_data = line.split()
-            if len(line_data) != 2:
-                continue
-            if line_data[1] == "enabled":
-                state_val = "running"
-            else:
-                state_val = "stopped"
-            services[line_data[0]] = {"name": line_data[0], "state": state_val, "source": "systemd"}
-        return services
-
-
-def main():
-    module = AnsibleModule(argument_spec = dict())  # noqa
-    service_modules = (ServiceScanService, SystemctlScanService)
-    all_services = {}
-    incomplete_warning = False
-    for svc_module in service_modules:
-        svcmod = svc_module(module)
-        svc = svcmod.gather_services()
-        if svc is not None:
-            all_services.update(svc)
-            if svcmod.incomplete_warning:
-                incomplete_warning = True
-    if len(all_services) == 0:
-        results = dict(skipped=True, msg="Failed to find any services. Sometimes this is due to insufficient privileges.")
-    else:
-        results = dict(ansible_facts=dict(services=all_services))
-        if incomplete_warning:
-            results['msg'] = "WARNING: Could not find status for all services. Sometimes this is due to insufficient privileges."
-    module.exit_json(**results)
-
-
-main()
diff --git a/awx/plugins/library/win_scan_files.ps1 b/awx/plugins/library/win_scan_files.ps1
deleted file mode 100644
index 6d114dfcc8..0000000000
--- a/awx/plugins/library/win_scan_files.ps1
+++ /dev/null
@@ -1,102 +0,0 @@
-#!powershell
-# This file is part of Ansible
-#
-# Ansible is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Ansible is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
-
-# WANT_JSON
-# POWERSHELL_COMMON
-
-$params = Parse-Args $args $true;
-
-$paths = Get-Attr $params "paths" $FALSE;
-If ($paths -eq $FALSE)
-{   
-    Fail-Json (New-Object psobject) "missing required argument: paths";
-}
-
-$get_checksum = Get-Attr $params "get_checksum" $false | ConvertTo-Bool;
-$recursive = Get-Attr $params "recursive" $false | ConvertTo-Bool;
-
-function Date_To_Timestamp($start_date, $end_date)
-{
-    If($start_date -and $end_date)
-    {
-        Write-Output (New-TimeSpan -Start $start_date -End $end_date).TotalSeconds
-    }
-}
-
-$files = @()
-
-ForEach ($path In $paths)
-{
-    "Path: " + $path
-    ForEach ($file in Get-ChildItem $path -Recurse: $recursive)
-    {
-        "File: " + $file.FullName
-        $fileinfo = New-Object psobject
-        Set-Attr $fileinfo "path" $file.FullName
-        $info = Get-Item $file.FullName;
-        $iscontainer = Get-Attr $info "PSIsContainer" $null;
-        $length = Get-Attr $info "Length" $null;
-        $extension = Get-Attr $info "Extension" $null;
-        $attributes = Get-Attr $info "Attributes" "";
-        If ($info)
-        {
-            $accesscontrol = $info.GetAccessControl();
-        }
-        Else
-        {
-            $accesscontrol = $null;
-        }
-        $owner = Get-Attr $accesscontrol "Owner" $null;
-        $creationtime = Get-Attr $info "CreationTime" $null;
-        $lastaccesstime = Get-Attr $info "LastAccessTime" $null;
-        $lastwritetime = Get-Attr $info "LastWriteTime" $null;
-
-        $epoch_date = Get-Date -Date "01/01/1970"
-        If ($iscontainer)
-        {
-            Set-Attr $fileinfo "isdir" $TRUE;
-        }
-        Else
-        {
-            Set-Attr $fileinfo "isdir" $FALSE;
-            Set-Attr $fileinfo "size" $length;
-        }
-        Set-Attr $fileinfo "extension" $extension;
-        Set-Attr $fileinfo "attributes" $attributes.ToString();
-        # Set-Attr $fileinfo "owner" $getaccesscontrol.Owner;
-        # Set-Attr $fileinfo "owner" $info.GetAccessControl().Owner;
-        Set-Attr $fileinfo "owner" $owner;
-        Set-Attr $fileinfo "creationtime" (Date_To_Timestamp $epoch_date $creationtime);
-        Set-Attr $fileinfo "lastaccesstime" (Date_To_Timestamp $epoch_date $lastaccesstime);
-        Set-Attr $fileinfo "lastwritetime" (Date_To_Timestamp $epoch_date $lastwritetime);
-
-        If (($get_checksum) -and -not $fileinfo.isdir)
-        {
-            $hash = Get-FileChecksum($file.FullName);
-            Set-Attr $fileinfo "checksum" $hash;
-        }
-
-        $files += $fileinfo
-    }
-}
-
-$result = New-Object psobject @{
-    ansible_facts = New-Object psobject @{
-        files = $files
-    }
-}
-
-Exit-Json $result;
diff --git a/awx/plugins/library/win_scan_packages.ps1 b/awx/plugins/library/win_scan_packages.ps1
deleted file mode 100644
index 2ab3fdbec6..0000000000
--- a/awx/plugins/library/win_scan_packages.ps1
+++ /dev/null
@@ -1,66 +0,0 @@
-#!powershell
-# This file is part of Ansible
-#
-# Ansible is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Ansible is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
-
-# WANT_JSON
-# POWERSHELL_COMMON
-
-$uninstall_native_path = "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall"
-$uninstall_wow6432_path = "HKLM:\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall"
-
-if ([System.IntPtr]::Size -eq 4) {
-
-    # This is a 32-bit Windows system, so we only check for 32-bit programs, which will be
-    # at the native registry location.
-
-    [PSObject []]$packages = Get-ChildItem -Path $uninstall_native_path |
-        Get-ItemProperty |
-        Select-Object -Property @{Name="name"; Expression={$_."DisplayName"}},
-            @{Name="version"; Expression={$_."DisplayVersion"}},
-            @{Name="publisher"; Expression={$_."Publisher"}},
-            @{Name="arch"; Expression={ "Win32" }} |
-        Where-Object { $_.name }
-
-} else {
-
-    # This is a 64-bit Windows system, so we check for 64-bit programs in the native
-    # registry location, and also for 32-bit programs under Wow6432Node.
-
-    [PSObject []]$packages = Get-ChildItem -Path $uninstall_native_path |
-        Get-ItemProperty |
-        Select-Object -Property @{Name="name"; Expression={$_."DisplayName"}},
-            @{Name="version"; Expression={$_."DisplayVersion"}},
-            @{Name="publisher"; Expression={$_."Publisher"}},
-            @{Name="arch"; Expression={ "Win64" }} |
-        Where-Object { $_.name }
-
-    $packages += Get-ChildItem -Path $uninstall_wow6432_path |
-        Get-ItemProperty |
-        Select-Object -Property @{Name="name"; Expression={$_."DisplayName"}},
-            @{Name="version"; Expression={$_."DisplayVersion"}},
-            @{Name="publisher"; Expression={$_."Publisher"}},
-            @{Name="arch"; Expression={ "Win32" }} |
-        Where-Object { $_.name }
-
-}
-
-$result = New-Object psobject @{
-    ansible_facts = New-Object psobject @{
-        packages = $packages
-    }
-    changed = $false
-}
-
-Exit-Json $result;
diff --git a/awx/plugins/library/win_scan_services.ps1 b/awx/plugins/library/win_scan_services.ps1
deleted file mode 100644
index 3de8ac4c9b..0000000000
--- a/awx/plugins/library/win_scan_services.ps1
+++ /dev/null
@@ -1,30 +0,0 @@
-#!powershell
-# This file is part of Ansible
-#
-# Ansible is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Ansible is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
-
-# WANT_JSON
-# POWERSHELL_COMMON
-
-$result = New-Object psobject @{
-    ansible_facts = New-Object psobject @{
-        services = Get-Service |
-            Select-Object -Property @{Name="name"; Expression={$_."DisplayName"}},
-                @{Name="win_svc_name"; Expression={$_."Name"}},
-                @{Name="state"; Expression={$_."Status".ToString().ToLower()}}
-    }
-    changed = $false
-}
-
-Exit-Json $result;

From 77c211dabe246ad5bee978c9a593b15e310031b8 Mon Sep 17 00:00:00 2001
From: mabashian <mabashia@redhat.com>
Date: Fri, 4 Sep 2020 11:22:34 -0400
Subject: [PATCH 29/69] Adds id's to credential form buttons

---
 awx/ui_next/src/screens/Credential/shared/CredentialForm.jsx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/awx/ui_next/src/screens/Credential/shared/CredentialForm.jsx b/awx/ui_next/src/screens/Credential/shared/CredentialForm.jsx
index 5a76a76271..62193584d3 100644
--- a/awx/ui_next/src/screens/Credential/shared/CredentialForm.jsx
+++ b/awx/ui_next/src/screens/Credential/shared/CredentialForm.jsx
@@ -224,6 +224,7 @@ function CredentialForm({
               <FormFullWidthLayout>
                 <ActionGroup>
                   <Button
+                    id="credential-form-save-button"
                     aria-label={i18n._(t`Save`)}
                     variant="primary"
                     type="button"
@@ -235,6 +236,7 @@ function CredentialForm({
                     credentialTypes[formik.values.credential_type]?.kind ===
                       'external' && (
                       <Button
+                        id="credential-form-test-button"
                         aria-label={i18n._(t`Test`)}
                         variant="secondary"
                         type="button"
@@ -245,6 +247,7 @@ function CredentialForm({
                       </Button>
                     )}
                   <Button
+                    id="credential-form-cancel-button"
                     aria-label={i18n._(t`Cancel`)}
                     variant="secondary"
                     type="button"

From 4133ec974bc793c8b769542c68b13ff6a2dfed42 Mon Sep 17 00:00:00 2001
From: beeankha <bstohrer@redhat.com>
Date: Fri, 4 Sep 2020 10:39:25 -0400
Subject: [PATCH 30/69] Follow same pattern as project update module, add task
 to integration test

---
 .../modules/tower_inventory_source_update.py  | 27 ++++++++++---------
 .../tasks/main.yml                            | 11 ++++++++
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/awx_collection/plugins/modules/tower_inventory_source_update.py b/awx_collection/plugins/modules/tower_inventory_source_update.py
index 6f9cdf6de1..8579126dd3 100644
--- a/awx_collection/plugins/modules/tower_inventory_source_update.py
+++ b/awx_collection/plugins/modules/tower_inventory_source_update.py
@@ -135,19 +135,22 @@ def main():
     if inventory_source_update_results['status_code'] != 202:
         module.fail_json(msg="Failed to update inventory source, see response for details", **{'response': inventory_source_update_results})
 
-    if wait:
-        inventory_source_update_results = module.wait_on_url(
-            url=inventory_source_update_results['json']['url'],
-            object_name=inventory_object,
-            object_type='inventory_update',
-            timeout=timeout, interval=interval
-        )
+    module.json_output['changed'] = True
+    module.json_output['id'] = inventory_source_update_results['json']['id']
+    module.json_output['status'] = inventory_source_update_results['json']['status']
 
-    module.exit_json(**{
-        'changed': True,
-        'id': inventory_source_update_results['json']['id'],
-        'status': inventory_source_update_results['json']['status'],
-    })
+    if not wait:
+        module.exit_json(**module.json_output)
+
+    # Invoke wait function
+    module.wait_on_url(
+        url=inventory_source_update_results['json']['url'],
+        object_name=inventory_object,
+        object_type='inventory_update',
+        timeout=timeout, interval=interval
+    )
+
+    module.exit_json(**module.json_output)
 
 
 if __name__ == '__main__':
diff --git a/awx_collection/tests/integration/targets/tower_inventory_source_update/tasks/main.yml b/awx_collection/tests/integration/targets/tower_inventory_source_update/tasks/main.yml
index 01b29a0cf0..b151db90ba 100644
--- a/awx_collection/tests/integration/targets/tower_inventory_source_update/tasks/main.yml
+++ b/awx_collection/tests/integration/targets/tower_inventory_source_update/tasks/main.yml
@@ -9,6 +9,7 @@
     inv_name: "AWX-Collection-tests-tower_inventory_source_update-inv-{{ test_id }}"
     inv_source1: "AWX-Collection-tests-tower_inventory_source_update-source1-{{ test_id }}"
     inv_source2: "AWX-Collection-tests-tower_inventory_source_update-source2-{{ test_id }}"
+    inv_source3: "AWX-Collection-tests-tower_inventory_source_update-source3-{{ test_id }}"
     org_name: "AWX-Collection-tests-tower_inventory_source_update-org-{{ test_id }}"
 
 
@@ -60,6 +61,16 @@
         organization: Default
         inventory: "{{ inv_name }}"
 
+    - name: Create Yet Another Inventory Source (one more to make lookup plugin find multiple inventory sources)
+      tower_inventory_source:
+        name: "{{ inv_source3 }}"
+        source: scm
+        source_project: "{{ project_name }}"
+        source_path: inventories/create_100_hosts.ini
+        description: Source for Test inventory
+        organization: Default
+        inventory: "{{ inv_name }}"
+
     - name: Test Inventory Source Update
       tower_inventory_source_update:
         inventory: "{{ inv_name }}"

From d4b2e1998ee88193bd9ccf782a679fac352a4c28 Mon Sep 17 00:00:00 2001
From: nixocio <nixocio@gmail.com>
Date: Fri, 4 Sep 2020 16:21:32 -0400
Subject: [PATCH 31/69] List jobs for container groups

Add list of jobs related to container groups.

See: https://github.com/ansible/awx/issues/8091
---
 .../src/screens/InstanceGroup/ContainerGroup.jsx   |  7 +++++--
 .../src/screens/InstanceGroup/Jobs/Jobs.jsx        | 14 --------------
 .../src/screens/InstanceGroup/Jobs/index.js        |  1 -
 3 files changed, 5 insertions(+), 17 deletions(-)
 delete mode 100644 awx/ui_next/src/screens/InstanceGroup/Jobs/Jobs.jsx
 delete mode 100644 awx/ui_next/src/screens/InstanceGroup/Jobs/index.js

diff --git a/awx/ui_next/src/screens/InstanceGroup/ContainerGroup.jsx b/awx/ui_next/src/screens/InstanceGroup/ContainerGroup.jsx
index 265c27c379..db62e9506e 100644
--- a/awx/ui_next/src/screens/InstanceGroup/ContainerGroup.jsx
+++ b/awx/ui_next/src/screens/InstanceGroup/ContainerGroup.jsx
@@ -17,10 +17,10 @@ import { InstanceGroupsAPI } from '../../api';
 import RoutedTabs from '../../components/RoutedTabs';
 import ContentError from '../../components/ContentError';
 import ContentLoading from '../../components/ContentLoading';
+import JobList from '../../components/JobList';
 
 import ContainerGroupDetails from './ContainerGroupDetails';
 import ContainerGroupEdit from './ContainerGroupEdit';
-import Jobs from './Jobs';
 
 function ContainerGroup({ i18n, setBreadcrumb }) {
   const { id } = useParams();
@@ -117,7 +117,10 @@ function ContainerGroup({ i18n, setBreadcrumb }) {
                   <ContainerGroupDetails />
                 </Route>
                 <Route path="/instance_groups/container_group/:id/jobs">
-                  <Jobs />
+                  <JobList
+                    showTypeColumn
+                    defaultParams={{ instance_group: instanceGroup.id }}
+                  />
                 </Route>
               </>
             )}
diff --git a/awx/ui_next/src/screens/InstanceGroup/Jobs/Jobs.jsx b/awx/ui_next/src/screens/InstanceGroup/Jobs/Jobs.jsx
deleted file mode 100644
index aad6a4061d..0000000000
--- a/awx/ui_next/src/screens/InstanceGroup/Jobs/Jobs.jsx
+++ /dev/null
@@ -1,14 +0,0 @@
-import React from 'react';
-import { Card, PageSection } from '@patternfly/react-core';
-
-function Jobs() {
-  return (
-    <PageSection>
-      <Card>
-        <div>Jobs</div>
-      </Card>
-    </PageSection>
-  );
-}
-
-export default Jobs;
diff --git a/awx/ui_next/src/screens/InstanceGroup/Jobs/index.js b/awx/ui_next/src/screens/InstanceGroup/Jobs/index.js
deleted file mode 100644
index 9fc254c85c..0000000000
--- a/awx/ui_next/src/screens/InstanceGroup/Jobs/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './Jobs';

From 09178dd5f21923999b494d6604d97c552730fb52 Mon Sep 17 00:00:00 2001
From: Keith Grant <keithjgrant@redhat.com>
Date: Mon, 17 Aug 2020 14:16:18 -0700
Subject: [PATCH 32/69] flush out notification form and type subform

---
 awx/ui_next/src/components/Lookup/index.js    |   1 +
 .../Credential/shared/CredentialForm.jsx      |   4 +-
 .../NotificationTemplate.jsx                  |  23 +-
 .../NotificationTemplateDetail.jsx            |   2 +-
 .../NotificationTemplateEdit.jsx              |  20 +-
 .../shared/NotificationTemplateForm.jsx       | 147 ++++-
 .../shared/TypeInputsSubForm.jsx              | 528 ++++++++++++++++++
 awx/ui_next/src/types.js                      |  24 +
 awx/ui_next/src/util/validators.jsx           |  15 +
 awx/ui_next/src/util/validators.test.js       |  21 +
 10 files changed, 763 insertions(+), 22 deletions(-)
 create mode 100644 awx/ui_next/src/screens/NotificationTemplate/shared/TypeInputsSubForm.jsx

diff --git a/awx/ui_next/src/components/Lookup/index.js b/awx/ui_next/src/components/Lookup/index.js
index 2b9b147941..a2fcfbe570 100644
--- a/awx/ui_next/src/components/Lookup/index.js
+++ b/awx/ui_next/src/components/Lookup/index.js
@@ -6,3 +6,4 @@ export { default as MultiCredentialsLookup } from './MultiCredentialsLookup';
 export { default as CredentialLookup } from './CredentialLookup';
 export { default as ApplicationLookup } from './ApplicationLookup';
 export { default as HostFilterLookup } from './HostFilterLookup';
+export { default as OrganizationLookup } from './OrganizationLookup';
diff --git a/awx/ui_next/src/screens/Credential/shared/CredentialForm.jsx b/awx/ui_next/src/screens/Credential/shared/CredentialForm.jsx
index 62193584d3..e8ee83b1dd 100644
--- a/awx/ui_next/src/screens/Credential/shared/CredentialForm.jsx
+++ b/awx/ui_next/src/screens/Credential/shared/CredentialForm.jsx
@@ -104,7 +104,7 @@ function CredentialFormFields({
         error={orgMeta.error}
       />
       <FormGroup
-        fieldId="credential-credentialType"
+        fieldId="credential-Type"
         helperTextInvalid={credTypeMeta.error}
         isRequired
         validated={
@@ -114,7 +114,7 @@ function CredentialFormFields({
       >
         <AnsibleSelect
           {...credTypeField}
-          id="credential_type"
+          id="credential-type"
           data={[
             {
               value: '',
diff --git a/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplate.jsx b/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplate.jsx
index 7b8516f787..5cebeef78c 100644
--- a/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplate.jsx
+++ b/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplate.jsx
@@ -24,17 +24,23 @@ function NotificationTemplate({ setBreadcrumb, i18n }) {
   const match = useRouteMatch();
   const location = useLocation();
   const {
-    result: template,
+    result: { template, defaultMessages },
     isLoading,
     error,
     request: fetchTemplate,
   } = useRequest(
     useCallback(async () => {
-      const { data } = await NotificationTemplatesAPI.readDetail(templateId);
-      setBreadcrumb(data);
-      return data;
+      const [detail, options] = await Promise.all([
+        NotificationTemplatesAPI.readDetail(templateId),
+        NotificationTemplatesAPI.readOptions(),
+      ]);
+      setBreadcrumb(detail.data);
+      return {
+        template: detail.data,
+        defaultMessages: options.data.actions.POST.messages,
+      };
     }, [templateId, setBreadcrumb]),
-    null
+    { template: null, defaultMessages: null }
   );
 
   useEffect(() => {
@@ -88,11 +94,18 @@ function NotificationTemplate({ setBreadcrumb, i18n }) {
             to="/notification_templates/:id/details"
             exact
           />
+          {/* <Route path="/notification_templates/add">
+            <NotificationTemplateAdd
+              defaultMessages={defaultMessages}
+              isLoading={isLoading}
+            />
+          </Route> */}
           {template && (
             <>
               <Route path="/notification_templates/:id/edit">
                 <NotificationTemplateEdit
                   template={template}
+                  defaultMessages={defaultMessages}
                   isLoading={isLoading}
                 />
               </Route>
diff --git a/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplateDetail/NotificationTemplateDetail.jsx b/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplateDetail/NotificationTemplateDetail.jsx
index 951ba5bd8b..a70f691e02 100644
--- a/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplateDetail/NotificationTemplateDetail.jsx
+++ b/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplateDetail/NotificationTemplateDetail.jsx
@@ -234,7 +234,7 @@ function NotificationTemplateDetail({ i18n, template }) {
             <Detail
               label={i18n._(t`Username`)}
               value={configuration.rocketchat_username}
-              dataCy="nt-detail-pagerduty-rocketchat-username"
+              dataCy="nt-detail-rocketchat-username"
             />
             <Detail
               label={i18n._(t`Icon URL`)}
diff --git a/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplateEdit/NotificationTemplateEdit.jsx b/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplateEdit/NotificationTemplateEdit.jsx
index b089b6b89f..e57a01fd4e 100644
--- a/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplateEdit/NotificationTemplateEdit.jsx
+++ b/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplateEdit/NotificationTemplateEdit.jsx
@@ -7,7 +7,7 @@ import { Config } from '../../../contexts/Config';
 
 import NotificationTemplateForm from '../shared/NotificationTemplateForm';
 
-function NotificationTemplateEdit({ template }) {
+function NotificationTemplateEdit({ template, defaultMessages }) {
   const detailsUrl = `/notification_templates/${template.id}/details`;
   const history = useHistory();
   const [formError, setFormError] = useState(null);
@@ -41,17 +41,13 @@ function NotificationTemplateEdit({ template }) {
 
   return (
     <CardBody>
-      <Config>
-        {({ me }) => (
-          <NotificationTemplateForm
-            template={template}
-            onSubmit={handleSubmit}
-            onCancel={handleCancel}
-            me={me || {}}
-            submitError={formError}
-          />
-        )}
-      </Config>
+      <NotificationTemplateForm
+        template={template}
+        defaultMessages={defaultMessages}
+        onSubmit={handleSubmit}
+        onCancel={handleCancel}
+        submitError={formError}
+      />
     </CardBody>
   );
 }
diff --git a/awx/ui_next/src/screens/NotificationTemplate/shared/NotificationTemplateForm.jsx b/awx/ui_next/src/screens/NotificationTemplate/shared/NotificationTemplateForm.jsx
index c08caaa3e5..078c2aac6b 100644
--- a/awx/ui_next/src/screens/NotificationTemplate/shared/NotificationTemplateForm.jsx
+++ b/awx/ui_next/src/screens/NotificationTemplate/shared/NotificationTemplateForm.jsx
@@ -1,3 +1,146 @@
-export default function NotificationTemplateForm() {
-  //
+import React, { useContext, useEffect, useState } from 'react';
+import { shape, func } from 'prop-types';
+import { Formik, useField } from 'formik';
+import { withI18n } from '@lingui/react';
+import { t } from '@lingui/macro';
+import { Form, FormGroup } from '@patternfly/react-core';
+
+import { OrganizationsAPI } from '../../../api';
+import { ConfigContext } from '../../../contexts/Config';
+import AnsibleSelect from '../../../components/AnsibleSelect';
+import ContentError from '../../../components/ContentError';
+import ContentLoading from '../../../components/ContentLoading';
+import FormField, { FormSubmitError } from '../../../components/FormField';
+import FormActionGroup from '../../../components/FormActionGroup/FormActionGroup';
+import { OrganizationLookup } from '../../../components/Lookup';
+import { getAddedAndRemoved } from '../../../util/lists';
+import { required, minMaxValue } from '../../../util/validators';
+import { FormColumnLayout } from '../../../components/FormLayout';
+import TypeInputsSubForm from './TypeInputsSubForm';
+import { NotificationTemplate } from '../../../types';
+
+function NotificationTemplateFormFields({ i18n, defaultMessages }) {
+  const [orgField, orgMeta, orgHelpers] = useField('organization');
+  const [typeField, typeMeta, typeHelpers] = useField({
+    name: 'notification_type',
+    validate: required(i18n._(t`Select a value for this field`), i18n),
+  });
+
+  return (
+    <>
+      <FormField
+        id="notification-name"
+        name="name"
+        type="text"
+        label={i18n._(t`Name`)}
+        validate={required(null, i18n)}
+        isRequired
+      />
+      <FormField
+        id="notification-description"
+        name="description"
+        type="text"
+        label={i18n._(t`Description`)}
+      />
+      <OrganizationLookup
+        helperTextInvalid={orgMeta.error}
+        isValid={!orgMeta.touched || !orgMeta.error}
+        onBlur={() => orgHelpers.setTouched()}
+        onChange={value => {
+          orgHelpers.setValue(value);
+        }}
+        value={orgField.value}
+        touched={orgMeta.touched}
+        error={orgMeta.error}
+        required
+      />
+      <FormGroup
+        fieldId="notification-type"
+        helperTextInvalid={typeMeta.error}
+        isRequired
+        validated={!typeMeta.touched || typeMeta.error ? 'default' : 'error'}
+        label={i18n._(t`Type`)}
+      >
+        <AnsibleSelect
+          {...typeField}
+          id="notification-type"
+          data={[
+            {
+              value: '',
+              key: 'none',
+              label: i18n._(t`Choose a Notification Type`),
+              isDisabled: true,
+            },
+            { value: 'email', key: 'email', label: i18n._(t`E-mail`) },
+            { value: 'grafana', key: 'grafana', label: 'Grafana' },
+            { value: 'irc', key: 'irc', label: 'IRC' },
+            { value: 'mattermost', key: 'mattermost', label: 'Mattermost' },
+            { value: 'pagerduty', key: 'pagerduty', label: 'Pagerduty' },
+            { value: 'rocketchat', key: 'rocketchat', label: 'Rocket.Chat' },
+            { value: 'slack', key: 'slack', label: 'Slack' },
+            { value: 'twilio', key: 'twilio', label: 'Twilio' },
+            { value: 'webhook', key: 'webhook', label: 'Webhook' },
+          ]}
+        />
+      </FormGroup>
+      {typeField.value && <TypeInputsSubForm type={typeField.value} />}
+    </>
+  );
 }
+
+function NotificationTemplateForm({
+  template,
+  defaultMessages,
+  onSubmit,
+  onCancel,
+  submitError,
+  i18n,
+}) {
+  const handleSubmit = values => {
+    console.log(values);
+    // onSubmit(values);
+  };
+
+  return (
+    <Formik
+      initialValues={{
+        name: template.name,
+        description: template.description,
+        notification_type: template.notification_type,
+      }}
+      onSubmit={handleSubmit}
+    >
+      {formik => (
+        <Form autoComplete="off" onSubmit={formik.handleSubmit}>
+          <FormColumnLayout>
+            <NotificationTemplateFormFields i18n={i18n} />
+            <FormSubmitError error={submitError} />
+            <FormActionGroup
+              onCancel={onCancel}
+              onSubmit={formik.handleSubmit}
+            />
+          </FormColumnLayout>
+        </Form>
+      )}
+    </Formik>
+  );
+}
+
+NotificationTemplateForm.propTypes = {
+  template: NotificationTemplate,
+  defaultMessages: shape().isRequired,
+  onSubmit: func.isRequired,
+  onCancel: func.isRequired,
+  submitError: shape(),
+};
+
+NotificationTemplateForm.defaultProps = {
+  template: {
+    name: '',
+    description: '',
+    notification_type: '',
+  },
+  submitError: null,
+};
+
+export default withI18n()(NotificationTemplateForm);
diff --git a/awx/ui_next/src/screens/NotificationTemplate/shared/TypeInputsSubForm.jsx b/awx/ui_next/src/screens/NotificationTemplate/shared/TypeInputsSubForm.jsx
new file mode 100644
index 0000000000..1ed9eb2724
--- /dev/null
+++ b/awx/ui_next/src/screens/NotificationTemplate/shared/TypeInputsSubForm.jsx
@@ -0,0 +1,528 @@
+import React from 'react';
+import { withI18n } from '@lingui/react';
+import { t } from '@lingui/macro';
+import { useField } from 'formik';
+import { FormGroup, Title } from '@patternfly/react-core';
+import {
+  FormCheckboxLayout,
+  FormColumnLayout,
+  FormFullWidthLayout,
+  SubFormLayout,
+} from '../../../components/FormLayout';
+import FormField, {
+  PasswordField,
+  CheckboxField,
+  FieldTooltip,
+} from '../../../components/FormField';
+import AnsibleSelect from '../../../components/AnsibleSelect';
+import CodeMirrorInput from '../../../components/CodeMirrorInput';
+import {
+  combine,
+  required,
+  requiredEmail,
+  url,
+} from '../../../util/validators';
+import { NotificationType } from '../../../types';
+
+const TypeFields = {
+  email: EmailFields,
+  grafana: GrafanaFields,
+  irc: IRCFields,
+  mattermost: MattermostFields,
+  pagerduty: PagerdutyFields,
+  rocketchat: RocketChatFields,
+  slack: SlackFields,
+  twilio: TwilioFields,
+  webhook: WebhookFields,
+};
+
+function TypeInputsSubForm({ type, i18n }) {
+  const Fields = TypeFields[type];
+  return (
+    <SubFormLayout>
+      <Title size="md" headingLevel="h4">
+        {i18n._(t`Type Details`)}
+      </Title>
+      <FormColumnLayout>
+        <Fields i18n={i18n} />
+      </FormColumnLayout>
+    </SubFormLayout>
+  );
+}
+TypeInputsSubForm.propTypes = {
+  type: NotificationType.isRequired,
+};
+
+export default withI18n()(TypeInputsSubForm);
+
+function EmailFields({ i18n }) {
+  const [optionsField, optionsMeta] = useField({
+    name: 'emailOptions',
+    validate: required(i18n._(t`Select a value for this field`), i18n),
+  });
+  return (
+    <>
+      <FormField
+        id="email-username"
+        label={i18n._(t`Username`)}
+        name="notification_configuration.username"
+        type="text"
+      />
+      <PasswordField
+        id="email-password"
+        label={i18n._(t`Password`)}
+        name="notification_configuration.password"
+      />
+      <FormField
+        id="email-host"
+        label={i18n._(t`Host`)}
+        name="notification_configuration.host"
+        type="text"
+        validate={required(null, i18n)}
+        isRequired
+      />
+      <FormField
+        id="email-recipients"
+        label={i18n._(t`Recipient list`)}
+        name="notification_configuration.recipients"
+        type="textarea"
+        validate={required(null, i18n)}
+        isRequired
+        rows="3"
+        tooltip={i18n._(t`Enter one email address per line to create a recipient
+          list for this type of notification.`)}
+      />
+      <FormField
+        id="email-sender"
+        label={i18n._(t`Sender e-mail`)}
+        name="notification_configuration.sender"
+        type="text"
+        validate={requiredEmail(i18n)}
+        isRequired
+      />
+      <FormField
+        id="email-port"
+        label={i18n._(t`Port`)}
+        name="notification_configuration.port"
+        type="number"
+        validate={required(null, i18n)}
+        isRequired
+        min="0"
+      />
+      <FormField
+        id="email-timeout"
+        label={i18n._(t`Timeout`)}
+        name="notification_configuration.timeout"
+        type="number"
+        validate={required(null, i18n)}
+        isRequired
+        min="1"
+        max="120"
+        tooltip={i18n._(t`The amount of time (in seconds) before the email
+          notification stops trying to reach the host and times out. Ranges
+          from 1 to 120 seconds.`)}
+      />
+      <FormGroup
+        fieldId="email-options"
+        helperTextInvalid={optionsMeta.error}
+        isRequired
+        validated={
+          !optionsMeta.touched || !optionsMeta.error ? 'default' : 'error'
+        }
+        label={i18n._(t`E-mail options`)}
+      >
+        <AnsibleSelect
+          {...optionsField}
+          id="email-options"
+          data={[
+            {
+              value: '',
+              key: '',
+              label: i18n._(t`Choose an email option`),
+              isDisabled: true,
+            },
+            { value: 'tls', key: 'tls', label: i18n._(t`Use TLS`) },
+            { value: 'ssl', key: 'ssl', label: i18n._(t`Use SSL`) },
+          ]}
+        />
+      </FormGroup>
+    </>
+  );
+}
+
+function GrafanaFields({ i18n }) {
+  return (
+    <>
+      <FormField
+        id="grafana-url"
+        label={i18n._(t`Grafana URL`)}
+        name="notification_configuration.grafana_url"
+        type="text"
+        validate={required(null, i18n)}
+        isRequired
+        tooltip={i18n._(t`The base URL of the Grafana server - the
+        /api/annotations endpoint will be added automatically to the base
+        Grafana URL.`)}
+      />
+      <PasswordField
+        id="grafana-key"
+        label={i18n._(t`Grafana API key`)}
+        name="notification_configuration.grafana_key"
+        validate={required(null, i18n)}
+        isRequired
+      />
+      <FormField
+        id="grafana-dashboard-id"
+        label={i18n._(t`ID of the dashboard (optional)`)}
+        name="notification_configuration.dashboardId"
+        type="text"
+      />
+      <FormField
+        id="grafana-panel-id"
+        label={i18n._(t`ID of the panel (optional)`)}
+        name="notification_configuration.panelId"
+        type="text"
+      />
+      <FormField
+        id="grafana-tags"
+        label={i18n._(t`Tags for the annotation (optional)`)}
+        name="notification_configuration.annotation_tags"
+        type="textarea"
+        rows="3"
+        tooltip={i18n._(t`Enter one Annotation Tag per line, without commas.`)}
+      />
+      <CheckboxField
+        id="grafana-ssl"
+        label={i18n._(t`Disable SSL verification`)}
+        name="notification_configuration.grafana_no_verify_ssl"
+      />
+    </>
+  );
+}
+
+function IRCFields({ i18n }) {
+  return (
+    <>
+      <PasswordField
+        id="irc-password"
+        label={i18n._(t`IRC server password`)}
+        name="notification_configuration.password"
+      />
+      <FormField
+        id="irc-port"
+        label={i18n._(t`IRC server port`)}
+        name="notification_configuration.port"
+        type="number"
+        validate={required(null, i18n)}
+        isRequired
+        min="0"
+      />
+      <FormField
+        id="irc-server"
+        label={i18n._(t`IRC server address`)}
+        name="notification_configuration.server"
+        type="text"
+        validate={required(null, i18n)}
+        isRequired
+      />
+      <FormField
+        id="irc-nickname"
+        label={i18n._(t`IRC nick`)}
+        name="notification_configuration.nickname"
+        type="text"
+        validate={required(null, i18n)}
+        isRequired
+      />
+      <FormField
+        id="irc-targets"
+        label={i18n._(t`Destination channels or users`)}
+        name="notification_configuration.targets"
+        type="textarea"
+        validate={required(null, i18n)}
+        isRequired
+        tooltip={i18n._(t`Enter one IRC channel or username per line. The pound
+          symbol (#) for channels, and the at (@) symbol for users, are not
+          required.`)}
+      />
+      <CheckboxField
+        id="grafana-ssl"
+        label={i18n._(t`Disable SSL verification`)}
+        name="notification_configuration.use_ssl"
+      />
+    </>
+  );
+}
+
+function MattermostFields({ i18n }) {
+  return (
+    <>
+      <FormField
+        id="mattermost-url"
+        label={i18n._(t`Target URL`)}
+        name="notification_configuration.mattermost_url"
+        type="text"
+        validate={combine([required(null, i18n), url(i18n)])}
+        isRequired
+      />
+      <FormField
+        id="mattermost-username"
+        label={i18n._(t`Username`)}
+        name="notification_configuration.mattermost_username"
+        type="text"
+      />
+      <FormField
+        id="mattermost-channel"
+        label={i18n._(t`Channel`)}
+        name="notification_configuration.mattermost_channel"
+        type="text"
+      />
+      <FormField
+        id="mattermost-icon"
+        label={i18n._(t`Icon URL`)}
+        name="notification_configuration.mattermost_icon_url"
+        type="text"
+        validate={url(i18n)}
+      />
+      <CheckboxField
+        id="mattermost-ssl"
+        label={i18n._(t`Disable SSL verification`)}
+        name="notification_configuration.mattermost_no_verify_ssl"
+      />
+    </>
+  );
+}
+
+function PagerdutyFields({ i18n }) {
+  return (
+    <>
+      <PasswordField
+        id="pagerduty-token"
+        label={i18n._(t`API Token`)}
+        name="notification_configuration.token"
+        validate={required(null, i18n)}
+        isRequired
+      />
+      <FormField
+        id="pagerduty-subdomain"
+        label={i18n._(t`Pagerduty subdomain`)}
+        name="notification_configuration.subdomain"
+        type="text"
+        validate={required(i18n)}
+        isRequired
+      />
+      <FormField
+        id="pagerduty-service-key"
+        label={i18n._(t`API service/integration key`)}
+        name="notification_configuration.service_key"
+        type="text"
+        validate={required(i18n)}
+        isRequired
+      />
+      <FormField
+        id="pagerduty-identifier"
+        label={i18n._(t`Client identifier`)}
+        name="notification_configuration.client_name"
+        type="text"
+        validate={required(i18n)}
+        isRequired
+      />
+    </>
+  );
+}
+
+function RocketChatFields({ i18n }) {
+  return (
+    <>
+      <FormField
+        id="rocketchat-url"
+        label={i18n._(t`Target URL`)}
+        name="notification_configuration.rocketchat_url"
+        type="text"
+        validate={combine([required(null, i18n), url(i18n)])}
+        isRequired
+      />
+      <FormField
+        id="rocketchat-username"
+        label={i18n._(t`Username`)}
+        name="notification_configuration.rocketchat_username"
+        type="text"
+      />
+      <FormField
+        id="rocketchat-icon-url"
+        label={i18n._(t`Icon URL`)}
+        name="notification_configuration.rocketchat_icon_url"
+        type="text"
+        validate={url(i18n)}
+      />
+      <CheckboxField
+        id="rocketchat-ssl"
+        label={i18n._(t`Disable SSL verification`)}
+        name="notification_configuration.rocketchat_no_verify_ssl"
+      />
+    </>
+  );
+}
+
+function SlackFields({ i18n }) {
+  return (
+    <>
+      <FormField
+        id="slack-channels"
+        label={i18n._(t`Destination channels`)}
+        name="notification_configuration.channels"
+        type="textarea"
+        validate={required(null, i18n)}
+        isRequired
+        tooltip={i18n._(t`Enter one Slack channel per line. The pound symbol (#)
+          is required for channels.`)}
+      />
+      <PasswordField
+        id="slack-token"
+        label={i18n._(t`Token`)}
+        name="notification_configuration.token"
+        validate={required(null, i18n)}
+        isRequired
+      />
+      <FormField
+        id="slack-color"
+        label={i18n._(t`Notification color`)}
+        name="notification_configuration.hex_color"
+        type="text"
+        tooltip={i18n._(t`Specify a notification color. Acceptable colors are hex
+          color code (example: #3af or #789abc).`)}
+      />
+    </>
+  );
+}
+
+function TwilioFields({ i18n }) {
+  return (
+    <>
+      <PasswordField
+        id="twilio-token"
+        label={i18n._(t`Account token`)}
+        name="notification_configuration.account_token"
+        validate={required(null, i18n)}
+        isRequired
+      />
+      <FormField
+        id="twilio-from-phone"
+        label={i18n._(t`Source phone number`)}
+        name="notification_configuration.from_number"
+        type="text"
+        validate={required(null, i18n)}
+        isRequired
+        tooltip={i18n._(t`Enter the number associated with the "Messaging
+          Service" in Twilio in the format +18005550199.`)}
+      />
+      <FormField
+        id="twilio-destination-numbers"
+        label={i18n._(t`Destination SMS number(s)`)}
+        name="notification_configuration.account_token"
+        type="textarea"
+        validate={required(null, i18n)}
+        isRequired
+        tooltip={i18n._(t`Enter one phone number per line to specify where to
+          route SMS messages.`)}
+      />
+      <FormField
+        id="twilio-account-sid"
+        label={i18n._(t`Account SID`)}
+        name="notification_configuration.account_sid"
+        type="text"
+        validate={required(null, i18n)}
+        isRequired
+      />
+    </>
+  );
+}
+
+function WebhookFields({ i18n }) {
+  const [methodField, methodMeta] = useField({
+    name: 'notification_configuration.http_method',
+    validate: required(i18n._(t`Select a value for this field`), i18n),
+  });
+  const [headersField, headersMeta, headersHelpers] = useField({
+    name: 'notification_configuration.headers',
+    validate: required(i18n._(t`Select enter a value for this field`), i18n),
+  });
+  return (
+    <>
+      <FormField
+        id="webhook-username"
+        label={i18n._(t`Username`)}
+        name="notification_configuration.username"
+        type="text"
+      />
+      <PasswordField
+        id="webhook-password"
+        label={i18n._(t`Basic auth password`)}
+        name="notification_configuration.password"
+      />
+      <FormField
+        id="webhook-url"
+        label={i18n._(t`Target URL`)}
+        name="notification_configuration.url"
+        type="text"
+        validate={combine([required(null, i18n), url(i18n)])}
+        isRequired
+      />
+      <CheckboxField
+        id="webhook-ssl"
+        label={i18n._(t`Disable SSL verification`)}
+        name="notification_configuration.disable_ssl_verification"
+      />
+      <FormFullWidthLayout>
+        <FormGroup
+          fieldId="webhook-headers"
+          helperTextInvalid={headersMeta.error}
+          isRequired
+          validated={
+            !headersMeta.touched || !headersMeta.error ? 'default' : 'error'
+          }
+          label={i18n._(t`HTTP headers`)}
+          labelIcon={
+            <FieldTooltip
+              content={i18n._(t`Specify HTTP Headers in JSON format. Refer to
+              the Ansible Tower documentation for example syntax.`)}
+            />
+          }
+        >
+          <CodeMirrorInput
+            {...headersField}
+            id="webhook-headers"
+            onChange={value => {
+              headersHelpers.setValue(value);
+            }}
+            mode="javascript"
+            rows="5"
+          />
+        </FormGroup>
+      </FormFullWidthLayout>
+      <FormGroup
+        fieldId="webhook-http-method"
+        helperTextInvalid={methodMeta.error}
+        isRequired
+        validated={
+          !methodMeta.touched || !methodMeta.error ? 'default' : 'error'
+        }
+        label={i18n._(t`E-mail options`)}
+      >
+        <AnsibleSelect
+          {...methodField}
+          id="webhook-http-method"
+          data={[
+            {
+              value: '',
+              key: '',
+              label: i18n._(t`Choose an HTTP method`),
+              isDisabled: true,
+            },
+            { value: 'POST', key: 'post', label: i18n._(t`POST`) },
+            { value: 'PUT', key: 'put', label: i18n._(t`PUT`) },
+          ]}
+        />
+      </FormGroup>
+    </>
+  );
+}
diff --git a/awx/ui_next/src/types.js b/awx/ui_next/src/types.js
index e1fa5a5163..7f83e31490 100644
--- a/awx/ui_next/src/types.js
+++ b/awx/ui_next/src/types.js
@@ -367,3 +367,27 @@ export const CredentialType = shape({
   namespace: string,
   inputs: shape({}).isRequired,
 });
+
+export const NotificationType = oneOf([
+  'email',
+  'grafana',
+  'irc',
+  'mattermost',
+  'pagerduty',
+  'rocketchat',
+  'slack',
+  'twilio',
+  'webhook',
+]);
+
+export const NotificationTemplate = shape({
+  id: number.isRequired,
+  name: string.isRequired,
+  description: string,
+  url: string.isRequired,
+  organization: number.isRequired,
+  notification_type: NotificationType,
+  summary_fields: shape({
+    organization: Organization,
+  }),
+});
diff --git a/awx/ui_next/src/util/validators.jsx b/awx/ui_next/src/util/validators.jsx
index 035b4dfb56..959740d317 100644
--- a/awx/ui_next/src/util/validators.jsx
+++ b/awx/ui_next/src/util/validators.jsx
@@ -76,6 +76,21 @@ export function integer(i18n) {
   };
 }
 
+export function url(i18n) {
+  return value => {
+    // URL regex from https://urlregex.com/
+    if (
+      // eslint-disable-next-line max-len
+      !/((([A-Za-z]{3,9}:(?:\/\/)?)(?:[-;:&=+$,\w]+@)?[A-Za-z0-9.-]+|(?:www\.|[-;:&=+$,\w]+@)[A-Za-z0-9.-]+)((?:\/[+~%/.\w\-_]*)?\??(?:[-+=&;%@.\w_]*)#?(?:[.!/\\\w]*))?)/.test(
+        value
+      )
+    ) {
+      return i18n._(t`Please enter a valid URL`);
+    }
+    return undefined;
+  };
+}
+
 export function combine(validators) {
   return value => {
     for (let i = 0; i < validators.length; i++) {
diff --git a/awx/ui_next/src/util/validators.test.js b/awx/ui_next/src/util/validators.test.js
index 11b1a3bfd9..fcde053dbb 100644
--- a/awx/ui_next/src/util/validators.test.js
+++ b/awx/ui_next/src/util/validators.test.js
@@ -4,6 +4,7 @@ import {
   maxLength,
   noWhiteSpace,
   integer,
+  url,
   combine,
   regExp,
 } from './validators';
@@ -111,6 +112,26 @@ describe('validators', () => {
     });
   });
 
+  test('url should reject incomplete url', () => {
+    expect(url(i18n)('abcd')).toEqual({
+      id: 'Please enter a valid URL',
+    });
+  });
+
+  test('url should accept fully qualified url', () => {
+    expect(url(i18n)('http://example.com/foo')).toBeUndefined();
+  });
+
+  test('url should accept url with query params', () => {
+    expect(url(i18n)('https://example.com/foo?bar=baz')).toBeUndefined();
+  });
+
+  test('url should reject short protocol', () => {
+    expect(url(i18n)('h://example.com/foo')).toEqual({
+      id: 'Please enter a valid URL',
+    });
+  });
+
   test('combine should run all validators', () => {
     const validators = [required(null, i18n), noWhiteSpace(i18n)];
     expect(combine(validators)('')).toEqual({

From bb12e0a3a9e5831dde176141f502bde43f56687a Mon Sep 17 00:00:00 2001
From: Keith Grant <keithjgrant@redhat.com>
Date: Tue, 18 Aug 2020 12:36:28 -0700
Subject: [PATCH 33/69] fix initial values for notification type fields

---
 .../shared/NotificationTemplateForm.jsx       | 38 ++++++++++++-
 .../shared/TypeInputsSubForm.jsx              | 13 ++---
 .../shared/typeFieldNames.js                  | 55 +++++++++++++++++++
 3 files changed, 96 insertions(+), 10 deletions(-)
 create mode 100644 awx/ui_next/src/screens/NotificationTemplate/shared/typeFieldNames.js

diff --git a/awx/ui_next/src/screens/NotificationTemplate/shared/NotificationTemplateForm.jsx b/awx/ui_next/src/screens/NotificationTemplate/shared/NotificationTemplateForm.jsx
index 078c2aac6b..300fea5a59 100644
--- a/awx/ui_next/src/screens/NotificationTemplate/shared/NotificationTemplateForm.jsx
+++ b/awx/ui_next/src/screens/NotificationTemplate/shared/NotificationTemplateForm.jsx
@@ -17,11 +17,12 @@ import { getAddedAndRemoved } from '../../../util/lists';
 import { required, minMaxValue } from '../../../util/validators';
 import { FormColumnLayout } from '../../../components/FormLayout';
 import TypeInputsSubForm from './TypeInputsSubForm';
+import typeFieldNames, { initialConfigValues } from './typeFieldNames';
 import { NotificationTemplate } from '../../../types';
 
 function NotificationTemplateFormFields({ i18n, defaultMessages }) {
   const [orgField, orgMeta, orgHelpers] = useField('organization');
-  const [typeField, typeMeta, typeHelpers] = useField({
+  const [typeField, typeMeta] = useField({
     name: 'notification_type',
     validate: required(i18n._(t`Select a value for this field`), i18n),
   });
@@ -97,16 +98,25 @@ function NotificationTemplateForm({
   i18n,
 }) {
   const handleSubmit = values => {
-    console.log(values);
-    // onSubmit(values);
+    onSubmit(normalizeTypeFields(values));
   };
 
+  let emailOptions = '';
+  if (template.notification_type === 'email') {
+    emailOptions = template.notification_configuration.use_ssl ? 'ssl' : 'tls';
+  }
+
   return (
     <Formik
       initialValues={{
         name: template.name,
         description: template.description,
         notification_type: template.notification_type,
+        notification_configuration: {
+          ...initialConfigValues,
+          ...template.notification_configuration,
+        },
+        emailOptions,
       }}
       onSubmit={handleSubmit}
     >
@@ -144,3 +154,25 @@ NotificationTemplateForm.defaultProps = {
 };
 
 export default withI18n()(NotificationTemplateForm);
+
+/* If the user filled in some of the Type Details fields, then switched
+ * to a different notification type, unecessary fields may be set in the
+ * notification_configuration — this function strips them off */
+function normalizeTypeFields(values) {
+  const stripped = {};
+  const fields = typeFieldNames[values.notification_type];
+  fields.foreach(fieldName => {
+    if (typeof values[fieldName] !== 'undefined') {
+      stripped[fieldName] = values[fieldName];
+    }
+  });
+  if (values.notification_type === 'email') {
+    stripped.use_ssl = values.emailOptions === 'ssl';
+    stripped.use_tls = !stripped.use_ssl;
+  }
+
+  return {
+    ...values,
+    notification_configuration: stripped,
+  };
+}
diff --git a/awx/ui_next/src/screens/NotificationTemplate/shared/TypeInputsSubForm.jsx b/awx/ui_next/src/screens/NotificationTemplate/shared/TypeInputsSubForm.jsx
index 1ed9eb2724..253430da8d 100644
--- a/awx/ui_next/src/screens/NotificationTemplate/shared/TypeInputsSubForm.jsx
+++ b/awx/ui_next/src/screens/NotificationTemplate/shared/TypeInputsSubForm.jsx
@@ -1,10 +1,9 @@
 import React from 'react';
 import { withI18n } from '@lingui/react';
 import { t } from '@lingui/macro';
-import { useField } from 'formik';
+import { useField, useFormikContext } from 'formik';
 import { FormGroup, Title } from '@patternfly/react-core';
 import {
-  FormCheckboxLayout,
   FormColumnLayout,
   FormFullWidthLayout,
   SubFormLayout,
@@ -418,7 +417,7 @@ function TwilioFields({ i18n }) {
       <FormField
         id="twilio-destination-numbers"
         label={i18n._(t`Destination SMS number(s)`)}
-        name="notification_configuration.account_token"
+        name="notification_configuration.to_numbers"
         type="textarea"
         validate={required(null, i18n)}
         isRequired
@@ -438,14 +437,14 @@ function TwilioFields({ i18n }) {
 }
 
 function WebhookFields({ i18n }) {
-  const [methodField, methodMeta] = useField({
-    name: 'notification_configuration.http_method',
-    validate: required(i18n._(t`Select a value for this field`), i18n),
-  });
   const [headersField, headersMeta, headersHelpers] = useField({
     name: 'notification_configuration.headers',
     validate: required(i18n._(t`Select enter a value for this field`), i18n),
   });
+  const [methodField, methodMeta] = useField({
+    name: 'notification_configuration.http_method',
+    validate: required(i18n._(t`Select a value for this field`), i18n),
+  });
   return (
     <>
       <FormField
diff --git a/awx/ui_next/src/screens/NotificationTemplate/shared/typeFieldNames.js b/awx/ui_next/src/screens/NotificationTemplate/shared/typeFieldNames.js
new file mode 100644
index 0000000000..7f87baa41a
--- /dev/null
+++ b/awx/ui_next/src/screens/NotificationTemplate/shared/typeFieldNames.js
@@ -0,0 +1,55 @@
+const typeFieldNames = {
+  email: [
+    'username',
+    'password',
+    'host',
+    'recipients',
+    'sender',
+    'port',
+    'timeout',
+  ],
+  grafana: [
+    'grafana_url',
+    'grafana_key',
+    'dashboardId',
+    'panelId',
+    'annotation_tags',
+    'grafana_no_verify_ssl',
+  ],
+  irc: ['password', 'port', 'server', 'nickname', 'targets', 'use_ssl'],
+  mattermost: [
+    'mattermost_url',
+    'mattermost_username',
+    'mattermost_channel',
+    'mattermost_icon_url',
+    'mattermost_no_verify_ssl',
+  ],
+  pagerduty: ['token', 'subdomain', 'service_key', 'client_name'],
+  rocketchat: [
+    'rocketchat_url',
+    'rocketchat_username',
+    'rocketchat_icon_url',
+    'rocketchat_no_verify_ssl',
+  ],
+  slack: ['channels', 'token', 'hex_color'],
+  twilio: ['account_token', 'from_number', 'to_numbers', 'account_sid'],
+  webhook: [
+    'username',
+    'password',
+    'url',
+    'disable_ssl_verification',
+    'headers',
+    'http_method',
+  ],
+};
+
+export default typeFieldNames;
+
+const initialConfigValues = {};
+Object.keys(typeFieldNames).forEach(key => {
+  typeFieldNames[key].forEach(fieldName => {
+    initialConfigValues[fieldName] = '';
+  });
+});
+
+export { initialConfigValues };

From ba95775deddb5a8a951e1403dd8d2c14402d594d Mon Sep 17 00:00:00 2001
From: Keith Grant <keithjgrant@redhat.com>
Date: Wed, 19 Aug 2020 16:11:58 -0700
Subject: [PATCH 34/69] add custom notification messages subform

---
 .../CodeMirrorInput/CodeMirrorField.jsx       |  73 ++++++
 .../src/components/CodeMirrorInput/index.js   |   1 +
 .../NotificationTemplateEdit.jsx              |   1 -
 .../shared/CustomMessagesSubForm.jsx          | 213 ++++++++++++++++++
 .../shared/NotificationTemplateForm.jsx       |  90 +++++++-
 .../shared/TypeInputsSubForm.jsx              |   2 +-
 6 files changed, 371 insertions(+), 9 deletions(-)
 create mode 100644 awx/ui_next/src/components/CodeMirrorInput/CodeMirrorField.jsx
 create mode 100644 awx/ui_next/src/screens/NotificationTemplate/shared/CustomMessagesSubForm.jsx

diff --git a/awx/ui_next/src/components/CodeMirrorInput/CodeMirrorField.jsx b/awx/ui_next/src/components/CodeMirrorInput/CodeMirrorField.jsx
new file mode 100644
index 0000000000..60d7896a38
--- /dev/null
+++ b/awx/ui_next/src/components/CodeMirrorInput/CodeMirrorField.jsx
@@ -0,0 +1,73 @@
+import React from 'react';
+import {
+  string,
+  oneOfType,
+  object,
+  func,
+  bool,
+  node,
+  oneOf,
+  number,
+} from 'prop-types';
+import { useField } from 'formik';
+import { FormGroup } from '@patternfly/react-core';
+import CodeMirrorInput from './CodeMirrorInput';
+import { FieldTooltip } from '../FormField';
+
+function CodeMirrorField({
+  id,
+  name,
+  label,
+  tooltip,
+  helperText,
+  validate,
+  isRequired,
+  mode,
+  ...rest
+}) {
+  const [field, meta, helpers] = useField({ name, validate });
+  const isValid = !(meta.touched && meta.error);
+
+  return (
+    <FormGroup
+      fieldId={id}
+      helperText={helperText}
+      helperTextInvalid={meta.error}
+      isRequired={isRequired}
+      validated={isValid ? 'default' : 'error'}
+      label={label}
+      labelIcon={<FieldTooltip content={tooltip} />}
+    >
+      <CodeMirrorInput
+        id="webhook-headers"
+        {...rest}
+        {...field}
+        onChange={value => {
+          helpers.setValue(value);
+        }}
+        mode={mode}
+      />
+    </FormGroup>
+  );
+}
+CodeMirrorField.propTypes = {
+  helperText: string,
+  id: string.isRequired,
+  name: string.isRequired,
+  label: oneOfType([object, string]).isRequired,
+  validate: func,
+  isRequired: bool,
+  tooltip: node,
+  mode: oneOf(['javascript', 'yaml', 'jinja2']).isRequired,
+  rows: number,
+};
+
+CodeMirrorField.defaultProps = {
+  helperText: '',
+  validate: () => {},
+  isRequired: false,
+  tooltip: null,
+  rows: 5,
+};
+
+export default CodeMirrorField;
diff --git a/awx/ui_next/src/components/CodeMirrorInput/index.js b/awx/ui_next/src/components/CodeMirrorInput/index.js
index 9cad016228..2c60b806f5 100644
--- a/awx/ui_next/src/components/CodeMirrorInput/index.js
+++ b/awx/ui_next/src/components/CodeMirrorInput/index.js
@@ -1,6 +1,7 @@
 import CodeMirrorInput from './CodeMirrorInput';
 
 export default CodeMirrorInput;
+export { default as CodeMirrorField } from './CodeMirrorField';
 export { default as VariablesDetail } from './VariablesDetail';
 export { default as VariablesInput } from './VariablesInput';
 export { default as VariablesField } from './VariablesField';
diff --git a/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplateEdit/NotificationTemplateEdit.jsx b/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplateEdit/NotificationTemplateEdit.jsx
index e57a01fd4e..9445f9c7be 100644
--- a/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplateEdit/NotificationTemplateEdit.jsx
+++ b/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplateEdit/NotificationTemplateEdit.jsx
@@ -3,7 +3,6 @@ import PropTypes from 'prop-types';
 import { useHistory } from 'react-router-dom';
 import { CardBody } from '../../../components/Card';
 import { OrganizationsAPI } from '../../../api';
-import { Config } from '../../../contexts/Config';
 
 import NotificationTemplateForm from '../shared/NotificationTemplateForm';
 
diff --git a/awx/ui_next/src/screens/NotificationTemplate/shared/CustomMessagesSubForm.jsx b/awx/ui_next/src/screens/NotificationTemplate/shared/CustomMessagesSubForm.jsx
new file mode 100644
index 0000000000..8bca667b82
--- /dev/null
+++ b/awx/ui_next/src/screens/NotificationTemplate/shared/CustomMessagesSubForm.jsx
@@ -0,0 +1,213 @@
+import 'styled-components/macro';
+import React from 'react';
+import { withI18n } from '@lingui/react';
+import { t } from '@lingui/macro';
+import { useField } from 'formik';
+import {
+  FormGroup,
+  Title,
+  Switch,
+  Text,
+  TextVariants,
+} from '@patternfly/react-core';
+import {
+  FormColumnLayout,
+  FormFullWidthLayout,
+  SubFormLayout,
+} from '../../../components/FormLayout';
+import FormField, {
+  PasswordField,
+  CheckboxField,
+  FieldTooltip,
+} from '../../../components/FormField';
+import AnsibleSelect from '../../../components/AnsibleSelect';
+import { CodeMirrorField } from '../../../components/CodeMirrorInput';
+import {
+  combine,
+  required,
+  requiredEmail,
+  url,
+} from '../../../util/validators';
+import { NotificationType } from '../../../types';
+
+function CustomMessagesSubForm({ defaultMessages, type, i18n }) {
+  const [useCustomField, , useCustomHelpers] = useField('useCustomMessages');
+  const showMessages = type !== 'webhook';
+  const showBodies = ['email', 'pagerduty', 'webhook'].includes(type);
+
+  return (
+    <>
+      <Switch
+        id="toggle-custom-messages"
+        label={i18n._(t`Customize messages…`)}
+        isChecked={!!useCustomField.value}
+        onChange={() => useCustomHelpers.setValue(!useCustomField.value)}
+      />
+      {useCustomField.value && (
+        <SubFormLayout>
+          <Text
+            className="pf-c-content"
+            css="margin-bottom: var(--pf-c-content--MarginBottom)"
+          >
+            <small>
+              Use custom messages to change the content of notifications sent
+              when a job starts, succeeds, or fails. Use curly braces to access
+              information about the job:{' '}
+              <code>
+                {'{{'} job_friendly_name {'}}'}
+              </code>
+              ,{' '}
+              <code>
+                {'{{'} url {'}}'}
+              </code>
+              , or attributes of the job such as{' '}
+              <code>
+                {'{{'} job.status {'}}'}
+              </code>
+              . You may apply a number of possible variables in the message.
+              Refer to the{' '}
+              <a
+                href="https://docs.ansible.com/ansible-tower/latest/html/userguide/notifications.html#create-custom-notifications"
+                target="_blank"
+                rel="noopener noreferrer"
+              >
+                Ansible Tower documentation
+              </a>{' '}
+              for more details.
+            </small>
+          </Text>
+          <FormFullWidthLayout>
+            {showMessages && (
+              <CodeMirrorField
+                id="start-message"
+                name="messages.started.message"
+                label={i18n._(t`Start message`)}
+                mode="jinja2"
+                rows={2}
+              />
+            )}
+            {showBodies && (
+              <CodeMirrorField
+                id="start-body"
+                name="messages.started.body"
+                label={i18n._(t`Start message body`)}
+                mode="jinja2"
+                rows={6}
+              />
+            )}
+            {showMessages && (
+              <CodeMirrorField
+                id="success-message"
+                name="messages.success.message"
+                label={i18n._(t`Success message`)}
+                mode="jinja2"
+                rows={2}
+              />
+            )}
+            {showBodies && (
+              <CodeMirrorField
+                id="success-body"
+                name="messages.success.body"
+                label={i18n._(t`Success message body`)}
+                mode="jinja2"
+                rows={6}
+              />
+            )}
+            {showMessages && (
+              <CodeMirrorField
+                id="error-message"
+                name="messages.error.message"
+                label={i18n._(t`Error message`)}
+                mode="jinja2"
+                rows={2}
+              />
+            )}
+            {showBodies && (
+              <CodeMirrorField
+                id="error-body"
+                name="messages.error.body"
+                label={i18n._(t`Error message body`)}
+                mode="jinja2"
+                rows={6}
+              />
+            )}
+            {showMessages && (
+              <CodeMirrorField
+                id="wf-approved-message"
+                name="messages.workflow_approval.approved.message"
+                label={i18n._(t`Workflow approved message`)}
+                mode="jinja2"
+                rows={2}
+              />
+            )}
+            {showBodies && (
+              <CodeMirrorField
+                id="wf-approved-body"
+                name="messages.workflow_approval.approved.body"
+                label={i18n._(t`Workflow approved message body`)}
+                mode="jinja2"
+                rows={6}
+              />
+            )}
+            {showMessages && (
+              <CodeMirrorField
+                id="wf-denied-message"
+                name="messages.workflow_approval.denied.message"
+                label={i18n._(t`Workflow denied message`)}
+                mode="jinja2"
+                rows={2}
+              />
+            )}
+            {showBodies && (
+              <CodeMirrorField
+                id="wf-denied-body"
+                name="messages.workflow_approval.denied.body"
+                label={i18n._(t`Workflow denied message body`)}
+                mode="jinja2"
+                rows={6}
+              />
+            )}
+            {showMessages && (
+              <CodeMirrorField
+                id="wf-running-message"
+                name="messages.workflow_approval.running.message"
+                label={i18n._(t`Workflow pending message`)}
+                mode="jinja2"
+                rows={2}
+              />
+            )}
+            {showBodies && (
+              <CodeMirrorField
+                id="wf-running-body"
+                name="messages.workflow_approval.running.body"
+                label={i18n._(t`Workflow pending message body`)}
+                mode="jinja2"
+                rows={6}
+              />
+            )}
+            {showMessages && (
+              <CodeMirrorField
+                id="wf-timed-out-message"
+                name="messages.workflow_approval.timed_out.message"
+                label={i18n._(t`Workflow timed out message`)}
+                mode="jinja2"
+                rows={2}
+              />
+            )}
+            {showBodies && (
+              <CodeMirrorField
+                id="wf-timed-out-body"
+                name="messages.workflow_approval.timed_out.body"
+                label={i18n._(t`Workflow timed out message body`)}
+                mode="jinja2"
+                rows={6}
+              />
+            )}
+          </FormFullWidthLayout>
+        </SubFormLayout>
+      )}
+    </>
+  );
+}
+
+export default withI18n()(CustomMessagesSubForm);
diff --git a/awx/ui_next/src/screens/NotificationTemplate/shared/NotificationTemplateForm.jsx b/awx/ui_next/src/screens/NotificationTemplate/shared/NotificationTemplateForm.jsx
index 300fea5a59..0efe8b764b 100644
--- a/awx/ui_next/src/screens/NotificationTemplate/shared/NotificationTemplateForm.jsx
+++ b/awx/ui_next/src/screens/NotificationTemplate/shared/NotificationTemplateForm.jsx
@@ -1,22 +1,18 @@
-import React, { useContext, useEffect, useState } from 'react';
+import React from 'react';
 import { shape, func } from 'prop-types';
 import { Formik, useField } from 'formik';
 import { withI18n } from '@lingui/react';
 import { t } from '@lingui/macro';
 import { Form, FormGroup } from '@patternfly/react-core';
 
-import { OrganizationsAPI } from '../../../api';
-import { ConfigContext } from '../../../contexts/Config';
 import AnsibleSelect from '../../../components/AnsibleSelect';
-import ContentError from '../../../components/ContentError';
-import ContentLoading from '../../../components/ContentLoading';
 import FormField, { FormSubmitError } from '../../../components/FormField';
 import FormActionGroup from '../../../components/FormActionGroup/FormActionGroup';
 import { OrganizationLookup } from '../../../components/Lookup';
-import { getAddedAndRemoved } from '../../../util/lists';
-import { required, minMaxValue } from '../../../util/validators';
+import { required } from '../../../util/validators';
 import { FormColumnLayout } from '../../../components/FormLayout';
 import TypeInputsSubForm from './TypeInputsSubForm';
+import CustomMessagesSubForm from './CustomMessagesSubForm';
 import typeFieldNames, { initialConfigValues } from './typeFieldNames';
 import { NotificationTemplate } from '../../../types';
 
@@ -85,6 +81,10 @@ function NotificationTemplateFormFields({ i18n, defaultMessages }) {
         />
       </FormGroup>
       {typeField.value && <TypeInputsSubForm type={typeField.value} />}
+      <CustomMessagesSubForm
+        defaultMessages={defaultMessages}
+        type={typeField.value}
+      />
     </>
   );
 }
@@ -105,6 +105,14 @@ function NotificationTemplateForm({
   if (template.notification_type === 'email') {
     emailOptions = template.notification_configuration.use_ssl ? 'ssl' : 'tls';
   }
+  const messages = template.messages || { workflow_approval: {} };
+  const defs = defaultMessages[template.notification_type || 'email'];
+  const mergeDefaultMessages = (templ = {}, def) => {
+    return {
+      message: templ.message || def.message || '',
+      body: templ.body || def.body || '',
+    };
+  };
 
   return (
     <Formik
@@ -117,6 +125,38 @@ function NotificationTemplateForm({
           ...template.notification_configuration,
         },
         emailOptions,
+        messages: {
+          started: { ...mergeDefaultMessages(messages.started, defs.started) },
+          success: { ...mergeDefaultMessages(messages.success, defs.success) },
+          error: { ...mergeDefaultMessages(messages.error, defs.error) },
+          workflow_approval: {
+            approved: {
+              ...mergeDefaultMessages(
+                messages.workflow_approval.approved,
+                defs.workflow_approval.approved
+              ),
+            },
+            denied: {
+              ...mergeDefaultMessages(
+                messages.workflow_approval.denied,
+                defs.workflow_approval.denied
+              ),
+            },
+            running: {
+              ...mergeDefaultMessages(
+                messages.workflow_approval.running,
+                defs.workflow_approval.running
+              ),
+            },
+            timed_out: {
+              ...mergeDefaultMessages(
+                messages.workflow_approval.timed_out,
+                defs.workflow_approval.timed_out
+              ),
+            },
+          },
+        },
+        useCustomMessages: hasCustomMessages(messages, defs),
       }}
       onSubmit={handleSubmit}
     >
@@ -155,6 +195,42 @@ NotificationTemplateForm.defaultProps = {
 
 export default withI18n()(NotificationTemplateForm);
 
+function hasCustomMessages(messages, defaults) {
+  return (
+    isCustomized(messages.started, defaults.started) ||
+    isCustomized(messages.success, defaults.success) ||
+    isCustomized(messages.error, defaults.error) ||
+    isCustomized(
+      messages.workflow_approval.approved,
+      defaults.workflow_approval.approved
+    ) ||
+    isCustomized(
+      messages.workflow_approval.denied,
+      defaults.workflow_approval.denied
+    ) ||
+    isCustomized(
+      messages.workflow_approval.running,
+      defaults.workflow_approval.running
+    ) ||
+    isCustomized(
+      messages.workflow_approval.timed_out,
+      defaults.workflow_approval.timed_out
+    )
+  );
+}
+function isCustomized(message, defaultMessage) {
+  if (!message) {
+    return false;
+  }
+  if (!message.message || message.message !== defaultMessage.message) {
+    return true;
+  }
+  if (!message.body || message.body !== defaultMessage.body) {
+    return true;
+  }
+  return false;
+}
+
 /* If the user filled in some of the Type Details fields, then switched
  * to a different notification type, unecessary fields may be set in the
  * notification_configuration — this function strips them off */
diff --git a/awx/ui_next/src/screens/NotificationTemplate/shared/TypeInputsSubForm.jsx b/awx/ui_next/src/screens/NotificationTemplate/shared/TypeInputsSubForm.jsx
index 253430da8d..23d21a5dcc 100644
--- a/awx/ui_next/src/screens/NotificationTemplate/shared/TypeInputsSubForm.jsx
+++ b/awx/ui_next/src/screens/NotificationTemplate/shared/TypeInputsSubForm.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { withI18n } from '@lingui/react';
 import { t } from '@lingui/macro';
-import { useField, useFormikContext } from 'formik';
+import { useField } from 'formik';
 import { FormGroup, Title } from '@patternfly/react-core';
 import {
   FormColumnLayout,

From 19fc0d9a96609f94b3f22179a63ee7139742992e Mon Sep 17 00:00:00 2001
From: Keith Grant <keithjgrant@redhat.com>
Date: Thu, 20 Aug 2020 10:08:03 -0700
Subject: [PATCH 35/69] reset notification messages to defaults when switching
 to new type

---
 .../shared/CustomMessagesSubForm.jsx          | 65 ++++++++++++-------
 .../shared/NotificationTemplateForm.jsx       |  5 +-
 .../shared/TypeInputsSubForm.jsx              |  6 +-
 3 files changed, 49 insertions(+), 27 deletions(-)

diff --git a/awx/ui_next/src/screens/NotificationTemplate/shared/CustomMessagesSubForm.jsx b/awx/ui_next/src/screens/NotificationTemplate/shared/CustomMessagesSubForm.jsx
index 8bca667b82..9387a84a39 100644
--- a/awx/ui_next/src/screens/NotificationTemplate/shared/CustomMessagesSubForm.jsx
+++ b/awx/ui_next/src/screens/NotificationTemplate/shared/CustomMessagesSubForm.jsx
@@ -1,40 +1,59 @@
 import 'styled-components/macro';
-import React from 'react';
+import React, { useEffect, useRef } from 'react';
 import { withI18n } from '@lingui/react';
 import { t } from '@lingui/macro';
-import { useField } from 'formik';
+import { useField, useFormikContext } from 'formik';
+import { Switch, Text } from '@patternfly/react-core';
 import {
-  FormGroup,
-  Title,
-  Switch,
-  Text,
-  TextVariants,
-} from '@patternfly/react-core';
-import {
-  FormColumnLayout,
   FormFullWidthLayout,
   SubFormLayout,
 } from '../../../components/FormLayout';
-import FormField, {
-  PasswordField,
-  CheckboxField,
-  FieldTooltip,
-} from '../../../components/FormField';
-import AnsibleSelect from '../../../components/AnsibleSelect';
 import { CodeMirrorField } from '../../../components/CodeMirrorInput';
-import {
-  combine,
-  required,
-  requiredEmail,
-  url,
-} from '../../../util/validators';
-import { NotificationType } from '../../../types';
 
 function CustomMessagesSubForm({ defaultMessages, type, i18n }) {
   const [useCustomField, , useCustomHelpers] = useField('useCustomMessages');
   const showMessages = type !== 'webhook';
   const showBodies = ['email', 'pagerduty', 'webhook'].includes(type);
 
+  const { setFieldValue } = useFormikContext();
+  const mountedRef = useRef(null);
+  useEffect(
+    function resetToDefaultMessages() {
+      if (!mountedRef.current) {
+        mountedRef.current = true;
+        return;
+      }
+      const defs = defaultMessages[type];
+
+      const resetFields = (name, defaults) => {
+        setFieldValue(`${name}.message`, defaults.message || '');
+        setFieldValue(`${name}.body`, defaults.body || '');
+      };
+
+      resetFields('messages.started', defs.started);
+      resetFields('messages.success', defs.success);
+      resetFields('messages.error', defs.error);
+      resetFields(
+        'messages.workflow_approval.approved',
+        defs.workflow_approval.approved
+      );
+      resetFields(
+        'messages.workflow_approval.denied',
+        defs.workflow_approval.denied
+      );
+      resetFields(
+        'messages.workflow_approval.running',
+        defs.workflow_approval.running
+      );
+      resetFields(
+        'messages.workflow_approval.timed_out',
+        defs.workflow_approval.timed_out
+      );
+    },
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [type, setFieldValue]
+  );
+
   return (
     <>
       <Switch
diff --git a/awx/ui_next/src/screens/NotificationTemplate/shared/NotificationTemplateForm.jsx b/awx/ui_next/src/screens/NotificationTemplate/shared/NotificationTemplateForm.jsx
index 0efe8b764b..f1ab928ca6 100644
--- a/awx/ui_next/src/screens/NotificationTemplate/shared/NotificationTemplateForm.jsx
+++ b/awx/ui_next/src/screens/NotificationTemplate/shared/NotificationTemplateForm.jsx
@@ -163,7 +163,10 @@ function NotificationTemplateForm({
       {formik => (
         <Form autoComplete="off" onSubmit={formik.handleSubmit}>
           <FormColumnLayout>
-            <NotificationTemplateFormFields i18n={i18n} />
+            <NotificationTemplateFormFields
+              i18n={i18n}
+              defaultMessages={defaultMessages}
+            />
             <FormSubmitError error={submitError} />
             <FormActionGroup
               onCancel={onCancel}
diff --git a/awx/ui_next/src/screens/NotificationTemplate/shared/TypeInputsSubForm.jsx b/awx/ui_next/src/screens/NotificationTemplate/shared/TypeInputsSubForm.jsx
index 23d21a5dcc..5bcd8d0b75 100644
--- a/awx/ui_next/src/screens/NotificationTemplate/shared/TypeInputsSubForm.jsx
+++ b/awx/ui_next/src/screens/NotificationTemplate/shared/TypeInputsSubForm.jsx
@@ -87,7 +87,7 @@ function EmailFields({ i18n }) {
         type="textarea"
         validate={required(null, i18n)}
         isRequired
-        rows="3"
+        rows={3}
         tooltip={i18n._(t`Enter one email address per line to create a recipient
           list for this type of notification.`)}
       />
@@ -187,7 +187,7 @@ function GrafanaFields({ i18n }) {
         label={i18n._(t`Tags for the annotation (optional)`)}
         name="notification_configuration.annotation_tags"
         type="textarea"
-        rows="3"
+        rows={3}
         tooltip={i18n._(t`Enter one Annotation Tag per line, without commas.`)}
       />
       <CheckboxField
@@ -494,7 +494,7 @@ function WebhookFields({ i18n }) {
               headersHelpers.setValue(value);
             }}
             mode="javascript"
-            rows="5"
+            rows={5}
           />
         </FormGroup>
       </FormFullWidthLayout>

From 458d29a579443a2a5dc24d5496c8f4de5f70c0b6 Mon Sep 17 00:00:00 2001
From: Keith Grant <keithjgrant@redhat.com>
Date: Thu, 20 Aug 2020 14:43:30 -0700
Subject: [PATCH 36/69] only submit customized notification messages if changed

---
 .../NotificationTemplateEdit.jsx              | 20 +------
 .../shared/NotificationTemplateForm.jsx       | 60 +++++++++++++++++--
 2 files changed, 57 insertions(+), 23 deletions(-)

diff --git a/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplateEdit/NotificationTemplateEdit.jsx b/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplateEdit/NotificationTemplateEdit.jsx
index 9445f9c7be..91844a477c 100644
--- a/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplateEdit/NotificationTemplateEdit.jsx
+++ b/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplateEdit/NotificationTemplateEdit.jsx
@@ -2,7 +2,7 @@ import React, { useState } from 'react';
 import PropTypes from 'prop-types';
 import { useHistory } from 'react-router-dom';
 import { CardBody } from '../../../components/Card';
-import { OrganizationsAPI } from '../../../api';
+import { NotificationTemplatesAPI } from '../../../api';
 
 import NotificationTemplateForm from '../shared/NotificationTemplateForm';
 
@@ -11,23 +11,9 @@ function NotificationTemplateEdit({ template, defaultMessages }) {
   const history = useHistory();
   const [formError, setFormError] = useState(null);
 
-  const handleSubmit = async (
-    values,
-    groupsToAssociate,
-    groupsToDisassociate
-  ) => {
+  const handleSubmit = async values => {
     try {
-      await OrganizationsAPI.update(template.id, values);
-      await Promise.all(
-        groupsToAssociate.map(id =>
-          OrganizationsAPI.associateInstanceGroup(template.id, id)
-        )
-      );
-      await Promise.all(
-        groupsToDisassociate.map(id =>
-          OrganizationsAPI.disassociateInstanceGroup(template.id, id)
-        )
-      );
+      await NotificationTemplatesAPI.update(template.id, values);
       history.push(detailsUrl);
     } catch (error) {
       setFormError(error);
diff --git a/awx/ui_next/src/screens/NotificationTemplate/shared/NotificationTemplateForm.jsx b/awx/ui_next/src/screens/NotificationTemplate/shared/NotificationTemplateForm.jsx
index f1ab928ca6..edbb591c4d 100644
--- a/awx/ui_next/src/screens/NotificationTemplate/shared/NotificationTemplateForm.jsx
+++ b/awx/ui_next/src/screens/NotificationTemplate/shared/NotificationTemplateForm.jsx
@@ -98,7 +98,8 @@ function NotificationTemplateForm({
   i18n,
 }) {
   const handleSubmit = values => {
-    onSubmit(normalizeTypeFields(values));
+    // TODO: convert list values to arrays (do it in the field itself?)
+    onSubmit(normalizeFields(values, defaultMessages));
   };
 
   let emailOptions = '';
@@ -225,24 +226,28 @@ function isCustomized(message, defaultMessage) {
   if (!message) {
     return false;
   }
-  if (!message.message || message.message !== defaultMessage.message) {
+  if (message.message && message.message !== defaultMessage.message) {
     return true;
   }
-  if (!message.body || message.body !== defaultMessage.body) {
+  if (message.body && message.body !== defaultMessage.body) {
     return true;
   }
   return false;
 }
 
+function normalizeFields(values, defaultMessages) {
+  return normalizeTypeFields(normalizeMessageFields(values, defaultMessages));
+}
+
 /* If the user filled in some of the Type Details fields, then switched
  * to a different notification type, unecessary fields may be set in the
  * notification_configuration — this function strips them off */
 function normalizeTypeFields(values) {
   const stripped = {};
   const fields = typeFieldNames[values.notification_type];
-  fields.foreach(fieldName => {
-    if (typeof values[fieldName] !== 'undefined') {
-      stripped[fieldName] = values[fieldName];
+  fields.forEach(fieldName => {
+    if (typeof values.notification_configuration[fieldName] !== 'undefined') {
+      stripped[fieldName] = values.notification_configuration[fieldName];
     }
   });
   if (values.notification_type === 'email') {
@@ -255,3 +260,46 @@ function normalizeTypeFields(values) {
     notification_configuration: stripped,
   };
 }
+
+function normalizeMessageFields(values, defaults) {
+  if (!values.useCustomMessages) {
+    return values;
+  }
+  const { messages } = values;
+  const defs = defaults[values.notification_type];
+
+  const nullIfDefault = (m, d) => {
+    return {
+      message: m.message === d.message ? null : m.message,
+      body: m.body === d.body ? null : m.body,
+    };
+  };
+
+  const nonDefaultMessages = {
+    started: nullIfDefault(messages.started, defs.started),
+    success: nullIfDefault(messages.success, defs.success),
+    error: nullIfDefault(messages.error, defs.error),
+    workflow_approval: {
+      approved: nullIfDefault(
+        messages.workflow_approval.approved,
+        defs.workflow_approval.approved
+      ),
+      denied: nullIfDefault(
+        messages.workflow_approval.denied,
+        defs.workflow_approval.denied
+      ),
+      running: nullIfDefault(
+        messages.workflow_approval.running,
+        defs.workflow_approval.running
+      ),
+      timed_out: nullIfDefault(
+        messages.workflow_approval.timed_out,
+        defs.workflow_approval.timed_out
+      ),
+    },
+  };
+  return {
+    ...values,
+    messages: nonDefaultMessages,
+  };
+}

From 9bb834a422561a23d94b7d9a0582475522da6f88 Mon Sep 17 00:00:00 2001
From: Keith Grant <keithjgrant@redhat.com>
Date: Fri, 21 Aug 2020 09:24:32 -0700
Subject: [PATCH 37/69] create ArrayTextField component

---
 .../components/FormField/ArrayTextField.jsx   | 69 +++++++++++++++++++
 awx/ui_next/src/components/FormField/index.js |  1 +
 .../shared/NotificationTemplateForm.jsx       |  1 -
 .../shared/TypeInputsSubForm.jsx              | 11 +--
 4 files changed, 76 insertions(+), 6 deletions(-)
 create mode 100644 awx/ui_next/src/components/FormField/ArrayTextField.jsx

diff --git a/awx/ui_next/src/components/FormField/ArrayTextField.jsx b/awx/ui_next/src/components/FormField/ArrayTextField.jsx
new file mode 100644
index 0000000000..9b94036e3f
--- /dev/null
+++ b/awx/ui_next/src/components/FormField/ArrayTextField.jsx
@@ -0,0 +1,69 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { useField } from 'formik';
+import { FormGroup, TextArea } from '@patternfly/react-core';
+import FieldTooltip from './FieldTooltip';
+
+function ArrayTextField(props) {
+  const {
+    id,
+    helperText,
+    name,
+    label,
+    tooltip,
+    tooltipMaxWidth,
+    validate,
+    isRequired,
+    type,
+    ...rest
+  } = props;
+
+  const [field, meta, helpers] = useField({ name, validate });
+  const isValid = !(meta.touched && meta.error);
+
+  return (
+    <FormGroup
+      fieldId={id}
+      helperText={helperText}
+      helperTextInvalid={meta.error}
+      isRequired={isRequired}
+      validated={isValid ? 'default' : 'error'}
+      label={label}
+      labelIcon={<FieldTooltip content={tooltip} maxWidth={tooltipMaxWidth} />}
+    >
+      <TextArea
+        id={id}
+        isRequired={isRequired}
+        validated={isValid ? 'default' : 'error'}
+        resizeOrientation="vertical"
+        {...rest}
+        {...field}
+        value={field.value.join('\n')}
+        onChange={value => {
+          helpers.setValue(value.split('\n').map(v => v.trim()));
+        }}
+      />
+    </FormGroup>
+  );
+}
+
+ArrayTextField.propTypes = {
+  helperText: PropTypes.string,
+  id: PropTypes.string.isRequired,
+  name: PropTypes.string.isRequired,
+  label: PropTypes.oneOfType([PropTypes.object, PropTypes.string]).isRequired,
+  validate: PropTypes.func,
+  isRequired: PropTypes.bool,
+  tooltip: PropTypes.node,
+  tooltipMaxWidth: PropTypes.string,
+};
+
+ArrayTextField.defaultProps = {
+  helperText: '',
+  validate: () => {},
+  isRequired: false,
+  tooltip: null,
+  tooltipMaxWidth: '',
+};
+
+export default ArrayTextField;
diff --git a/awx/ui_next/src/components/FormField/index.js b/awx/ui_next/src/components/FormField/index.js
index fd0c95dafd..cc23b0cccd 100644
--- a/awx/ui_next/src/components/FormField/index.js
+++ b/awx/ui_next/src/components/FormField/index.js
@@ -4,3 +4,4 @@ export { default as FieldTooltip } from './FieldTooltip';
 export { default as PasswordField } from './PasswordField';
 export { default as PasswordInput } from './PasswordInput';
 export { default as FormSubmitError } from './FormSubmitError';
+export { default as ArrayTextField } from './ArrayTextField';
diff --git a/awx/ui_next/src/screens/NotificationTemplate/shared/NotificationTemplateForm.jsx b/awx/ui_next/src/screens/NotificationTemplate/shared/NotificationTemplateForm.jsx
index edbb591c4d..3588fe142f 100644
--- a/awx/ui_next/src/screens/NotificationTemplate/shared/NotificationTemplateForm.jsx
+++ b/awx/ui_next/src/screens/NotificationTemplate/shared/NotificationTemplateForm.jsx
@@ -98,7 +98,6 @@ function NotificationTemplateForm({
   i18n,
 }) {
   const handleSubmit = values => {
-    // TODO: convert list values to arrays (do it in the field itself?)
     onSubmit(normalizeFields(values, defaultMessages));
   };
 
diff --git a/awx/ui_next/src/screens/NotificationTemplate/shared/TypeInputsSubForm.jsx b/awx/ui_next/src/screens/NotificationTemplate/shared/TypeInputsSubForm.jsx
index 5bcd8d0b75..434c0e6633 100644
--- a/awx/ui_next/src/screens/NotificationTemplate/shared/TypeInputsSubForm.jsx
+++ b/awx/ui_next/src/screens/NotificationTemplate/shared/TypeInputsSubForm.jsx
@@ -12,6 +12,7 @@ import FormField, {
   PasswordField,
   CheckboxField,
   FieldTooltip,
+  ArrayTextField,
 } from '../../../components/FormField';
 import AnsibleSelect from '../../../components/AnsibleSelect';
 import CodeMirrorInput from '../../../components/CodeMirrorInput';
@@ -80,7 +81,7 @@ function EmailFields({ i18n }) {
         validate={required(null, i18n)}
         isRequired
       />
-      <FormField
+      <ArrayTextField
         id="email-recipients"
         label={i18n._(t`Recipient list`)}
         name="notification_configuration.recipients"
@@ -182,7 +183,7 @@ function GrafanaFields({ i18n }) {
         name="notification_configuration.panelId"
         type="text"
       />
-      <FormField
+      <ArrayTextField
         id="grafana-tags"
         label={i18n._(t`Tags for the annotation (optional)`)}
         name="notification_configuration.annotation_tags"
@@ -232,7 +233,7 @@ function IRCFields({ i18n }) {
         validate={required(null, i18n)}
         isRequired
       />
-      <FormField
+      <ArrayTextField
         id="irc-targets"
         label={i18n._(t`Destination channels or users`)}
         name="notification_configuration.targets"
@@ -365,7 +366,7 @@ function RocketChatFields({ i18n }) {
 function SlackFields({ i18n }) {
   return (
     <>
-      <FormField
+      <ArrayTextField
         id="slack-channels"
         label={i18n._(t`Destination channels`)}
         name="notification_configuration.channels"
@@ -414,7 +415,7 @@ function TwilioFields({ i18n }) {
         tooltip={i18n._(t`Enter the number associated with the "Messaging
           Service" in Twilio in the format +18005550199.`)}
       />
-      <FormField
+      <ArrayTextField
         id="twilio-destination-numbers"
         label={i18n._(t`Destination SMS number(s)`)}
         name="notification_configuration.to_numbers"

From 43ac5a0574f0ae3ed76aa6383b39d3d4bc0ddd79 Mon Sep 17 00:00:00 2001
From: Keith Grant <keithjgrant@redhat.com>
Date: Fri, 21 Aug 2020 16:35:37 -0700
Subject: [PATCH 38/69] add some notification form tests; notification add
 screen

---
 .../components/FormField/ArrayTextField.jsx   |   3 +-
 .../NotificationTemplate.jsx                  |   6 -
 .../NotificationTemplateAdd.jsx               |  87 ++++++++++++-
 .../NotificationTemplateEdit.jsx              |   1 -
 .../shared/NotificationTemplateForm.jsx       |  31 +++--
 .../shared/NotificationTemplateForm.test.jsx  | 118 ++++++++++++++++++
 6 files changed, 227 insertions(+), 19 deletions(-)
 create mode 100644 awx/ui_next/src/screens/NotificationTemplate/shared/NotificationTemplateForm.test.jsx

diff --git a/awx/ui_next/src/components/FormField/ArrayTextField.jsx b/awx/ui_next/src/components/FormField/ArrayTextField.jsx
index 9b94036e3f..5f6609e1e1 100644
--- a/awx/ui_next/src/components/FormField/ArrayTextField.jsx
+++ b/awx/ui_next/src/components/FormField/ArrayTextField.jsx
@@ -20,6 +20,7 @@ function ArrayTextField(props) {
 
   const [field, meta, helpers] = useField({ name, validate });
   const isValid = !(meta.touched && meta.error);
+  const value = field.value || [];
 
   return (
     <FormGroup
@@ -38,7 +39,7 @@ function ArrayTextField(props) {
         resizeOrientation="vertical"
         {...rest}
         {...field}
-        value={field.value.join('\n')}
+        value={value.join('\n')}
         onChange={value => {
           helpers.setValue(value.split('\n').map(v => v.trim()));
         }}
diff --git a/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplate.jsx b/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplate.jsx
index 5cebeef78c..cc32c9eb64 100644
--- a/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplate.jsx
+++ b/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplate.jsx
@@ -94,12 +94,6 @@ function NotificationTemplate({ setBreadcrumb, i18n }) {
             to="/notification_templates/:id/details"
             exact
           />
-          {/* <Route path="/notification_templates/add">
-            <NotificationTemplateAdd
-              defaultMessages={defaultMessages}
-              isLoading={isLoading}
-            />
-          </Route> */}
           {template && (
             <>
               <Route path="/notification_templates/:id/edit">
diff --git a/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplateAdd.jsx b/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplateAdd.jsx
index bbf39b61a9..b5f464db17 100644
--- a/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplateAdd.jsx
+++ b/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplateAdd.jsx
@@ -1,5 +1,86 @@
-import React from 'react';
+import React, { useState, useEffect, useCallback } from 'react';
+import PropTypes from 'prop-types';
+import { useHistory, Link } from 'react-router-dom';
+import { t } from '@lingui/macro';
+import { withI18n } from '@lingui/react';
+import { Card, PageSection } from '@patternfly/react-core';
+import { CardBody } from '../../components/Card';
+import { NotificationTemplatesAPI } from '../../api';
+import useRequest from '../../util/useRequest';
+import ContentError from '../../components/ContentError';
+import NotificationTemplateForm from './shared/NotificationTemplateForm';
 
-export default function NotificationTemplateAdd() {
-  return <div />;
+function NotificationTemplateAdd({ i18n }) {
+  const history = useHistory();
+  const [formError, setFormError] = useState(null);
+  const {
+    result: defaultMessages,
+    error,
+    request: fetchDefaultMessages,
+  } = useRequest(
+    useCallback(async () => {
+      const { data } = await NotificationTemplatesAPI.readOptions();
+      return data.actions.POST.messages;
+    }, [])
+  );
+
+  useEffect(() => {
+    fetchDefaultMessages();
+  }, [fetchDefaultMessages]);
+
+  const handleSubmit = async values => {
+    try {
+      const { data } = await NotificationTemplatesAPI.create(values);
+      history.push(`/notification_templates/${data.id}`);
+    } catch (err) {
+      setFormError(err);
+    }
+  };
+
+  const handleCancel = () => {
+    history.push('/notification_templates');
+  };
+
+  if (error) {
+    return (
+      <PageSection>
+        <Card>
+          <ContentError error={error}>
+            {error.response.status === 404 && (
+              <span>
+                {i18n._(t`Notification Template not found.`)}{' '}
+                <Link to="/notification_templates">
+                  {i18n._(t`View all Notification Templates.`)}
+                </Link>
+              </span>
+            )}
+          </ContentError>
+        </Card>
+      </PageSection>
+    );
+  }
+
+  return (
+    <PageSection>
+      <Card>
+        <CardBody>
+          {defaultMessages && (
+            <NotificationTemplateForm
+              defaultMessages={defaultMessages}
+              onSubmit={handleSubmit}
+              onCancel={handleCancel}
+              submitError={formError}
+            />
+          )}
+        </CardBody>
+      </Card>
+    </PageSection>
+  );
 }
+
+NotificationTemplateAdd.contextTypes = {
+  custom_virtualenvs: PropTypes.arrayOf(PropTypes.string),
+};
+
+export { NotificationTemplateAdd as _NotificationTemplateAdd };
+export default withI18n()(NotificationTemplateAdd);
diff --git a/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplateEdit/NotificationTemplateEdit.jsx b/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplateEdit/NotificationTemplateEdit.jsx
index 91844a477c..3cff9b0833 100644
--- a/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplateEdit/NotificationTemplateEdit.jsx
+++ b/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplateEdit/NotificationTemplateEdit.jsx
@@ -3,7 +3,6 @@ import PropTypes from 'prop-types';
 import { useHistory } from 'react-router-dom';
 import { CardBody } from '../../../components/Card';
 import { NotificationTemplatesAPI } from '../../../api';
-
 import NotificationTemplateForm from '../shared/NotificationTemplateForm';
 
 function NotificationTemplateEdit({ template, defaultMessages }) {
diff --git a/awx/ui_next/src/screens/NotificationTemplate/shared/NotificationTemplateForm.jsx b/awx/ui_next/src/screens/NotificationTemplate/shared/NotificationTemplateForm.jsx
index 3588fe142f..5f3b6d3df5 100644
--- a/awx/ui_next/src/screens/NotificationTemplate/shared/NotificationTemplateForm.jsx
+++ b/awx/ui_next/src/screens/NotificationTemplate/shared/NotificationTemplateForm.jsx
@@ -14,7 +14,6 @@ import { FormColumnLayout } from '../../../components/FormLayout';
 import TypeInputsSubForm from './TypeInputsSubForm';
 import CustomMessagesSubForm from './CustomMessagesSubForm';
 import typeFieldNames, { initialConfigValues } from './typeFieldNames';
-import { NotificationTemplate } from '../../../types';
 
 function NotificationTemplateFormFields({ i18n, defaultMessages }) {
   const [orgField, orgMeta, orgHelpers] = useField('organization');
@@ -98,12 +97,20 @@ function NotificationTemplateForm({
   i18n,
 }) {
   const handleSubmit = values => {
-    onSubmit(normalizeFields(values, defaultMessages));
+    onSubmit(
+      normalizeFields(
+        {
+          ...values,
+          organization: values.organization?.id,
+        },
+        defaultMessages
+      )
+    );
   };
 
   let emailOptions = '';
   if (template.notification_type === 'email') {
-    emailOptions = template.notification_configuration.use_ssl ? 'ssl' : 'tls';
+    emailOptions = template.notification_configuration?.use_ssl ? 'ssl' : 'tls';
   }
   const messages = template.messages || { workflow_approval: {} };
   const defs = defaultMessages[template.notification_type || 'email'];
@@ -125,6 +132,7 @@ function NotificationTemplateForm({
           ...template.notification_configuration,
         },
         emailOptions,
+        organization: template.summary_fields?.organization,
         messages: {
           started: { ...mergeDefaultMessages(messages.started, defs.started) },
           success: { ...mergeDefaultMessages(messages.success, defs.success) },
@@ -180,7 +188,7 @@ function NotificationTemplateForm({
 }
 
 NotificationTemplateForm.propTypes = {
-  template: NotificationTemplate,
+  template: shape(),
   defaultMessages: shape().isRequired,
   onSubmit: func.isRequired,
   onCancel: func.isRequired,
@@ -244,6 +252,7 @@ function normalizeFields(values, defaultMessages) {
 function normalizeTypeFields(values) {
   const stripped = {};
   const fields = typeFieldNames[values.notification_type];
+
   fields.forEach(fieldName => {
     if (typeof values.notification_configuration[fieldName] !== 'undefined') {
       stripped[fieldName] = values.notification_configuration[fieldName];
@@ -253,16 +262,21 @@ function normalizeTypeFields(values) {
     stripped.use_ssl = values.emailOptions === 'ssl';
     stripped.use_tls = !stripped.use_ssl;
   }
+  const { emailOptions, ...rest } = values;
 
   return {
-    ...values,
+    ...rest,
     notification_configuration: stripped,
   };
 }
 
 function normalizeMessageFields(values, defaults) {
-  if (!values.useCustomMessages) {
-    return values;
+  const { useCustomMessages, ...rest } = values;
+  if (!useCustomMessages) {
+    return {
+      ...rest,
+      messages: null,
+    };
   }
   const { messages } = values;
   const defs = defaults[values.notification_type];
@@ -297,8 +311,9 @@ function normalizeMessageFields(values, defaults) {
       ),
     },
   };
+
   return {
-    ...values,
+    ...rest,
     messages: nonDefaultMessages,
   };
 }
diff --git a/awx/ui_next/src/screens/NotificationTemplate/shared/NotificationTemplateForm.test.jsx b/awx/ui_next/src/screens/NotificationTemplate/shared/NotificationTemplateForm.test.jsx
new file mode 100644
index 0000000000..c828b1450f
--- /dev/null
+++ b/awx/ui_next/src/screens/NotificationTemplate/shared/NotificationTemplateForm.test.jsx
@@ -0,0 +1,118 @@
+import React from 'react';
+import { act } from 'react-dom/test-utils';
+import { mountWithContexts } from '../../../../testUtils/enzymeHelpers';
+import NotificationTemplateForm from './NotificationTemplateForm';
+
+jest.mock('../../../api/models/NotificationTemplates');
+
+const template = {
+  id: 3,
+  notification_type: 'slack',
+  name: 'Test Notification',
+  description: 'a sample notification',
+  url: '/notification_templates/3',
+  organization: 1,
+  summary_fields: {
+    user_capabilities: {
+      edit: true,
+    },
+    recent_notifications: [
+      {
+        status: 'success',
+      },
+    ],
+    organization: {
+      id: 1,
+      name: 'The Organization',
+    },
+  },
+};
+
+const messageDef = {
+  message: 'default message',
+  body: 'default body',
+};
+const defaults = {
+  started: messageDef,
+  success: messageDef,
+  error: messageDef,
+  workflow_approval: {
+    approved: messageDef,
+    denied: messageDef,
+    running: messageDef,
+    timed_out: messageDef,
+  },
+};
+const defaultMessages = {
+  email: defaults,
+  slack: defaults,
+  twilio: defaults,
+};
+
+describe('<NotificationTemplateForm />', () => {
+  test('should render form fields', () => {
+    const wrapper = mountWithContexts(
+      <NotificationTemplateForm
+        template={template}
+        defaultMessages={defaultMessages}
+        detailUrl="/notification_templates/3/detail"
+        onSubmit={jest.fn()}
+        onCancel={jest.fn()}
+      />
+    );
+
+    expect(wrapper.find('input#notification-name').prop('value')).toEqual(
+      'Test Notification'
+    );
+    expect(
+      wrapper.find('input#notification-description').prop('value')
+    ).toEqual('a sample notification');
+    expect(wrapper.find('OrganizationLookup').prop('value')).toEqual({
+      id: 1,
+      name: 'The Organization',
+    });
+    expect(wrapper.find('AnsibleSelect').prop('value')).toEqual('slack');
+    expect(wrapper.find('TypeInputsSubForm').prop('type')).toEqual('slack');
+    expect(wrapper.find('CustomMessagesSubForm').prop('type')).toEqual('slack');
+    expect(
+      wrapper.find('CustomMessagesSubForm').prop('defaultMessages')
+    ).toEqual(defaultMessages);
+  });
+
+  test('should submit', async () => {
+    const handleSubmit = jest.fn();
+    const wrapper = mountWithContexts(
+      <NotificationTemplateForm
+        template={{
+          ...template,
+          notification_configuration: {
+            channels: ['#foo'],
+            token: 'abc123',
+          },
+        }}
+        defaultMessages={defaultMessages}
+        detailUrl="/notification_templates/3/detail"
+        onSubmit={handleSubmit}
+        onCancel={jest.fn()}
+      />
+    );
+
+    await act(async () => {
+      wrapper.find('FormActionGroup').invoke('onSubmit')();
+    });
+    wrapper.update();
+
+    expect(handleSubmit).toHaveBeenCalledWith({
+      name: 'Test Notification',
+      description: 'a sample notification',
+      organization: 1,
+      notification_type: 'slack',
+      notification_configuration: {
+        channels: ['#foo'],
+        hex_color: '',
+        token: 'abc123',
+      },
+      messages: null,
+    });
+  });
+});

From e830da97f307ff482aa9eeeaae442b87e6e0fac9 Mon Sep 17 00:00:00 2001
From: mabashian <mabashia@redhat.com>
Date: Wed, 26 Aug 2020 10:10:51 -0400
Subject: [PATCH 39/69] Fix broken credential form tests after id change

---
 .../src/screens/Credential/shared/CredentialForm.test.jsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/awx/ui_next/src/screens/Credential/shared/CredentialForm.test.jsx b/awx/ui_next/src/screens/Credential/shared/CredentialForm.test.jsx
index 1959c308e2..58fb17ec4e 100644
--- a/awx/ui_next/src/screens/Credential/shared/CredentialForm.test.jsx
+++ b/awx/ui_next/src/screens/Credential/shared/CredentialForm.test.jsx
@@ -136,14 +136,14 @@ describe('<CredentialForm />', () => {
     test('should display cred type subform when scm type select has a value', async () => {
       await act(async () => {
         await wrapper
-          .find('AnsibleSelect[id="credential_type"]')
+          .find('AnsibleSelect[id="credential-type"]')
           .invoke('onChange')(null, 1);
       });
       wrapper.update();
       machineFieldExpects();
       await act(async () => {
         await wrapper
-          .find('AnsibleSelect[id="credential_type"]')
+          .find('AnsibleSelect[id="credential-type"]')
           .invoke('onChange')(null, 2);
       });
       wrapper.update();
@@ -152,7 +152,7 @@ describe('<CredentialForm />', () => {
     test('should update expected fields when gce service account json file uploaded', async () => {
       await act(async () => {
         await wrapper
-          .find('AnsibleSelect[id="credential_type"]')
+          .find('AnsibleSelect[id="credential-type"]')
           .invoke('onChange')(null, 10);
       });
       wrapper.update();
@@ -212,7 +212,7 @@ describe('<CredentialForm />', () => {
     test('should show error when error thrown parsing JSON', async () => {
       await act(async () => {
         await wrapper
-          .find('AnsibleSelect[id="credential_type"]')
+          .find('AnsibleSelect[id="credential-type"]')
           .invoke('onChange')(null, 10);
       });
       wrapper.update();

From 4a616d9f81353e3417110d03800e07279dca226c Mon Sep 17 00:00:00 2001
From: Keith Grant <keithjgrant@redhat.com>
Date: Mon, 31 Aug 2020 09:38:28 -0700
Subject: [PATCH 40/69] ensure notification template re-loads after saving

---
 .../screens/NotificationTemplate/NotificationTemplate.jsx   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplate.jsx b/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplate.jsx
index cc32c9eb64..005dd0e40b 100644
--- a/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplate.jsx
+++ b/awx/ui_next/src/screens/NotificationTemplate/NotificationTemplate.jsx
@@ -45,9 +45,9 @@ function NotificationTemplate({ setBreadcrumb, i18n }) {
 
   useEffect(() => {
     fetchTemplate();
-  }, [fetchTemplate]);
+  }, [fetchTemplate, location.pathname]);
 
-  if (error) {
+  if (!isLoading && error) {
     return (
       <PageSection>
         <Card>
@@ -66,7 +66,7 @@ function NotificationTemplate({ setBreadcrumb, i18n }) {
     );
   }
 
-  const showCardHeader = !isLoading && !location.pathname.endsWith('edit');
+  const showCardHeader = !location.pathname.endsWith('edit');
   const tabs = [
     {
       name: (

From c700d07a0abeb457d912ee4335eec27c254c5ace Mon Sep 17 00:00:00 2001
From: Keith Grant <keithjgrant@redhat.com>
Date: Mon, 31 Aug 2020 10:12:52 -0700
Subject: [PATCH 41/69] fix lint error

---
 awx/ui_next/src/components/FormField/ArrayTextField.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/awx/ui_next/src/components/FormField/ArrayTextField.jsx b/awx/ui_next/src/components/FormField/ArrayTextField.jsx
index 5f6609e1e1..862d48901b 100644
--- a/awx/ui_next/src/components/FormField/ArrayTextField.jsx
+++ b/awx/ui_next/src/components/FormField/ArrayTextField.jsx
@@ -40,8 +40,8 @@ function ArrayTextField(props) {
         {...rest}
         {...field}
         value={value.join('\n')}
-        onChange={value => {
-          helpers.setValue(value.split('\n').map(v => v.trim()));
+        onChange={val => {
+          helpers.setValue(val.split('\n').map(v => v.trim()));
         }}
       />
     </FormGroup>

From 7ab9d899e4de0aa2b4fa3a1950a4093fe384fabd Mon Sep 17 00:00:00 2001
From: Keith Grant <keithjgrant@redhat.com>
Date: Mon, 31 Aug 2020 13:50:55 -0700
Subject: [PATCH 42/69] mark text for translation

---
 .../shared/CustomMessagesSubForm.jsx          | 52 ++++++++++---------
 1 file changed, 27 insertions(+), 25 deletions(-)

diff --git a/awx/ui_next/src/screens/NotificationTemplate/shared/CustomMessagesSubForm.jsx b/awx/ui_next/src/screens/NotificationTemplate/shared/CustomMessagesSubForm.jsx
index 9387a84a39..ede9ac1d79 100644
--- a/awx/ui_next/src/screens/NotificationTemplate/shared/CustomMessagesSubForm.jsx
+++ b/awx/ui_next/src/screens/NotificationTemplate/shared/CustomMessagesSubForm.jsx
@@ -1,7 +1,7 @@
 import 'styled-components/macro';
 import React, { useEffect, useRef } from 'react';
 import { withI18n } from '@lingui/react';
-import { t } from '@lingui/macro';
+import { t, Trans } from '@lingui/macro';
 import { useField, useFormikContext } from 'formik';
 import { Switch, Text } from '@patternfly/react-core';
 import {
@@ -69,30 +69,32 @@ function CustomMessagesSubForm({ defaultMessages, type, i18n }) {
             css="margin-bottom: var(--pf-c-content--MarginBottom)"
           >
             <small>
-              Use custom messages to change the content of notifications sent
-              when a job starts, succeeds, or fails. Use curly braces to access
-              information about the job:{' '}
-              <code>
-                {'{{'} job_friendly_name {'}}'}
-              </code>
-              ,{' '}
-              <code>
-                {'{{'} url {'}}'}
-              </code>
-              , or attributes of the job such as{' '}
-              <code>
-                {'{{'} job.status {'}}'}
-              </code>
-              . You may apply a number of possible variables in the message.
-              Refer to the{' '}
-              <a
-                href="https://docs.ansible.com/ansible-tower/latest/html/userguide/notifications.html#create-custom-notifications"
-                target="_blank"
-                rel="noopener noreferrer"
-              >
-                Ansible Tower documentation
-              </a>{' '}
-              for more details.
+              <Trans>
+                Use custom messages to change the content of notifications sent
+                when a job starts, succeeds, or fails. Use curly braces to
+                access information about the job:{' '}
+                <code>
+                  {'{{'} job_friendly_name {'}}'}
+                </code>
+                ,{' '}
+                <code>
+                  {'{{'} url {'}}'}
+                </code>
+                , or attributes of the job such as{' '}
+                <code>
+                  {'{{'} job.status {'}}'}
+                </code>
+                . You may apply a number of possible variables in the message.
+                Refer to the{' '}
+                <a
+                  href="https://docs.ansible.com/ansible-tower/latest/html/userguide/notifications.html#create-custom-notifications"
+                  target="_blank"
+                  rel="noopener noreferrer"
+                >
+                  Ansible Tower documentation
+                </a>{' '}
+                for more details.
+              </Trans>
             </small>
           </Text>
           <FormFullWidthLayout>

From 95c4b6c922d250ba6a0ef6e77c1b16bba5cc0d8b Mon Sep 17 00:00:00 2001
From: Keith Grant <keithjgrant@redhat.com>
Date: Mon, 31 Aug 2020 15:42:03 -0700
Subject: [PATCH 43/69] trying to force tests to re-run

---
 .../src/screens/Credential/shared/CredentialForm.test.jsx       | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/awx/ui_next/src/screens/Credential/shared/CredentialForm.test.jsx b/awx/ui_next/src/screens/Credential/shared/CredentialForm.test.jsx
index 58fb17ec4e..17b71e4398 100644
--- a/awx/ui_next/src/screens/Credential/shared/CredentialForm.test.jsx
+++ b/awx/ui_next/src/screens/Credential/shared/CredentialForm.test.jsx
@@ -149,6 +149,7 @@ describe('<CredentialForm />', () => {
       wrapper.update();
       sourceFieldExpects();
     });
+
     test('should update expected fields when gce service account json file uploaded', async () => {
       await act(async () => {
         await wrapper
@@ -182,6 +183,7 @@ describe('<CredentialForm />', () => {
         '-----BEGIN PRIVATE KEY-----\nAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\n-----END PRIVATE KEY-----\n'
       );
     });
+
     test('should clear expected fields when file clear button clicked', async () => {
       await act(async () => {
         wrapper

From 055abd57cd3e2e029923bc2c93dd2111a8eb9409 Mon Sep 17 00:00:00 2001
From: Keith Grant <keithjgrant@redhat.com>
Date: Mon, 31 Aug 2020 16:09:28 -0700
Subject: [PATCH 44/69] fix new test from rebase

---
 .../src/screens/Credential/shared/CredentialForm.test.jsx       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/awx/ui_next/src/screens/Credential/shared/CredentialForm.test.jsx b/awx/ui_next/src/screens/Credential/shared/CredentialForm.test.jsx
index 17b71e4398..7f6fa35aa8 100644
--- a/awx/ui_next/src/screens/Credential/shared/CredentialForm.test.jsx
+++ b/awx/ui_next/src/screens/Credential/shared/CredentialForm.test.jsx
@@ -245,7 +245,7 @@ describe('<CredentialForm />', () => {
     test('should show Test button when external credential type is selected', async () => {
       await act(async () => {
         await wrapper
-          .find('AnsibleSelect[id="credential_type"]')
+          .find('AnsibleSelect[id="credential-type"]')
           .invoke('onChange')(null, 21);
       });
       wrapper.update();

From b119bc475f1cf1dc50e7afc10d410fe954015738 Mon Sep 17 00:00:00 2001
From: Keith Grant <keithjgrant@redhat.com>
Date: Fri, 4 Sep 2020 09:07:07 -0700
Subject: [PATCH 45/69] convert http headers field to string for codemirror

---
 .../shared/CustomMessagesSubForm.jsx          |  2 +-
 .../shared/NotificationTemplateForm.jsx       |  6 +++
 .../shared/TypeInputsSubForm.jsx              | 41 +++++--------------
 3 files changed, 17 insertions(+), 32 deletions(-)

diff --git a/awx/ui_next/src/screens/NotificationTemplate/shared/CustomMessagesSubForm.jsx b/awx/ui_next/src/screens/NotificationTemplate/shared/CustomMessagesSubForm.jsx
index ede9ac1d79..7dd5b2b4bd 100644
--- a/awx/ui_next/src/screens/NotificationTemplate/shared/CustomMessagesSubForm.jsx
+++ b/awx/ui_next/src/screens/NotificationTemplate/shared/CustomMessagesSubForm.jsx
@@ -8,7 +8,7 @@ import {
   FormFullWidthLayout,
   SubFormLayout,
 } from '../../../components/FormLayout';
-import { CodeMirrorField } from '../../../components/CodeMirrorInput';
+import CodeMirrorField from '../../../components/CodeMirrorInput/CodeMirrorField';
 
 function CustomMessagesSubForm({ defaultMessages, type, i18n }) {
   const [useCustomField, , useCustomHelpers] = useField('useCustomMessages');
diff --git a/awx/ui_next/src/screens/NotificationTemplate/shared/NotificationTemplateForm.jsx b/awx/ui_next/src/screens/NotificationTemplate/shared/NotificationTemplateForm.jsx
index 5f3b6d3df5..6999ff62dd 100644
--- a/awx/ui_next/src/screens/NotificationTemplate/shared/NotificationTemplateForm.jsx
+++ b/awx/ui_next/src/screens/NotificationTemplate/shared/NotificationTemplateForm.jsx
@@ -121,6 +121,8 @@ function NotificationTemplateForm({
     };
   };
 
+  const { headers } = template?.notification_configuration || {};
+
   return (
     <Formik
       initialValues={{
@@ -130,6 +132,7 @@ function NotificationTemplateForm({
         notification_configuration: {
           ...initialConfigValues,
           ...template.notification_configuration,
+          headers: headers ? JSON.stringify(headers, null, 2) : null,
         },
         emailOptions,
         organization: template.summary_fields?.organization,
@@ -262,6 +265,9 @@ function normalizeTypeFields(values) {
     stripped.use_ssl = values.emailOptions === 'ssl';
     stripped.use_tls = !stripped.use_ssl;
   }
+  if (values.notification_type === 'webhook') {
+    stripped.headers = stripped.headers ? JSON.parse(stripped.headers) : {};
+  }
   const { emailOptions, ...rest } = values;
 
   return {
diff --git a/awx/ui_next/src/screens/NotificationTemplate/shared/TypeInputsSubForm.jsx b/awx/ui_next/src/screens/NotificationTemplate/shared/TypeInputsSubForm.jsx
index 434c0e6633..e6a2829fcc 100644
--- a/awx/ui_next/src/screens/NotificationTemplate/shared/TypeInputsSubForm.jsx
+++ b/awx/ui_next/src/screens/NotificationTemplate/shared/TypeInputsSubForm.jsx
@@ -11,11 +11,10 @@ import {
 import FormField, {
   PasswordField,
   CheckboxField,
-  FieldTooltip,
   ArrayTextField,
 } from '../../../components/FormField';
 import AnsibleSelect from '../../../components/AnsibleSelect';
-import CodeMirrorInput from '../../../components/CodeMirrorInput';
+import { CodeMirrorField } from '../../../components/CodeMirrorInput';
 import {
   combine,
   required,
@@ -438,10 +437,6 @@ function TwilioFields({ i18n }) {
 }
 
 function WebhookFields({ i18n }) {
-  const [headersField, headersMeta, headersHelpers] = useField({
-    name: 'notification_configuration.headers',
-    validate: required(i18n._(t`Select enter a value for this field`), i18n),
-  });
   const [methodField, methodMeta] = useField({
     name: 'notification_configuration.http_method',
     validate: required(i18n._(t`Select a value for this field`), i18n),
@@ -473,31 +468,15 @@ function WebhookFields({ i18n }) {
         name="notification_configuration.disable_ssl_verification"
       />
       <FormFullWidthLayout>
-        <FormGroup
-          fieldId="webhook-headers"
-          helperTextInvalid={headersMeta.error}
-          isRequired
-          validated={
-            !headersMeta.touched || !headersMeta.error ? 'default' : 'error'
-          }
-          label={i18n._(t`HTTP headers`)}
-          labelIcon={
-            <FieldTooltip
-              content={i18n._(t`Specify HTTP Headers in JSON format. Refer to
-              the Ansible Tower documentation for example syntax.`)}
-            />
-          }
-        >
-          <CodeMirrorInput
-            {...headersField}
-            id="webhook-headers"
-            onChange={value => {
-              headersHelpers.setValue(value);
-            }}
-            mode="javascript"
-            rows={5}
-          />
-        </FormGroup>
+        <CodeMirrorField
+          id="webhook-headers"
+          name="notification_configuration.headers"
+          label={i18n._(t`HTTP Headers`)}
+          mode="javascript"
+          tooltip={i18n._(t`Specify HTTP Headers in JSON format. Refer to
+        the Ansible Tower documentation for example syntax.`)}
+          rows={5}
+        />
       </FormFullWidthLayout>
       <FormGroup
         fieldId="webhook-http-method"

From 9711c3367531ac802fcac8014710d3ffc1ccd458 Mon Sep 17 00:00:00 2001
From: Keith Grant <keithjgrant@redhat.com>
Date: Fri, 4 Sep 2020 15:35:30 -0700
Subject: [PATCH 46/69] fix multiple notification form bugs

---
 .../components/FormField/FormSubmitError.jsx  | 29 ++++++++++++-------
 .../shared/NotificationTemplateForm.jsx       |  3 +-
 .../shared/TypeInputsSubForm.jsx              | 12 ++++----
 .../shared/typeFieldNames.js                  |  3 +-
 awx/ui_next/src/util/validators.jsx           |  3 ++
 5 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/awx/ui_next/src/components/FormField/FormSubmitError.jsx b/awx/ui_next/src/components/FormField/FormSubmitError.jsx
index 44ad062f59..b93cfa89f1 100644
--- a/awx/ui_next/src/components/FormField/FormSubmitError.jsx
+++ b/awx/ui_next/src/components/FormField/FormSubmitError.jsx
@@ -1,6 +1,7 @@
 import React, { useState, useEffect } from 'react';
 import { useFormikContext } from 'formik';
 import { Alert } from '@patternfly/react-core';
+import { FormFullWidthLayout } from '../FormLayout';
 
 const findErrorStrings = (obj, messages = []) => {
   if (typeof obj === 'string') {
@@ -35,7 +36,13 @@ function FormSubmitError({ error }) {
       typeof error.response.data === 'object' &&
       Object.keys(error.response.data).length > 0
     ) {
-      const errorMessages = error.response.data;
+      const errorMessages = {};
+      Object.keys(error.response.data).forEach(fieldName => {
+        const errors = error.response.data[fieldName];
+        if (errors && errors.length) {
+          errorMessages[fieldName] = errors.join(' ');
+        }
+      });
       setErrors(errorMessages);
 
       const messages = findErrorStrings(error.response.data);
@@ -52,15 +59,17 @@ function FormSubmitError({ error }) {
   }
 
   return (
-    <Alert
-      variant="danger"
-      isInline
-      title={
-        Array.isArray(errorMessage)
-          ? errorMessage.map(msg => <div key={msg}>{msg}</div>)
-          : errorMessage
-      }
-    />
+    <FormFullWidthLayout>
+      <Alert
+        variant="danger"
+        isInline
+        title={
+          Array.isArray(errorMessage)
+            ? errorMessage.map(msg => <div key={msg}>{msg}</div>)
+            : errorMessage
+        }
+      />
+    </FormFullWidthLayout>
   );
 }
 
diff --git a/awx/ui_next/src/screens/NotificationTemplate/shared/NotificationTemplateForm.jsx b/awx/ui_next/src/screens/NotificationTemplate/shared/NotificationTemplateForm.jsx
index 6999ff62dd..50477fabeb 100644
--- a/awx/ui_next/src/screens/NotificationTemplate/shared/NotificationTemplateForm.jsx
+++ b/awx/ui_next/src/screens/NotificationTemplate/shared/NotificationTemplateForm.jsx
@@ -54,12 +54,13 @@ function NotificationTemplateFormFields({ i18n, defaultMessages }) {
         fieldId="notification-type"
         helperTextInvalid={typeMeta.error}
         isRequired
-        validated={!typeMeta.touched || typeMeta.error ? 'default' : 'error'}
+        validated={!typeMeta.touched || !typeMeta.error ? 'default' : 'error'}
         label={i18n._(t`Type`)}
       >
         <AnsibleSelect
           {...typeField}
           id="notification-type"
+          isValid={!typeMeta.touched || !typeMeta.error}
           data={[
             {
               value: '',
diff --git a/awx/ui_next/src/screens/NotificationTemplate/shared/TypeInputsSubForm.jsx b/awx/ui_next/src/screens/NotificationTemplate/shared/TypeInputsSubForm.jsx
index e6a2829fcc..14a38e8f32 100644
--- a/awx/ui_next/src/screens/NotificationTemplate/shared/TypeInputsSubForm.jsx
+++ b/awx/ui_next/src/screens/NotificationTemplate/shared/TypeInputsSubForm.jsx
@@ -20,6 +20,7 @@ import {
   required,
   requiredEmail,
   url,
+  minMaxValue,
 } from '../../../util/validators';
 import { NotificationType } from '../../../types';
 
@@ -104,16 +105,17 @@ function EmailFields({ i18n }) {
         label={i18n._(t`Port`)}
         name="notification_configuration.port"
         type="number"
-        validate={required(null, i18n)}
+        validate={combine([required(null, i18n), minMaxValue(1, 65535, i18n)])}
         isRequired
         min="0"
+        max="65535"
       />
       <FormField
         id="email-timeout"
         label={i18n._(t`Timeout`)}
         name="notification_configuration.timeout"
         type="number"
-        validate={required(null, i18n)}
+        validate={combine([required(null, i18n), minMaxValue(1, 120, i18n)])}
         isRequired
         min="1"
         max="120"
@@ -306,7 +308,7 @@ function PagerdutyFields({ i18n }) {
         label={i18n._(t`Pagerduty subdomain`)}
         name="notification_configuration.subdomain"
         type="text"
-        validate={required(i18n)}
+        validate={required(null, i18n)}
         isRequired
       />
       <FormField
@@ -314,7 +316,7 @@ function PagerdutyFields({ i18n }) {
         label={i18n._(t`API service/integration key`)}
         name="notification_configuration.service_key"
         type="text"
-        validate={required(i18n)}
+        validate={required(null, i18n)}
         isRequired
       />
       <FormField
@@ -322,7 +324,7 @@ function PagerdutyFields({ i18n }) {
         label={i18n._(t`Client identifier`)}
         name="notification_configuration.client_name"
         type="text"
-        validate={required(i18n)}
+        validate={required(null, i18n)}
         isRequired
       />
     </>
diff --git a/awx/ui_next/src/screens/NotificationTemplate/shared/typeFieldNames.js b/awx/ui_next/src/screens/NotificationTemplate/shared/typeFieldNames.js
index 7f87baa41a..4dd991cfa9 100644
--- a/awx/ui_next/src/screens/NotificationTemplate/shared/typeFieldNames.js
+++ b/awx/ui_next/src/screens/NotificationTemplate/shared/typeFieldNames.js
@@ -48,7 +48,8 @@ export default typeFieldNames;
 const initialConfigValues = {};
 Object.keys(typeFieldNames).forEach(key => {
   typeFieldNames[key].forEach(fieldName => {
-    initialConfigValues[fieldName] = '';
+    const isBoolean = fieldName.includes('_ssl');
+    initialConfigValues[fieldName] = isBoolean ? false : '';
   });
 });
 
diff --git a/awx/ui_next/src/util/validators.jsx b/awx/ui_next/src/util/validators.jsx
index 959740d317..111736c3ed 100644
--- a/awx/ui_next/src/util/validators.jsx
+++ b/awx/ui_next/src/util/validators.jsx
@@ -78,6 +78,9 @@ export function integer(i18n) {
 
 export function url(i18n) {
   return value => {
+    if (!value) {
+      return undefined;
+    }
     // URL regex from https://urlregex.com/
     if (
       // eslint-disable-next-line max-len

From a0b8f6a25dba1d0bd37ca15b7d482d0150457463 Mon Sep 17 00:00:00 2001
From: beeankha <bstohrer@redhat.com>
Date: Fri, 4 Sep 2020 18:40:18 -0400
Subject: [PATCH 47/69] Make org an optional parameter for both inv source and
 inv source update modules

---
 .../plugins/modules/tower_inventory_source.py | 15 +++-----
 .../modules/tower_inventory_source_update.py  | 14 +++----
 .../test/awx/test_inventory_source.py         | 37 +++++++++++++------
 .../tower_inventory_source/tasks/main.yml     |  2 -
 .../tasks/main.yml                            |  8 ++--
 .../template_galaxy/templates/README.md.j2    |  1 -
 6 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/awx_collection/plugins/modules/tower_inventory_source.py b/awx_collection/plugins/modules/tower_inventory_source.py
index 7c7c506826..0145671933 100644
--- a/awx_collection/plugins/modules/tower_inventory_source.py
+++ b/awx_collection/plugins/modules/tower_inventory_source.py
@@ -131,7 +131,6 @@ options:
     organization:
       description:
         - Name of the inventory source's inventory's organization.
-      required: True
       type: str
 extends_documentation_fragment: awx.awx.auth
 '''
@@ -174,7 +173,7 @@ def main():
         enabled_value=dict(),
         host_filter=dict(),
         credential=dict(),
-        organization=dict(required=True),
+        organization=dict(),
         overwrite=dict(type='bool'),
         overwrite_vars=dict(type='bool'),
         custom_virtualenv=dict(),
@@ -203,14 +202,10 @@ def main():
     source_project = module.params.get('source_project')
     state = module.params.get('state')
 
-    # Attempt to look up inventory source based on the provided name and inventory ID
-    org_id = module.resolve_name_to_id('organizations', organization)
-    inventory_object = module.get_one('inventories', **{
-        'data': {
-            'name': inventory,
-            'organization': org_id,
-        }
-    })
+    lookup_data = {'name': inventory}
+    if organization:
+        lookup_data['organization'] = module.resolve_name_to_id('organizations', organization)
+    inventory_object = module.get_one('inventories', data=lookup_data)
 
     if not inventory_object:
         module.fail_json(msg='The specified inventory was not found.')
diff --git a/awx_collection/plugins/modules/tower_inventory_source_update.py b/awx_collection/plugins/modules/tower_inventory_source_update.py
index 8579126dd3..abb55d1941 100644
--- a/awx_collection/plugins/modules/tower_inventory_source_update.py
+++ b/awx_collection/plugins/modules/tower_inventory_source_update.py
@@ -36,7 +36,6 @@ options:
       description:
         - Name of the inventory source's inventory's organization.
       type: str
-      required: True
     wait:
       description:
         - Wait for the job to complete.
@@ -91,7 +90,7 @@ def main():
     argument_spec = dict(
         inventory=dict(required=True),
         inventory_source=dict(required=True),
-        organization=dict(required=True),
+        organization=dict(),
         wait=dict(default=False, type='bool'),
         interval=dict(default=1.0, type='float'),
         timeout=dict(default=None, type='int'),
@@ -108,13 +107,10 @@ def main():
     interval = module.params.get('interval')
     timeout = module.params.get('timeout')
 
-    org_id = module.resolve_name_to_id('organizations', organization)
-    inventory_object = module.get_one('inventories', **{
-        'data': {
-            'name': inventory,
-            'organization': org_id,
-        }
-    })
+    lookup_data = {'name': inventory}
+    if organization:
+        lookup_data['organization'] = module.resolve_name_to_id('organizations', organization)
+    inventory_object = module.get_one('inventories', data=lookup_data)
 
     if not inventory_object:
         module.fail_json(msg='The specified inventory was not found.')
diff --git a/awx_collection/test/awx/test_inventory_source.py b/awx_collection/test/awx/test_inventory_source.py
index b1b362efad..9f52574670 100644
--- a/awx_collection/test/awx/test_inventory_source.py
+++ b/awx_collection/test/awx/test_inventory_source.py
@@ -24,12 +24,11 @@ def project(base_inventory):
 
 
 @pytest.mark.django_db
-def test_inventory_source_create(run_module, admin_user, base_inventory, project, organization):
+def test_inventory_source_create(run_module, admin_user, base_inventory, project):
     source_path = '/var/lib/awx/example_source_path/'
     result = run_module('tower_inventory_source', dict(
         name='foo',
         inventory=base_inventory.name,
-        organization='test-org',
         state='present',
         source='scm',
         source_path=source_path,
@@ -46,6 +45,30 @@ def test_inventory_source_create(run_module, admin_user, base_inventory, project
     }
 
 
+@pytest.mark.django_db
+def test_create_inventory_source_implied_org(run_module, admin_user):
+    org = Organization.objects.create(name='test-org')
+    inv = Inventory.objects.create(name='test-inv', organization=org)
+
+    # Credential is not required for ec2 source, because of IAM roles
+    result = run_module('tower_inventory_source', dict(
+        name='Test Inventory Source',
+        inventory='test-inv',
+        source='ec2',
+        state='present'
+    ), admin_user)
+    assert result.pop('changed', None), result
+
+    inv_src = InventorySource.objects.get(name='Test Inventory Source')
+    assert inv_src.inventory == inv
+
+    result.pop('invocation')
+    assert result == {
+        "name": "Test Inventory Source",
+        "id": inv_src.id,
+    }
+
+
 @pytest.mark.django_db
 def test_create_inventory_source_multiple_orgs(run_module, admin_user):
     org = Organization.objects.create(name='test-org')
@@ -82,7 +105,6 @@ def test_create_inventory_source_with_venv(run_module, admin_user, base_inventor
         result = run_module('tower_inventory_source', dict(
             name='foo',
             inventory=base_inventory.name,
-            organization='test-org',
             state='present',
             source='scm',
             source_project=project.name,
@@ -99,7 +121,7 @@ def test_create_inventory_source_with_venv(run_module, admin_user, base_inventor
 
 
 @pytest.mark.django_db
-def test_custom_venv_no_op(run_module, admin_user, base_inventory, mocker, project, organization):
+def test_custom_venv_no_op(run_module, admin_user, base_inventory, mocker, project):
     """If the inventory source is modified, then it should not blank fields
     unrelated to the params that the user passed.
     This enforces assumptions about the behavior of the AnsibleModule
@@ -119,7 +141,6 @@ def test_custom_venv_no_op(run_module, admin_user, base_inventory, mocker, proje
             name='foo',
             description='this is the changed description',
             inventory=base_inventory.name,
-            organization='test-org',
             source='scm',  # is required, but behavior is arguable
             state='present',
             source_project=project.name,
@@ -136,7 +157,6 @@ def test_falsy_value(run_module, admin_user, base_inventory):
     result = run_module('tower_inventory_source', dict(
         name='falsy-test',
         inventory=base_inventory.name,
-        organization='test-org',
         source='ec2',
         update_on_launch=True
     ), admin_user)
@@ -149,7 +169,6 @@ def test_falsy_value(run_module, admin_user, base_inventory):
     result = run_module('tower_inventory_source', dict(
         name='falsy-test',
         inventory=base_inventory.name,
-        organization='test-org',
         # source='ec2',
         update_on_launch=False
     ), admin_user)
@@ -185,7 +204,6 @@ def test_missing_required_credential(run_module, admin_user, base_inventory):
     result = run_module('tower_inventory_source', dict(
         name='Test Azure Source',
         inventory=base_inventory.name,
-        organization='test-org',
         source='azure_rm',
         state='present'
     ), admin_user)
@@ -199,7 +217,6 @@ def test_source_project_not_for_cloud(run_module, admin_user, base_inventory, pr
     result = run_module('tower_inventory_source', dict(
         name='Test ec2 Inventory Source',
         inventory=base_inventory.name,
-        organization='test-org',
         source='ec2',
         state='present',
         source_project=project.name
@@ -214,7 +231,6 @@ def test_source_path_not_for_cloud(run_module, admin_user, base_inventory):
     result = run_module('tower_inventory_source', dict(
         name='Test ec2 Inventory Source',
         inventory=base_inventory.name,
-        organization='test-org',
         source='ec2',
         state='present',
         source_path='where/am/I'
@@ -228,7 +244,6 @@ def test_source_path_not_for_cloud(run_module, admin_user, base_inventory):
 def test_scm_source_needs_project(run_module, admin_user, base_inventory):
     result = run_module('tower_inventory_source', dict(
         name='SCM inventory without project',
-        organization='test-org',
         inventory=base_inventory.name,
         state='present',
         source='scm',
diff --git a/awx_collection/tests/integration/targets/tower_inventory_source/tasks/main.yml b/awx_collection/tests/integration/targets/tower_inventory_source/tasks/main.yml
index 738d432711..fb5f33c3ca 100644
--- a/awx_collection/tests/integration/targets/tower_inventory_source/tasks/main.yml
+++ b/awx_collection/tests/integration/targets/tower_inventory_source/tasks/main.yml
@@ -31,7 +31,6 @@
     credential: "{{ openstack_cred }}"
     overwrite: true
     update_on_launch: true
-    organization: Default
     source_vars:
       private: false
     source: openstack
@@ -48,7 +47,6 @@
     credential: "Does Not Exit"
     source_project: "Does Not Exist"
     source_script: "Does Not Exist"
-    organization: Default
     state: absent
 
 - assert:
diff --git a/awx_collection/tests/integration/targets/tower_inventory_source_update/tasks/main.yml b/awx_collection/tests/integration/targets/tower_inventory_source_update/tasks/main.yml
index b151db90ba..36a4e4b058 100644
--- a/awx_collection/tests/integration/targets/tower_inventory_source_update/tasks/main.yml
+++ b/awx_collection/tests/integration/targets/tower_inventory_source_update/tasks/main.yml
@@ -34,14 +34,14 @@
         organization: "{{ org_name }}"
         state: present
 
-    - name: Create another inventory w/ same name
+    - name: Create another inventory w/ same name, different org
       tower_inventory:
         name: "{{ inv_name }}"
         organization: Default
         state: present
       register: created_inventory
 
-    - name: Create an Inventory Source
+    - name: Create an Inventory Source (specifically connected to the randomly generated org)
       tower_inventory_source:
         name: "{{ inv_source1 }}"
         source: scm
@@ -51,7 +51,7 @@
         organization: "{{ created_org.id }}"
         inventory: "{{ inv_name }}"
 
-    - name: Create Another Inventory Source (for testing org-based lookup)
+    - name: Create Another Inventory Source
       tower_inventory_source:
         name: "{{ inv_source2 }}"
         source: scm
@@ -61,7 +61,7 @@
         organization: Default
         inventory: "{{ inv_name }}"
 
-    - name: Create Yet Another Inventory Source (one more to make lookup plugin find multiple inventory sources)
+    - name: Create Yet Another Inventory Source (to make lookup plugin find multiple inv sources)
       tower_inventory_source:
         name: "{{ inv_source3 }}"
         source: scm
diff --git a/awx_collection/tools/roles/template_galaxy/templates/README.md.j2 b/awx_collection/tools/roles/template_galaxy/templates/README.md.j2
index e1de06ec97..8a5743d34f 100644
--- a/awx_collection/tools/roles/template_galaxy/templates/README.md.j2
+++ b/awx_collection/tools/roles/template_galaxy/templates/README.md.j2
@@ -104,7 +104,6 @@ The following notes are changes that may require changes to playbooks:
  - The `notification_configuration` parameter of `tower_notification_template` has changed from a string to a dict. Please use the `lookup` plugin to read an existing file into a dict.
  - `tower_credential` no longer supports passing a file name to ssh_key_data.
  - The HipChat `notification_type` has been removed and can no longer be created using the `tower_notification_template` module.
- - The `tower_inventory_source` module now requires the `organization` parameter in order to specify the inventory source's inventory's organization.
 
 {% if collection_package | lower() == "awx" %}
 ## Running Unit Tests

From 40d3e4ee8b99a3ecacac9232d596c11f85725d63 Mon Sep 17 00:00:00 2001
From: Keith Grant <keithjgrant@redhat.com>
Date: Fri, 4 Sep 2020 16:24:09 -0700
Subject: [PATCH 48/69] handle error string in FormSubmitError

---
 awx/ui_next/src/components/FormField/FormSubmitError.jsx | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/awx/ui_next/src/components/FormField/FormSubmitError.jsx b/awx/ui_next/src/components/FormField/FormSubmitError.jsx
index b93cfa89f1..2453720246 100644
--- a/awx/ui_next/src/components/FormField/FormSubmitError.jsx
+++ b/awx/ui_next/src/components/FormField/FormSubmitError.jsx
@@ -39,8 +39,13 @@ function FormSubmitError({ error }) {
       const errorMessages = {};
       Object.keys(error.response.data).forEach(fieldName => {
         const errors = error.response.data[fieldName];
-        if (errors && errors.length) {
+        if (!errors) {
+          return;
+        }
+        if (Array.isArray(errors.length)) {
           errorMessages[fieldName] = errors.join(' ');
+        } else {
+          errorMessages[fieldName] = errors;
         }
       });
       setErrors(errorMessages);

From fc4060778bab30c29826f963ef1a885aea856037 Mon Sep 17 00:00:00 2001
From: Alex Corey <alex.swansboro@gmail.com>
Date: Mon, 24 Aug 2020 11:18:24 -0400
Subject: [PATCH 49/69] Disables template and workflow template fields for
 users that do not have permissions for those fields.

---
 .../src/components/Lookup/InventoryLookup.jsx | 18 ++++++++++--
 awx/ui_next/src/components/Lookup/Lookup.jsx  | 11 ++++++--
 .../src/components/Lookup/ProjectLookup.jsx   |  5 +++-
 .../MultiSelect/useSyncedSelectValue.js       | 17 ++++++++---
 .../JobTemplateEdit/JobTemplateEdit.jsx       | 13 +--------
 .../Template/shared/JobTemplateForm.jsx       | 28 +++----------------
 .../Template/shared/PlaybookSelect.jsx        | 24 ++++++++++++----
 7 files changed, 66 insertions(+), 50 deletions(-)

diff --git a/awx/ui_next/src/components/Lookup/InventoryLookup.jsx b/awx/ui_next/src/components/Lookup/InventoryLookup.jsx
index 3abb85604e..102abc4d60 100644
--- a/awx/ui_next/src/components/Lookup/InventoryLookup.jsx
+++ b/awx/ui_next/src/components/Lookup/InventoryLookup.jsx
@@ -19,7 +19,13 @@ const QS_CONFIG = getQSConfig('inventory', {
 
 function InventoryLookup({ value, onChange, onBlur, required, i18n, history }) {
   const {
-    result: { inventories, count, relatedSearchableKeys, searchableKeys },
+    result: {
+      inventories,
+      count,
+      relatedSearchableKeys,
+      searchableKeys,
+      canEdit,
+    },
     request: fetchInventories,
     error,
     isLoading,
@@ -39,9 +45,16 @@ function InventoryLookup({ value, onChange, onBlur, required, i18n, history }) {
         searchableKeys: Object.keys(
           actionsResponse.data.actions?.GET || {}
         ).filter(key => actionsResponse.data.actions?.GET[key].filterable),
+        canEdit: Boolean(actionsResponse.data.actions.POST),
       };
     }, [history.location]),
-    { inventories: [], count: 0, relatedSearchableKeys: [], searchableKeys: [] }
+    {
+      inventories: [],
+      count: 0,
+      relatedSearchableKeys: [],
+      searchableKeys: [],
+      canEdit: false,
+    }
   );
 
   useEffect(() => {
@@ -58,6 +71,7 @@ function InventoryLookup({ value, onChange, onBlur, required, i18n, history }) {
         onBlur={onBlur}
         required={required}
         isLoading={isLoading}
+        isDisabled={!canEdit}
         qsConfig={QS_CONFIG}
         renderOptionsList={({ state, dispatch, canDelete }) => (
           <OptionsList
diff --git a/awx/ui_next/src/components/Lookup/Lookup.jsx b/awx/ui_next/src/components/Lookup/Lookup.jsx
index 68b4006f07..a0fbadcecb 100644
--- a/awx/ui_next/src/components/Lookup/Lookup.jsx
+++ b/awx/ui_next/src/components/Lookup/Lookup.jsx
@@ -27,6 +27,8 @@ import { QSConfig } from '../../types';
 
 const ChipHolder = styled.div`
   --pf-c-form-control--Height: auto;
+  background-color: ${props =>
+    props.isDisabled ? 'var(--pf-global--disabled-color--300)' : null};
 `;
 function Lookup(props) {
   const {
@@ -43,6 +45,7 @@ function Lookup(props) {
     renderOptionsList,
     history,
     i18n,
+    isDisabled,
   } = props;
 
   const [state, dispatch] = useReducer(
@@ -103,11 +106,15 @@ function Lookup(props) {
           id={id}
           onClick={() => dispatch({ type: 'TOGGLE_MODAL' })}
           variant={ButtonVariant.control}
-          isDisabled={isLoading}
+          isDisabled={isLoading || isDisabled}
         >
           <SearchIcon />
         </Button>
-        <ChipHolder className="pf-c-form-control">
+        <ChipHolder
+          isDisabled={isDisabled}
+          // css="background-color: #d2d2d2"
+          className="pf-c-form-control"
+        >
           <ChipGroup numChips={5} totalChips={items.length}>
             {items.map(item =>
               renderItemChip({
diff --git a/awx/ui_next/src/components/Lookup/ProjectLookup.jsx b/awx/ui_next/src/components/Lookup/ProjectLookup.jsx
index 5c8ec16dee..3858c6a7fb 100644
--- a/awx/ui_next/src/components/Lookup/ProjectLookup.jsx
+++ b/awx/ui_next/src/components/Lookup/ProjectLookup.jsx
@@ -32,7 +32,7 @@ function ProjectLookup({
   history,
 }) {
   const {
-    result: { projects, count, relatedSearchableKeys, searchableKeys },
+    result: { projects, count, relatedSearchableKeys, searchableKeys, canEdit },
     request: fetchProjects,
     error,
     isLoading,
@@ -55,6 +55,7 @@ function ProjectLookup({
         searchableKeys: Object.keys(
           actionsResponse.data.actions?.GET || {}
         ).filter(key => actionsResponse.data.actions?.GET[key].filterable),
+        canEdit: Boolean(actionsResponse.data.actions.POST),
       };
     }, [history.location.search, autocomplete]),
     {
@@ -62,6 +63,7 @@ function ProjectLookup({
       projects: [],
       relatedSearchableKeys: [],
       searchableKeys: [],
+      canEdit: false,
     }
   );
 
@@ -87,6 +89,7 @@ function ProjectLookup({
         onChange={onChange}
         required={required}
         isLoading={isLoading}
+        isDisabled={!canEdit}
         qsConfig={QS_CONFIG}
         renderOptionsList={({ state, dispatch, canDelete }) => (
           <OptionsList
diff --git a/awx/ui_next/src/components/MultiSelect/useSyncedSelectValue.js b/awx/ui_next/src/components/MultiSelect/useSyncedSelectValue.js
index 2512ebe265..1a62a09ec2 100644
--- a/awx/ui_next/src/components/MultiSelect/useSyncedSelectValue.js
+++ b/awx/ui_next/src/components/MultiSelect/useSyncedSelectValue.js
@@ -11,12 +11,22 @@ export default function useSyncedSelectValue(value, onChange) {
   const [selections, setSelections] = useState([]);
 
   useEffect(() => {
+    const newOptions = [];
     if (value !== selections && options.length) {
-      const syncedValue = value.map(item =>
-        options.find(i => i.id === item.id)
-      );
+      const syncedValue = value.map(item => {
+        const match = options.find(i => {
+          return i.id === item.id;
+        });
+        if (!match) {
+          newOptions.push(item);
+        }
+        return match || item;
+      });
       setSelections(syncedValue);
     }
+    if (newOptions.length > 0) {
+      setOptions(options.concat(newOptions));
+    }
     /* eslint-disable-next-line react-hooks/exhaustive-deps */
   }, [value, options]);
 
@@ -27,7 +37,6 @@ export default function useSyncedSelectValue(value, onChange) {
       onChange(selections.concat(item));
     }
   };
-
   return {
     selections: options.length ? addToStringToObjects(selections) : [],
     onSelect,
diff --git a/awx/ui_next/src/screens/Template/JobTemplateEdit/JobTemplateEdit.jsx b/awx/ui_next/src/screens/Template/JobTemplateEdit/JobTemplateEdit.jsx
index 1e48523d85..a51bbb355a 100644
--- a/awx/ui_next/src/screens/Template/JobTemplateEdit/JobTemplateEdit.jsx
+++ b/awx/ui_next/src/screens/Template/JobTemplateEdit/JobTemplateEdit.jsx
@@ -4,13 +4,11 @@ import { withRouter, Redirect } from 'react-router-dom';
 import { CardBody } from '../../../components/Card';
 import ContentError from '../../../components/ContentError';
 import ContentLoading from '../../../components/ContentLoading';
-import { JobTemplatesAPI, ProjectsAPI } from '../../../api';
+import { JobTemplatesAPI } from '../../../api';
 import { JobTemplate } from '../../../types';
 import { getAddedAndRemoved } from '../../../util/lists';
 import JobTemplateForm from '../shared/JobTemplateForm';
 
-const loadRelatedProjectPlaybooks = async project =>
-  ProjectsAPI.readPlaybooks(project);
 class JobTemplateEdit extends Component {
   static propTypes = {
     template: JobTemplate.isRequired,
@@ -43,17 +41,8 @@ class JobTemplateEdit extends Component {
   }
 
   async loadRelated() {
-    const {
-      template: { project },
-    } = this.props;
     this.setState({ contentError: null, hasContentLoading: true });
     try {
-      if (project) {
-        const { data: playbook = [] } = await loadRelatedProjectPlaybooks(
-          project
-        );
-        this.setState({ relatedProjectPlaybooks: playbook });
-      }
       const [relatedCredentials] = await this.loadRelatedCredentials();
       this.setState({
         relatedCredentials,
diff --git a/awx/ui_next/src/screens/Template/shared/JobTemplateForm.jsx b/awx/ui_next/src/screens/Template/shared/JobTemplateForm.jsx
index a7d540a7a7..c75efc036f 100644
--- a/awx/ui_next/src/screens/Template/shared/JobTemplateForm.jsx
+++ b/awx/ui_next/src/screens/Template/shared/JobTemplateForm.jsx
@@ -39,7 +39,7 @@ import {
   ProjectLookup,
   MultiCredentialsLookup,
 } from '../../../components/Lookup';
-import { JobTemplatesAPI, ProjectsAPI } from '../../../api';
+import { JobTemplatesAPI } from '../../../api';
 import LabelSelect from './LabelSelect';
 import PlaybookSelect from './PlaybookSelect';
 import WebhookSubForm from './WebhookSubForm';
@@ -100,18 +100,6 @@ function JobTemplateForm({
     'webhook_credential'
   );
 
-  const {
-    request: fetchProject,
-    error: projectContentError,
-    contentLoading: hasProjectLoading,
-  } = useRequest(
-    useCallback(async () => {
-      if (template?.project) {
-        await ProjectsAPI.readDetail(template?.project);
-      }
-    }, [template])
-  );
-
   const {
     request: loadRelatedInstanceGroups,
     error: instanceGroupError,
@@ -127,10 +115,6 @@ function JobTemplateForm({
     }, [setFieldValue, template])
   );
 
-  useEffect(() => {
-    fetchProject();
-  }, [fetchProject]);
-
   useEffect(() => {
     loadRelatedInstanceGroups();
   }, [loadRelatedInstanceGroups]);
@@ -204,16 +188,12 @@ function JobTemplateForm({
     callbackUrl = `${origin}${path}`;
   }
 
-  if (instanceGroupLoading || hasProjectLoading) {
+  if (instanceGroupLoading) {
     return <ContentLoading />;
   }
 
-  if (contentError || instanceGroupError || projectContentError) {
-    return (
-      <ContentError
-        error={contentError || instanceGroupError || projectContentError}
-      />
-    );
+  if (contentError || instanceGroupError) {
+    return <ContentError error={contentError || instanceGroupError} />;
   }
 
   return (
diff --git a/awx/ui_next/src/screens/Template/shared/PlaybookSelect.jsx b/awx/ui_next/src/screens/Template/shared/PlaybookSelect.jsx
index 78fd6e28f9..83dfc590af 100644
--- a/awx/ui_next/src/screens/Template/shared/PlaybookSelect.jsx
+++ b/awx/ui_next/src/screens/Template/shared/PlaybookSelect.jsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect } from 'react';
+import React, { useCallback, useEffect, useState } from 'react';
 import { number, string, oneOfType } from 'prop-types';
 import { withI18n } from '@lingui/react';
 import { t } from '@lingui/macro';
@@ -7,6 +7,7 @@ import { ProjectsAPI } from '../../../api';
 import useRequest from '../../../util/useRequest';
 
 function PlaybookSelect({ projectId, isValid, field, onBlur, onError, i18n }) {
+  const [isDisabled, setIsDisabled] = useState(false);
   const {
     result: options,
     request: fetchOptions,
@@ -18,6 +19,7 @@ function PlaybookSelect({ projectId, isValid, field, onBlur, onError, i18n }) {
         return [];
       }
       const { data } = await ProjectsAPI.readPlaybooks(projectId);
+
       const opts = (data || []).map(playbook => ({
         value: playbook,
         key: playbook,
@@ -33,7 +35,7 @@ function PlaybookSelect({ projectId, isValid, field, onBlur, onError, i18n }) {
       });
       return opts;
     }, [projectId, i18n]),
-    []
+    [field.value]
   );
 
   useEffect(() => {
@@ -42,18 +44,30 @@ function PlaybookSelect({ projectId, isValid, field, onBlur, onError, i18n }) {
 
   useEffect(() => {
     if (error) {
-      onError(error);
+      if (error.response.status === 403) {
+        setIsDisabled(true);
+      } else {
+        onError(error);
+      }
     }
   }, [error, onError]);
 
+  const isDisabledData = [
+    {
+      value: field.value || '',
+      label: field.value || '',
+      key: 1,
+      isDisabled: true,
+    },
+  ];
   return (
     <AnsibleSelect
       id="template-playbook"
-      data={options}
+      data={isDisabled ? isDisabledData : options}
       isValid={isValid}
       {...field}
       onBlur={onBlur}
-      isDisabled={isLoading}
+      isDisabled={isLoading || isDisabled}
     />
   );
 }

From b51f013880d187d5da96b6daadc54db68eb91a4e Mon Sep 17 00:00:00 2001
From: Alex Corey <alex.swansboro@gmail.com>
Date: Thu, 3 Sep 2020 11:14:15 -0400
Subject: [PATCH 50/69] disables prompt on launch checkbox

---
 .../FieldWithPrompt/FieldWithPrompt.jsx       |  2 +
 .../components/FormField/CheckboxField.jsx    | 11 ++-
 .../components/Lookup/CredentialLookup.jsx    |  2 +
 .../src/components/Lookup/InventoryLookup.jsx | 79 ++++++++++++++++++-
 awx/ui_next/src/components/Lookup/Lookup.jsx  |  9 +--
 .../JobTemplateEdit/JobTemplateEdit.test.jsx  |  7 ++
 .../Template/shared/JobTemplateForm.jsx       | 18 ++---
 .../Template/shared/JobTemplateForm.test.jsx  | 14 +++-
 .../Template/shared/PlaybookSelect.jsx        |  2 +-
 .../shared/WorkflowJobTemplateForm.jsx        | 23 +++---
 .../shared/WorkflowJobTemplateForm.test.jsx   | 13 +++
 11 files changed, 145 insertions(+), 35 deletions(-)

diff --git a/awx/ui_next/src/components/FieldWithPrompt/FieldWithPrompt.jsx b/awx/ui_next/src/components/FieldWithPrompt/FieldWithPrompt.jsx
index b0d27ccc6e..d505049cf0 100644
--- a/awx/ui_next/src/components/FieldWithPrompt/FieldWithPrompt.jsx
+++ b/awx/ui_next/src/components/FieldWithPrompt/FieldWithPrompt.jsx
@@ -23,6 +23,7 @@ function FieldWithPrompt({
   promptId,
   promptName,
   tooltip,
+  isDisabled,
 }) {
   return (
     <div className="pf-c-form__group">
@@ -39,6 +40,7 @@ function FieldWithPrompt({
           {tooltip && <FieldTooltip content={tooltip} />}
         </div>
         <StyledCheckboxField
+          isDisabled={isDisabled}
           id={promptId}
           label={i18n._(t`Prompt on launch`)}
           name={promptName}
diff --git a/awx/ui_next/src/components/FormField/CheckboxField.jsx b/awx/ui_next/src/components/FormField/CheckboxField.jsx
index 6a46bcaed3..d2a0fb913f 100644
--- a/awx/ui_next/src/components/FormField/CheckboxField.jsx
+++ b/awx/ui_next/src/components/FormField/CheckboxField.jsx
@@ -9,10 +9,19 @@ const QuestionCircleIcon = styled(PFQuestionCircleIcon)`
   margin-left: 10px;
 `;
 
-function CheckboxField({ id, name, label, tooltip, validate, ...rest }) {
+function CheckboxField({
+  id,
+  name,
+  label,
+  tooltip,
+  validate,
+  isDisabled,
+  ...rest
+}) {
   const [field] = useField({ name, validate });
   return (
     <Checkbox
+      isDisabled={isDisabled}
       aria-label={label}
       label={
         <span>
diff --git a/awx/ui_next/src/components/Lookup/CredentialLookup.jsx b/awx/ui_next/src/components/Lookup/CredentialLookup.jsx
index c67e0087c6..a31fd8fd7d 100644
--- a/awx/ui_next/src/components/Lookup/CredentialLookup.jsx
+++ b/awx/ui_next/src/components/Lookup/CredentialLookup.jsx
@@ -33,6 +33,7 @@ function CredentialLookup({
   history,
   i18n,
   tooltip,
+  isDisabled,
 }) {
   const {
     result: { count, credentials, relatedSearchableKeys, searchableKeys },
@@ -108,6 +109,7 @@ function CredentialLookup({
         onChange={onChange}
         required={required}
         qsConfig={QS_CONFIG}
+        isDisabled={isDisabled}
         renderOptionsList={({ state, dispatch, canDelete }) => (
           <OptionsList
             value={state.selectedItems}
diff --git a/awx/ui_next/src/components/Lookup/InventoryLookup.jsx b/awx/ui_next/src/components/Lookup/InventoryLookup.jsx
index 102abc4d60..9c42d521de 100644
--- a/awx/ui_next/src/components/Lookup/InventoryLookup.jsx
+++ b/awx/ui_next/src/components/Lookup/InventoryLookup.jsx
@@ -10,6 +10,7 @@ import OptionsList from '../OptionsList';
 import useRequest from '../../util/useRequest';
 import { getQSConfig, parseQueryString } from '../../util/qs';
 import LookupErrorMessage from './shared/LookupErrorMessage';
+import FieldWithPrompt from '../FieldWithPrompt';
 
 const QS_CONFIG = getQSConfig('inventory', {
   page: 1,
@@ -17,7 +18,18 @@ const QS_CONFIG = getQSConfig('inventory', {
   order_by: 'name',
 });
 
-function InventoryLookup({ value, onChange, onBlur, required, i18n, history }) {
+function InventoryLookup({
+  value,
+  onChange,
+  onBlur,
+  i18n,
+  history,
+  required,
+  isPromptableField,
+  fieldId,
+  promptId,
+  promptName,
+}) {
   const {
     result: {
       inventories,
@@ -61,7 +73,70 @@ function InventoryLookup({ value, onChange, onBlur, required, i18n, history }) {
     fetchInventories();
   }, [fetchInventories]);
 
-  return (
+  return isPromptableField ? (
+    <>
+      <FieldWithPrompt
+        fieldId={fieldId}
+        isRequired={required}
+        label={i18n._(t`Inventory`)}
+        promptId={promptId}
+        promptName={promptName}
+        isDisabled={!canEdit}
+        tooltip={i18n._(t`Select the inventory containing the hosts
+            you want this job to manage.`)}
+      >
+        <Lookup
+          id="inventory-lookup"
+          header={i18n._(t`Inventory`)}
+          value={value}
+          onChange={onChange}
+          onBlur={onBlur}
+          required={required}
+          isLoading={isLoading}
+          isDisabled={!canEdit}
+          qsConfig={QS_CONFIG}
+          renderOptionsList={({ state, dispatch, canDelete }) => (
+            <OptionsList
+              value={state.selectedItems}
+              options={inventories}
+              optionCount={count}
+              searchColumns={[
+                {
+                  name: i18n._(t`Name`),
+                  key: 'name__icontains',
+                  isDefault: true,
+                },
+                {
+                  name: i18n._(t`Created By (Username)`),
+                  key: 'created_by__username__icontains',
+                },
+                {
+                  name: i18n._(t`Modified By (Username)`),
+                  key: 'modified_by__username__icontains',
+                },
+              ]}
+              sortColumns={[
+                {
+                  name: i18n._(t`Name`),
+                  key: 'name',
+                },
+              ]}
+              searchableKeys={searchableKeys}
+              relatedSearchableKeys={relatedSearchableKeys}
+              multiple={state.multiple}
+              header={i18n._(t`Inventory`)}
+              name="inventory"
+              qsConfig={QS_CONFIG}
+              readOnly={!canDelete}
+              selectItem={item => dispatch({ type: 'SELECT_ITEM', item })}
+              deselectItem={item => dispatch({ type: 'DESELECT_ITEM', item })}
+            />
+          )}
+        />
+        <LookupErrorMessage error={error} />
+      </FieldWithPrompt>
+    </>
+  ) : (
     <>
       <Lookup
         id="inventory-lookup"
diff --git a/awx/ui_next/src/components/Lookup/Lookup.jsx b/awx/ui_next/src/components/Lookup/Lookup.jsx
index a0fbadcecb..2cfc284af8 100644
--- a/awx/ui_next/src/components/Lookup/Lookup.jsx
+++ b/awx/ui_next/src/components/Lookup/Lookup.jsx
@@ -91,7 +91,8 @@ function Lookup(props) {
   };
 
   const { isModalOpen, selectedItems } = state;
-  const canDelete = !required || (multiple && value.length > 1);
+  const canDelete =
+    (!required || (multiple && value.length > 1)) && !isDisabled;
   let items = [];
   if (multiple) {
     items = value;
@@ -110,11 +111,7 @@ function Lookup(props) {
         >
           <SearchIcon />
         </Button>
-        <ChipHolder
-          isDisabled={isDisabled}
-          // css="background-color: #d2d2d2"
-          className="pf-c-form-control"
-        >
+        <ChipHolder isDisabled={isDisabled} className="pf-c-form-control">
           <ChipGroup numChips={5} totalChips={items.length}>
             {items.map(item =>
               renderItemChip({
diff --git a/awx/ui_next/src/screens/Template/JobTemplateEdit/JobTemplateEdit.test.jsx b/awx/ui_next/src/screens/Template/JobTemplateEdit/JobTemplateEdit.test.jsx
index 61b1467bcf..7790989aa9 100644
--- a/awx/ui_next/src/screens/Template/JobTemplateEdit/JobTemplateEdit.test.jsx
+++ b/awx/ui_next/src/screens/Template/JobTemplateEdit/JobTemplateEdit.test.jsx
@@ -12,6 +12,7 @@ import {
   JobTemplatesAPI,
   LabelsAPI,
   ProjectsAPI,
+  InventoriesAPI,
 } from '../../../api';
 import JobTemplateEdit from './JobTemplateEdit';
 
@@ -181,6 +182,12 @@ JobTemplatesAPI.readCredentials.mockResolvedValue({
 ProjectsAPI.readPlaybooks.mockResolvedValue({
   data: mockRelatedProjectPlaybooks,
 });
+InventoriesAPI.readOptions.mockResolvedValue({
+  data: { actions: { GET: {}, POST: {} } },
+});
+ProjectsAPI.readOptions.mockResolvedValue({
+  data: { actions: { GET: {}, POST: {} } },
+});
 LabelsAPI.read.mockResolvedValue({ data: { results: [] } });
 CredentialsAPI.read.mockResolvedValue({
   data: {
diff --git a/awx/ui_next/src/screens/Template/shared/JobTemplateForm.jsx b/awx/ui_next/src/screens/Template/shared/JobTemplateForm.jsx
index c75efc036f..ae68594205 100644
--- a/awx/ui_next/src/screens/Template/shared/JobTemplateForm.jsx
+++ b/awx/ui_next/src/screens/Template/shared/JobTemplateForm.jsx
@@ -234,17 +234,15 @@ function JobTemplateForm({
             }}
           />
         </FieldWithPrompt>
-        <FieldWithPrompt
-          fieldId="template-inventory"
-          isRequired={!askInventoryOnLaunchField.value}
-          label={i18n._(t`Inventory`)}
-          promptId="template-ask-inventory-on-launch"
-          promptName="ask_inventory_on_launch"
-          tooltip={i18n._(t`Select the inventory containing the hosts
-            you want this job to manage.`)}
-        >
+        <>
           <InventoryLookup
             value={inventory}
+            fieldId="template-inventory"
+            promptId="template-ask-inventory-on-launch"
+            promptName="ask_inventory_on_launch"
+            isPromptableField
+            tooltip={i18n._(t`Select the inventory containing the hosts
+            you want this job to manage.`)}
             onBlur={() => inventoryHelpers.setTouched()}
             onChange={value => {
               inventoryHelpers.setValue(value ? value.id : null);
@@ -263,7 +261,7 @@ function JobTemplateForm({
                 {inventoryMeta.error}
               </div>
             )}
-        </FieldWithPrompt>
+        </>
         <ProjectLookup
           value={projectField.value}
           onBlur={() => projectHelpers.setTouched()}
diff --git a/awx/ui_next/src/screens/Template/shared/JobTemplateForm.test.jsx b/awx/ui_next/src/screens/Template/shared/JobTemplateForm.test.jsx
index a373fefe37..f6c6c3e486 100644
--- a/awx/ui_next/src/screens/Template/shared/JobTemplateForm.test.jsx
+++ b/awx/ui_next/src/screens/Template/shared/JobTemplateForm.test.jsx
@@ -14,6 +14,7 @@ import {
   ProjectsAPI,
   CredentialsAPI,
   CredentialTypesAPI,
+  InventoriesAPI,
 } from '../../../api';
 
 jest.mock('../../../api');
@@ -111,14 +112,23 @@ describe('<JobTemplateForm />', () => {
     JobTemplatesAPI.updateWebhookKey.mockReturnValue({
       data: { webhook_key: 'webhook key' },
     });
-    ProjectsAPI.readPlaybooks.mockReturnValue({
-      data: ['debug.yml'],
+    JobTemplatesAPI.updateWebhookKey.mockReturnValue({
+      data: { webhook_key: 'webhook key' },
     });
     ProjectsAPI.readDetail.mockReturnValue({
       name: 'foo',
       id: 1,
       allow_override: true,
     });
+    ProjectsAPI.readPlaybooks.mockReturnValue({
+      data: ['debug.yml'],
+    });
+    InventoriesAPI.readOptions.mockResolvedValue({
+      data: { actions: { GET: {}, POST: {} } },
+    });
+    ProjectsAPI.readOptions.mockResolvedValue({
+      data: { actions: { GET: {}, POST: {} } },
+    });
   });
 
   afterEach(() => {
diff --git a/awx/ui_next/src/screens/Template/shared/PlaybookSelect.jsx b/awx/ui_next/src/screens/Template/shared/PlaybookSelect.jsx
index 83dfc590af..5a66cc0a78 100644
--- a/awx/ui_next/src/screens/Template/shared/PlaybookSelect.jsx
+++ b/awx/ui_next/src/screens/Template/shared/PlaybookSelect.jsx
@@ -35,7 +35,7 @@ function PlaybookSelect({ projectId, isValid, field, onBlur, onError, i18n }) {
       });
       return opts;
     }, [projectId, i18n]),
-    [field.value]
+    []
   );
 
   useEffect(() => {
diff --git a/awx/ui_next/src/screens/Template/shared/WorkflowJobTemplateForm.jsx b/awx/ui_next/src/screens/Template/shared/WorkflowJobTemplateForm.jsx
index 4ea77786f9..bb13418aac 100644
--- a/awx/ui_next/src/screens/Template/shared/WorkflowJobTemplateForm.jsx
+++ b/awx/ui_next/src/screens/Template/shared/WorkflowJobTemplateForm.jsx
@@ -110,23 +110,21 @@ function WorkflowJobTemplateForm({
           value={organizationField.value}
           isValid={!organizationMeta.error}
         />
-
-        <FieldWithPrompt
-          fieldId="wfjt-inventory"
-          label={i18n._(t`Inventory`)}
-          promptId="wfjt-ask-inventory-on-launch"
-          promptName="ask_inventory_on_launch"
-          tooltip={i18n._(
-            t`Select an inventory for the workflow. This inventory is applied to all job template nodes that prompt for an inventory.`
-          )}
-        >
+        <>
           <InventoryLookup
+            promptId="wfjt-ask-inventory-on-launch"
+            promptName="ask_inventory_on_launch"
+            tooltip={i18n._(
+              t`Select an inventory for the workflow. This inventory is applied to all job template nodes that prompt for an inventory.`
+            )}
+            fieldId="wfjt-inventory"
+            isPromptableField
             value={inventoryField.value}
             onBlur={() => inventoryHelpers.setTouched()}
             onChange={value => {
               inventoryHelpers.setValue(value);
             }}
-            required={askInventoryOnLaunchField.value}
+            required={!askInventoryOnLaunchField.value}
             touched={inventoryMeta.touched}
             error={inventoryMeta.error}
           />
@@ -139,8 +137,7 @@ function WorkflowJobTemplateForm({
                 {inventoryMeta.error}
               </div>
             )}
-        </FieldWithPrompt>
-
+        </>
         <FieldWithPrompt
           fieldId="wjft-limit"
           label={i18n._(t`Limit`)}
diff --git a/awx/ui_next/src/screens/Template/shared/WorkflowJobTemplateForm.test.jsx b/awx/ui_next/src/screens/Template/shared/WorkflowJobTemplateForm.test.jsx
index f0edee3bbf..68c03637e2 100644
--- a/awx/ui_next/src/screens/Template/shared/WorkflowJobTemplateForm.test.jsx
+++ b/awx/ui_next/src/screens/Template/shared/WorkflowJobTemplateForm.test.jsx
@@ -11,6 +11,8 @@ import {
   LabelsAPI,
   OrganizationsAPI,
   InventoriesAPI,
+  ProjectsAPI,
+  CredentialTypesAPI,
 } from '../../../api';
 
 jest.mock('../../../api/models/CredentialTypes');
@@ -18,6 +20,8 @@ jest.mock('../../../api/models/WorkflowJobTemplates');
 jest.mock('../../../api/models/Labels');
 jest.mock('../../../api/models/Organizations');
 jest.mock('../../../api/models/Inventories');
+jest.mock('../../../api/models/Projects');
+jest.mock('../../../api/models/Credentials');
 
 describe('<WorkflowJobTemplateForm/>', () => {
   let wrapper;
@@ -71,6 +75,15 @@ describe('<WorkflowJobTemplateForm/>', () => {
         { id: 2, name: 'Bar' },
       ],
     });
+    CredentialTypesAPI.read.mockResolvedValue({
+      data: { results: [{ id: 1 }] },
+    });
+    InventoriesAPI.readOptions.mockResolvedValue({
+      data: { actions: { GET: {}, POST: {} } },
+    });
+    ProjectsAPI.readOptions.mockResolvedValue({
+      data: { actions: { GET: {}, POST: {} } },
+    });
 
     history = createMemoryHistory({
       initialEntries: ['/templates/workflow_job_template/6/edit'],

From c7114b2571c898110400a97de66cdb25deac0e8b Mon Sep 17 00:00:00 2001
From: beeankha <bstohrer@redhat.com>
Date: Mon, 7 Sep 2020 11:43:44 -0400
Subject: [PATCH 51/69] Add specific lookup data to error message

---
 awx_collection/plugins/modules/tower_inventory_source.py        | 2 +-
 awx_collection/plugins/modules/tower_inventory_source_update.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/awx_collection/plugins/modules/tower_inventory_source.py b/awx_collection/plugins/modules/tower_inventory_source.py
index 0145671933..1714773b32 100644
--- a/awx_collection/plugins/modules/tower_inventory_source.py
+++ b/awx_collection/plugins/modules/tower_inventory_source.py
@@ -208,7 +208,7 @@ def main():
     inventory_object = module.get_one('inventories', data=lookup_data)
 
     if not inventory_object:
-        module.fail_json(msg='The specified inventory was not found.')
+        module.fail_json(msg='The specified inventory, {0}, was not found.'.format(lookup_data))
 
     inventory_source_object = module.get_one('inventory_sources', **{
         'data': {
diff --git a/awx_collection/plugins/modules/tower_inventory_source_update.py b/awx_collection/plugins/modules/tower_inventory_source_update.py
index abb55d1941..c4cb27be7c 100644
--- a/awx_collection/plugins/modules/tower_inventory_source_update.py
+++ b/awx_collection/plugins/modules/tower_inventory_source_update.py
@@ -113,7 +113,7 @@ def main():
     inventory_object = module.get_one('inventories', data=lookup_data)
 
     if not inventory_object:
-        module.fail_json(msg='The specified inventory was not found.')
+        module.fail_json(msg='The specified inventory, {0}, was not found.'.format(lookup_data))
 
     inventory_source_object = module.get_one('inventory_sources', **{
         'data': {

From f81560b12c333ca1a295bf438582cdd814da5bb5 Mon Sep 17 00:00:00 2001
From: Ryan Petrello <rpetrell@redhat.com>
Date: Tue, 8 Sep 2020 10:39:26 -0400
Subject: [PATCH 52/69] update Django and channels_redis

see: https://github.com/ansible/tower/issues/4439
also, addresses CVE-2020-24583 and CVE-2020-24584
---
 requirements/requirements.in  | 4 ++--
 requirements/requirements.txt | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/requirements/requirements.in b/requirements/requirements.in
index f8126fb081..029c3931b7 100644
--- a/requirements/requirements.in
+++ b/requirements/requirements.in
@@ -4,9 +4,9 @@ ansiconv==1.0.0  # UPGRADE BLOCKER: from 2013, consider replacing instead of upg
 azure-keyvault==1.1.0  # see UPGRADE BLOCKERs
 boto  # replacement candidate https://github.com/ansible/awx/issues/2115
 channels
-channels-redis
+channels-redis>=3.1.0  # https://github.com/django/channels_redis/issues/212
 daphne
-django==2.2.11  # see UPGRADE BLOCKERs
+django==2.2.16  # see UPGRADE BLOCKERs
 django-auth-ldap
 django-cors-headers
 django-crum
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index 8408960f28..f5a3e9e107 100644
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -15,7 +15,7 @@ boto==2.49.0              # via -r /awx_devel/requirements/requirements.in
 cachetools==4.0.0         # via google-auth
 certifi==2019.11.28       # via kubernetes, msrest, requests
 cffi==1.14.0              # via cryptography
-channels-redis==2.4.2     # via -r /awx_devel/requirements/requirements.in
+channels-redis==3.1.0     # via -r /awx_devel/requirements/requirements.in
 channels==2.4.0           # via -r /awx_devel/requirements/requirements.in, channels-redis
 chardet==3.0.4            # via aiohttp, requests
 constantly==15.1.0        # via twisted
@@ -37,7 +37,7 @@ django-redis==4.5.0       # via -r /awx_devel/requirements/requirements.in
 django-solo==1.1.3        # via -r /awx_devel/requirements/requirements.in
 django-split-settings==1.0.0  # via -r /awx_devel/requirements/requirements.in
 django-taggit==1.2.0      # via -r /awx_devel/requirements/requirements.in
-django==2.2.11            # via -r /awx_devel/requirements/requirements.in, channels, django-auth-ldap, django-cors-headers, django-crum, django-jsonfield, django-oauth-toolkit, django-polymorphic, django-taggit, djangorestframework
+django==2.2.16            # via -r /awx_devel/requirements/requirements.in, channels, django-auth-ldap, django-cors-headers, django-crum, django-jsonfield, django-oauth-toolkit, django-polymorphic, django-taggit, djangorestframework
 djangorestframework-yaml==1.0.3  # via -r /awx_devel/requirements/requirements.in
 djangorestframework==3.11.0  # via -r /awx_devel/requirements/requirements.in
 docutils==0.16            # via python-daemon
@@ -68,7 +68,7 @@ lxml==4.5.0               # via xmlsec
 markdown==3.2.1           # via -r /awx_devel/requirements/requirements.in
 markupsafe==1.1.1         # via jinja2
 more-itertools==8.2.0     # via irc, jaraco.classes, jaraco.functools
-msgpack==0.6.2            # via channels-redis
+msgpack==1.0.0            # via channels-redis
 msrest==0.6.11            # via azure-keyvault, msrestazure
 msrestazure==0.6.3        # via azure-keyvault
 multidict==4.7.5          # via aiohttp, yarl

From c862b3e5a2dd27f6ee12760f9cc415dc8dc358ea Mon Sep 17 00:00:00 2001
From: Ryan Petrello <rpetrell@redhat.com>
Date: Tue, 8 Sep 2020 10:40:47 -0400
Subject: [PATCH 53/69] Revert "work around a memory leak in channels_redis"

This reverts commit e25da217e851849f51da27ca3cbdc5266858e6f3.
---
 awx/main/consumers.py    | 30 ------------------------------
 awx/settings/defaults.py |  2 +-
 2 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/awx/main/consumers.py b/awx/main/consumers.py
index d32219b3ac..b6d8872ebd 100644
--- a/awx/main/consumers.py
+++ b/awx/main/consumers.py
@@ -1,5 +1,3 @@
-import collections
-import functools
 import json
 import logging
 import time
@@ -14,40 +12,12 @@ from django.contrib.auth.models import User
 from channels.generic.websocket import AsyncJsonWebsocketConsumer
 from channels.layers import get_channel_layer
 from channels.db import database_sync_to_async
-from channels_redis.core import RedisChannelLayer
 
 
 logger = logging.getLogger('awx.main.consumers')
 XRF_KEY = '_auth_user_xrf'
 
 
-class BoundedQueue(asyncio.Queue):
-
-    def put_nowait(self, item):
-        if self.full():
-            # dispose the oldest item
-            # if we actually get into this code block, it likely means that
-            # this specific consumer has stopped reading
-            # unfortunately, channels_redis will just happily continue to
-            # queue messages specific to their channel until the heat death
-            # of the sun: https://github.com/django/channels_redis/issues/212
-            # this isn't a huge deal for browser clients that disconnect,
-            # but it *does* cause a problem for our global broadcast topic
-            # that's used to broadcast messages to peers in a cluster
-            # if we get into this code block, it's better to drop messages
-            # than to continue to malloc() forever
-            self.get_nowait()
-        return super(BoundedQueue, self).put_nowait(item)
-
-
-class ExpiringRedisChannelLayer(RedisChannelLayer):
-    def __init__(self, *args, **kw):
-        super(ExpiringRedisChannelLayer, self).__init__(*args, **kw)
-        self.receive_buffer = collections.defaultdict(
-            functools.partial(BoundedQueue, self.capacity)
-        )
-
-
 class WebsocketSecretAuthHelper:
     """
     Middlewareish for websockets to verify node websocket broadcast interconnect.
diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py
index 8d42af1ae4..7bfcaa8861 100644
--- a/awx/settings/defaults.py
+++ b/awx/settings/defaults.py
@@ -790,7 +790,7 @@ ASGI_APPLICATION = "awx.main.routing.application"
 
 CHANNEL_LAYERS = {
     "default": {
-        "BACKEND": "awx.main.consumers.ExpiringRedisChannelLayer",
+        "BACKEND": "channels_redis.core.RedisChannelLayer",
         "CONFIG": {
             "hosts": [BROKER_URL],
             "capacity": 10000,

From 51959b29de595d47fb4cd71155bade0f92919f8d Mon Sep 17 00:00:00 2001
From: John Westcott IV <john.westcott.iv@redhat.com>
Date: Thu, 3 Sep 2020 10:38:53 -0400
Subject: [PATCH 54/69] Adding name_or_id to get_one to make module more
 uniform

---
 .../plugins/module_utils/tower_api.py         | 36 +++++++++++++++----
 1 file changed, 30 insertions(+), 6 deletions(-)

diff --git a/awx_collection/plugins/module_utils/tower_api.py b/awx_collection/plugins/module_utils/tower_api.py
index 7eee6561d1..00e8827ea8 100644
--- a/awx_collection/plugins/module_utils/tower_api.py
+++ b/awx_collection/plugins/module_utils/tower_api.py
@@ -88,7 +88,28 @@ class TowerAPIModule(TowerModule):
             response['json']['next'] = next_page
         return response
 
-    def get_one(self, endpoint, *args, **kwargs):
+    def get_name_field_from_endpoint(self, endpoint):
+        if endpoint == 'users':
+            return 'username'
+        elif endpoint == 'instances':
+            return 'hostname'
+        return 'name'
+
+    def get_one(self, endpoint, name_or_id=None, *args, **kwargs):
+        if name_or_id:
+            name_field = self.get_name_field_from_endpoint(endpoint)
+            new_args = kwargs.get('data', {}).copy()
+            if name_field in new_args:
+                self.fail_json(msg="You can't specify the field {0} in your search data if using the name_or_id field".format(name_field))
+
+            new_args['or__{0}'.format(name_field)] = name_or_id
+            try:
+                new_args['or__id'] = int(name_or_id)
+            except ValueError:
+                # If we get a value error, then we didn't have an integer so we can just pass and fall down to the fail
+                pass
+            kwargs['data'] = new_args
+
         response = self.get_endpoint(endpoint, *args, **kwargs)
         if response['status_code'] != 200:
             fail_msg = "Got a {0} response when trying to get one from {1}".format(response['status_code'], endpoint)
@@ -102,16 +123,19 @@ class TowerAPIModule(TowerModule):
         if response['json']['count'] == 0:
             return None
         elif response['json']['count'] > 1:
+            if name_or_id:
+                # Since we did a name or ID search and got > 1 return something if the id matches
+                for asset in response['json']['results']:
+                    if asset['id'] == name_or_id:
+                        return asset
+            # We got > 1 and either didn't find something by ID (which means multiple names)
+            # Or we weren't running with a or search and just got back too many to begin with.
             self.fail_json(msg="An unexpected number of items was returned from the API ({0})".format(response['json']['count']))
 
         return response['json']['results'][0]
 
     def get_one_by_name_or_id(self, endpoint, name_or_id):
-        name_field = 'name'
-        if endpoint == 'users':
-            name_field = 'username'
-        elif endpoint == 'instances':
-            name_field = 'hostname'
+        name_field = self.get_name_field_from_endpoint(endpoint)
 
         query_params = {'or__{0}'.format(name_field): name_or_id}
         try:

From 5042ad3a2be3bd7253309aae55ea1556efee57b0 Mon Sep 17 00:00:00 2001
From: John Westcott IV <john.westcott.iv@redhat.com>
Date: Thu, 3 Sep 2020 11:15:59 -0400
Subject: [PATCH 55/69] Updating user module for new get_one

---
 awx_collection/plugins/modules/tower_user.py              | 8 +++-----
 .../tests/integration/targets/tower_user/tasks/main.yml   | 4 ++--
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/awx_collection/plugins/modules/tower_user.py b/awx_collection/plugins/modules/tower_user.py
index 15c41cb081..19cf00fa1f 100644
--- a/awx_collection/plugins/modules/tower_user.py
+++ b/awx_collection/plugins/modules/tower_user.py
@@ -134,11 +134,9 @@ def main():
     # Attempt to look up the related items the user specified (these will fail the module if not found)
 
     # Attempt to look up an existing item based on the provided data
-    existing_item = module.get_one('users', **{
-        'data': {
-            'username': username,
-        }
-    })
+    existing_item = module.get_one('users', name_or_id=username)
+    # If we got an item back make sure the name field reflects the actual name (incase we were passed an ID)
+    username = existing_item['username'] if (existing_item) else username
 
     if state == 'absent':
         # If the state was absent we can let the module delete it if needed, the module will handle exiting from this
diff --git a/awx_collection/tests/integration/targets/tower_user/tasks/main.yml b/awx_collection/tests/integration/targets/tower_user/tasks/main.yml
index f04f1a8327..79077479df 100644
--- a/awx_collection/tests/integration/targets/tower_user/tasks/main.yml
+++ b/awx_collection/tests/integration/targets/tower_user/tasks/main.yml
@@ -15,9 +15,9 @@
     that:
       - "result is changed"
 
-- name: Change a User
+- name: Change a User by ID
   tower_user:
-    username: "{{ username }}"
+    username: "{{ result.id }}"
     last_name: User
     email: joe@example.org
     state: present

From 24ec12923578540f80f1be3440466c06a467f53e Mon Sep 17 00:00:00 2001
From: John Westcott IV <john.westcott.iv@redhat.com>
Date: Thu, 3 Sep 2020 11:17:21 -0400
Subject: [PATCH 56/69] Modifying credential for new get_one

---
 awx_collection/plugins/modules/tower_credential.py           | 5 +++--
 .../integration/targets/tower_credential/tasks/main.yml      | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/awx_collection/plugins/modules/tower_credential.py b/awx_collection/plugins/modules/tower_credential.py
index 2d4cbd3331..3f37e0ad62 100644
--- a/awx_collection/plugins/modules/tower_credential.py
+++ b/awx_collection/plugins/modules/tower_credential.py
@@ -365,13 +365,14 @@ def main():
 
     # Attempt to look up the object based on the provided name, credential type and optional organization
     lookup_data = {
-        'name': name,
         'credential_type': cred_type_id,
     }
     if organization:
         lookup_data['organization'] = org_id
 
-    credential = module.get_one('credentials', **{'data': lookup_data})
+    credential = module.get_one('credentials', name_or_id=name, **{'data': lookup_data})
+    # If we got an item back make sure the name field reflects the actual name (incase we were passed an ID)
+    name = credential['name'] if (credential) else name
 
     if state == 'absent':
         # If the state was absent we can let the module delete it if needed, the module will handle exiting from this
diff --git a/awx_collection/tests/integration/targets/tower_credential/tasks/main.yml b/awx_collection/tests/integration/targets/tower_credential/tasks/main.yml
index 7c0f4b080d..16eac5b66a 100644
--- a/awx_collection/tests/integration/targets/tower_credential/tasks/main.yml
+++ b/awx_collection/tests/integration/targets/tower_credential/tasks/main.yml
@@ -82,9 +82,9 @@
     that:
       - "result is changed"
 
-- name: Re-create the Org-specific credential (new school)
+- name: Re-create the Org-specific credential (new school) with an ID
   tower_credential:
-    name: "{{ ssh_cred_name1 }}"
+    name: "{{ result.id }}"
     organization: Default
     credential_type: 'Machine'
     state: present

From 4c4d6dad49477c8f2ca50dcbedbc50d32666a6ac Mon Sep 17 00:00:00 2001
From: John Westcott IV <john.westcott.iv@redhat.com>
Date: Fri, 4 Sep 2020 15:02:06 -0400
Subject: [PATCH 57/69] Adding get_item_name and making static methods

---
 .../plugins/module_utils/tower_api.py         | 57 ++++++++++---------
 1 file changed, 29 insertions(+), 28 deletions(-)

diff --git a/awx_collection/plugins/module_utils/tower_api.py b/awx_collection/plugins/module_utils/tower_api.py
index 00e8827ea8..da8474634d 100644
--- a/awx_collection/plugins/module_utils/tower_api.py
+++ b/awx_collection/plugins/module_utils/tower_api.py
@@ -42,6 +42,33 @@ class TowerAPIModule(TowerModule):
         }
         return exceptions.get(name, '{0}s'.format(name))
 
+    @staticmethod
+    def get_name_field_from_endpoint(endpoint):
+        if endpoint == 'users':
+            return 'username'
+        elif endpoint == 'instances':
+            return 'hostname'
+        return 'name'
+
+    @staticmethod
+    def get_item_name(item):
+        if 'name' in item:
+            return item['name']
+        elif 'username' in item:
+            return item['username']
+        elif 'identifier' in item:
+            return item['identifier']
+        elif 'hostname' in item:
+            return item['hostname']
+        elif item.get('type', None) == 'o_auth2_access_token':
+            # An oauth2 token has no name, instead we will use its id for any of the messages
+            rerurn item['id']
+        elif item.get('type', None) == 'credential_input_source':
+            # An credential_input_source has no name, instead we will use its id for any of the messages
+            return existing_item['id']
+        return 'Unknown'
+
+
     def head_endpoint(self, endpoint, *args, **kwargs):
         return self.make_request('HEAD', endpoint, **kwargs)
 
@@ -88,13 +115,6 @@ class TowerAPIModule(TowerModule):
             response['json']['next'] = next_page
         return response
 
-    def get_name_field_from_endpoint(self, endpoint):
-        if endpoint == 'users':
-            return 'username'
-        elif endpoint == 'instances':
-            return 'hostname'
-        return 'name'
-
     def get_one(self, endpoint, name_or_id=None, *args, **kwargs):
         if name_or_id:
             name_field = self.get_name_field_from_endpoint(endpoint)
@@ -343,24 +363,10 @@ class TowerAPIModule(TowerModule):
                 item_url = existing_item['url']
                 item_type = existing_item['type']
                 item_id = existing_item['id']
+                item_name = self.get_item_name(existing_item)
             except KeyError as ke:
                 self.fail_json(msg="Unable to process delete of item due to missing data {0}".format(ke))
 
-            if 'name' in existing_item:
-                item_name = existing_item['name']
-            elif 'username' in existing_item:
-                item_name = existing_item['username']
-            elif 'identifier' in existing_item:
-                item_name = existing_item['identifier']
-            elif item_type == 'o_auth2_access_token':
-                # An oauth2 token has no name, instead we will use its id for any of the messages
-                item_name = existing_item['id']
-            elif item_type == 'credential_input_source':
-                # An credential_input_source has no name, instead we will use its id for any of the messages
-                item_name = existing_item['id']
-            else:
-                self.fail_json(msg="Unable to process delete of {0} due to missing name".format(item_type))
-
             response = self.delete_endpoint(item_url)
 
             if response['status_code'] in [202, 204]:
@@ -433,12 +439,7 @@ class TowerAPIModule(TowerModule):
 
             # We have to rely on item_type being passed in since we don't have an existing item that declares its type
             # We will pull the item_name out from the new_item, if it exists
-            for key in ('name', 'username', 'identifier', 'hostname'):
-                if key in new_item:
-                    item_name = new_item[key]
-                    break
-            else:
-                item_name = 'unknown'
+            item_name = self.get_item_name(new_item)
 
             response = self.post_endpoint(endpoint, **{'data': new_item})
             if response['status_code'] == 201:

From 106157c6003a2dc4e64977b374d5dc401fea5e4e Mon Sep 17 00:00:00 2001
From: John Westcott IV <john.westcott.iv@redhat.com>
Date: Fri, 4 Sep 2020 15:41:36 -0400
Subject: [PATCH 58/69] get_one now also returns the name field, and modifying
 modules for get_one and added in some IDs in a handful of unit tests

---
 .../plugins/module_utils/tower_api.py          |  6 +++---
 .../plugins/modules/tower_credential.py        |  4 +---
 .../modules/tower_credential_input_source.py   |  2 +-
 .../plugins/modules/tower_credential_type.py   |  6 +-----
 awx_collection/plugins/modules/tower_group.py  |  7 +++----
 awx_collection/plugins/modules/tower_host.py   |  3 +--
 .../plugins/modules/tower_instance_group.py    |  6 +-----
 .../plugins/modules/tower_inventory.py         |  3 +--
 .../plugins/modules/tower_inventory_source.py  |  8 ++++----
 .../plugins/modules/tower_job_cancel.py        |  2 +-
 .../plugins/modules/tower_job_launch.py        |  6 +-----
 .../plugins/modules/tower_job_template.py      |  7 +++----
 .../plugins/modules/tower_job_wait.py          |  2 +-
 awx_collection/plugins/modules/tower_label.py  |  3 +--
 .../modules/tower_notification_template.py     |  3 +--
 .../plugins/modules/tower_organization.py      |  6 +-----
 .../plugins/modules/tower_project.py           |  3 +--
 .../plugins/modules/tower_project_update.py    |  4 ++--
 .../plugins/modules/tower_schedule.py          |  6 +-----
 awx_collection/plugins/modules/tower_team.py   |  3 +--
 awx_collection/plugins/modules/tower_token.py  |  2 +-
 awx_collection/plugins/modules/tower_user.py   |  4 +---
 .../modules/tower_workflow_job_template.py     |  4 ++--
 .../tower_workflow_job_template_node.py        | 10 ++++++----
 .../plugins/modules/tower_workflow_launch.py   |  4 ++--
 .../tasks/main.yml                             | 12 ++++++------
 .../tower_credential_type/tasks/main.yml       |  2 +-
 .../targets/tower_group/tasks/main.yml         |  5 +++--
 .../targets/tower_host/tasks/main.yml          |  5 +++--
 .../tower_instance_group/tasks/main.yml        | 18 +++++++++++++++---
 .../targets/tower_inventory/tasks/main.yml     |  4 ++--
 .../tower_inventory_source/tasks/main.yml      |  5 +++--
 .../targets/tower_job_template/tasks/main.yml  | 14 +++++++-------
 .../roles/generate/templates/tower_module.j2   |  3 +--
 34 files changed, 83 insertions(+), 99 deletions(-)

diff --git a/awx_collection/plugins/module_utils/tower_api.py b/awx_collection/plugins/module_utils/tower_api.py
index da8474634d..cf2860a87b 100644
--- a/awx_collection/plugins/module_utils/tower_api.py
+++ b/awx_collection/plugins/module_utils/tower_api.py
@@ -141,18 +141,18 @@ class TowerAPIModule(TowerModule):
             self.fail_json(msg="The endpoint did not provide count and results")
 
         if response['json']['count'] == 0:
-            return None
+            return None, name_or_id
         elif response['json']['count'] > 1:
             if name_or_id:
                 # Since we did a name or ID search and got > 1 return something if the id matches
                 for asset in response['json']['results']:
                     if asset['id'] == name_or_id:
-                        return asset
+                        return asset, asset['id'][name_field]
             # We got > 1 and either didn't find something by ID (which means multiple names)
             # Or we weren't running with a or search and just got back too many to begin with.
             self.fail_json(msg="An unexpected number of items was returned from the API ({0})".format(response['json']['count']))
 
-        return response['json']['results'][0]
+        return response['json']['results'][0], response['json']['results'][0][name_field]
 
     def get_one_by_name_or_id(self, endpoint, name_or_id):
         name_field = self.get_name_field_from_endpoint(endpoint)
diff --git a/awx_collection/plugins/modules/tower_credential.py b/awx_collection/plugins/modules/tower_credential.py
index 3f37e0ad62..146484ca66 100644
--- a/awx_collection/plugins/modules/tower_credential.py
+++ b/awx_collection/plugins/modules/tower_credential.py
@@ -370,9 +370,7 @@ def main():
     if organization:
         lookup_data['organization'] = org_id
 
-    credential = module.get_one('credentials', name_or_id=name, **{'data': lookup_data})
-    # If we got an item back make sure the name field reflects the actual name (incase we were passed an ID)
-    name = credential['name'] if (credential) else name
+    credential, name = module.get_one('credentials', name_or_id=name, **{'data': lookup_data})
 
     if state == 'absent':
         # If the state was absent we can let the module delete it if needed, the module will handle exiting from this
diff --git a/awx_collection/plugins/modules/tower_credential_input_source.py b/awx_collection/plugins/modules/tower_credential_input_source.py
index cdc55cb1f0..0966ff3334 100644
--- a/awx_collection/plugins/modules/tower_credential_input_source.py
+++ b/awx_collection/plugins/modules/tower_credential_input_source.py
@@ -102,7 +102,7 @@ def main():
         'target_credential': target_credential_id,
         'input_field_name': input_field_name,
     }
-    credential_input_source = module.get_one('credential_input_sources', **{'data': lookup_data})
+    credential_input_source, junk = module.get_one('credential_input_sources', **{'data': lookup_data})
 
     if state == 'absent':
         module.delete_if_needed(credential_input_source)
diff --git a/awx_collection/plugins/modules/tower_credential_type.py b/awx_collection/plugins/modules/tower_credential_type.py
index 53f0cc45c9..3ab21c4330 100644
--- a/awx_collection/plugins/modules/tower_credential_type.py
+++ b/awx_collection/plugins/modules/tower_credential_type.py
@@ -128,11 +128,7 @@ def main():
         credential_type_params['injectors'] = module.params.get('injectors')
 
     # Attempt to look up credential_type based on the provided name
-    credential_type = module.get_one('credential_types', **{
-        'data': {
-            'name': name,
-        }
-    })
+    credential_type, name = module.get_one('credential_types', name_or_id=name)
 
     if state == 'absent':
         # If the state was absent we can let the module delete it if needed, the module will handle exiting from this
diff --git a/awx_collection/plugins/modules/tower_group.py b/awx_collection/plugins/modules/tower_group.py
index 9e2eaf4e7e..778c54b0c7 100644
--- a/awx_collection/plugins/modules/tower_group.py
+++ b/awx_collection/plugins/modules/tower_group.py
@@ -108,9 +108,8 @@ def main():
     inventory_id = module.resolve_name_to_id('inventories', inventory)
 
     # Attempt to look up the object based on the provided name and inventory ID
-    group = module.get_one('groups', **{
+    group, name = module.get_one('groups', name_or_id=name, **{
         'data': {
-            'name': name,
             'inventory': inventory_id
         }
     })
@@ -136,8 +135,8 @@ def main():
             continue
         id_list = []
         for sub_name in name_list:
-            sub_obj = module.get_one(resource, **{
-                'data': {'inventory': inventory_id, 'name': sub_name}
+            sub_obj, sub_name = module.get_one(resource, name_or_id=sub_name, **{
+                'data': {'inventory': inventory_id},
             })
             if sub_obj is None:
                 module.fail_json(msg='Could not find {0} with name {1}'.format(resource, sub_name))
diff --git a/awx_collection/plugins/modules/tower_host.py b/awx_collection/plugins/modules/tower_host.py
index f6bfe55404..d0cf12bcb9 100644
--- a/awx_collection/plugins/modules/tower_host.py
+++ b/awx_collection/plugins/modules/tower_host.py
@@ -104,9 +104,8 @@ def main():
     inventory_id = module.resolve_name_to_id('inventories', inventory)
 
     # Attempt to look up host based on the provided name and inventory ID
-    host = module.get_one('hosts', **{
+    host, name = module.get_one('hosts', name_or_id=name, **{
         'data': {
-            'name': name,
             'inventory': inventory_id
         }
     })
diff --git a/awx_collection/plugins/modules/tower_instance_group.py b/awx_collection/plugins/modules/tower_instance_group.py
index 9a7db2f814..cc8c97033f 100644
--- a/awx_collection/plugins/modules/tower_instance_group.py
+++ b/awx_collection/plugins/modules/tower_instance_group.py
@@ -109,11 +109,7 @@ def main():
     state = module.params.get('state')
 
     # Attempt to look up an existing item based on the provided data
-    existing_item = module.get_one('instance_groups', **{
-        'data': {
-            'name': name,
-        }
-    })
+    existing_item, name = module.get_one('instance_groups', name_or_id=name)
 
     if state is 'absent':
         # If the state was absent we can let the module delete it if needed, the module will handle exiting from this
diff --git a/awx_collection/plugins/modules/tower_inventory.py b/awx_collection/plugins/modules/tower_inventory.py
index 20093038c7..e8462a2844 100644
--- a/awx_collection/plugins/modules/tower_inventory.py
+++ b/awx_collection/plugins/modules/tower_inventory.py
@@ -109,9 +109,8 @@ def main():
     org_id = module.resolve_name_to_id('organizations', organization)
 
     # Attempt to look up inventory based on the provided name and org ID
-    inventory = module.get_one('inventories', **{
+    inventory, name = module.get_one('inventories', name_or_id=name, **{
         'data': {
-            'name': name,
             'organization': org_id
         }
     })
diff --git a/awx_collection/plugins/modules/tower_inventory_source.py b/awx_collection/plugins/modules/tower_inventory_source.py
index 1714773b32..289707ccd9 100644
--- a/awx_collection/plugins/modules/tower_inventory_source.py
+++ b/awx_collection/plugins/modules/tower_inventory_source.py
@@ -202,17 +202,17 @@ def main():
     source_project = module.params.get('source_project')
     state = module.params.get('state')
 
-    lookup_data = {'name': inventory}
+<<<<<<< HEAD
+    lookup_data = {}
     if organization:
         lookup_data['organization'] = module.resolve_name_to_id('organizations', organization)
-    inventory_object = module.get_one('inventories', data=lookup_data)
+    inventory_object = module.get_one('inventories', name_or_id=inventory, data=lookup_data)
 
     if not inventory_object:
         module.fail_json(msg='The specified inventory, {0}, was not found.'.format(lookup_data))
 
-    inventory_source_object = module.get_one('inventory_sources', **{
+    inventory_source_object = module.get_one('inventory_sources', name_or_id=name, **{
         'data': {
-            'name': name,
             'inventory': inventory_object['id'],
         }
     })
diff --git a/awx_collection/plugins/modules/tower_job_cancel.py b/awx_collection/plugins/modules/tower_job_cancel.py
index 7404d452a4..0bfe41d9c0 100644
--- a/awx_collection/plugins/modules/tower_job_cancel.py
+++ b/awx_collection/plugins/modules/tower_job_cancel.py
@@ -68,7 +68,7 @@ def main():
     fail_if_not_running = module.params.get('fail_if_not_running')
 
     # Attempt to look up the job based on the provided name
-    job = module.get_one('jobs', **{
+    job, job_name = module.get_one('jobs', **{
         'data': {
             'id': job_id,
         }
diff --git a/awx_collection/plugins/modules/tower_job_launch.py b/awx_collection/plugins/modules/tower_job_launch.py
index 7e2dca0e38..39c5b9caf4 100644
--- a/awx_collection/plugins/modules/tower_job_launch.py
+++ b/awx_collection/plugins/modules/tower_job_launch.py
@@ -201,11 +201,7 @@ def main():
             post_data['credentials'].append(module.resolve_name_to_id('credentials', credential))
 
     # Attempt to look up job_template based on the provided name
-    job_template = module.get_one('job_templates', **{
-        'data': {
-            'name': name,
-        }
-    })
+    job_template, name = module.get_one('job_templates', name_or_id=name)
 
     if job_template is None:
         module.fail_json(msg="Unable to find job template by name {0}".format(name))
diff --git a/awx_collection/plugins/modules/tower_job_template.py b/awx_collection/plugins/modules/tower_job_template.py
index 1f12d5aadd..7f59e3f945 100644
--- a/awx_collection/plugins/modules/tower_job_template.py
+++ b/awx_collection/plugins/modules/tower_job_template.py
@@ -409,7 +409,7 @@ def main():
         credentials.append(credential)
 
     new_fields = {}
-    search_fields = {'name': name}
+    search_fields = {}
 
     # Attempt to look up the related items the user specified (these will fail the module if not found)
     organization_id = None
@@ -419,7 +419,7 @@ def main():
         search_fields['organization'] = new_fields['organization'] = organization_id
 
     # Attempt to look up an existing item based on the provided data
-    existing_item = module.get_one('job_templates', **{'data': search_fields})
+    existing_item, name = module.get_one('job_templates', name_or_id=name, **{'data': search_fields})
 
     if state == 'absent':
         # If the state was absent we can let the module delete it if needed, the module will handle exiting from this
@@ -453,9 +453,8 @@ def main():
         new_fields['inventory'] = module.resolve_name_to_id('inventories', inventory)
     if project is not None:
         if organization_id is not None:
-            project_data = module.get_one('projects', **{
+            project_data, project = module.get_one('projects', name_or_id=project, **{
                 'data': {
-                    'name': project,
                     'organization': organization_id,
                 }
             })
diff --git a/awx_collection/plugins/modules/tower_job_wait.py b/awx_collection/plugins/modules/tower_job_wait.py
index 6f71a1be5b..399926805f 100644
--- a/awx_collection/plugins/modules/tower_job_wait.py
+++ b/awx_collection/plugins/modules/tower_job_wait.py
@@ -130,7 +130,7 @@ def main():
         )
 
     # Attempt to look up job based on the provided id
-    job = module.get_one('jobs', **{
+    job, junk = module.get_one('jobs', **{
         'data': {
             'id': job_id,
         }
diff --git a/awx_collection/plugins/modules/tower_label.py b/awx_collection/plugins/modules/tower_label.py
index 6a3a8288a2..30b4843c41 100644
--- a/awx_collection/plugins/modules/tower_label.py
+++ b/awx_collection/plugins/modules/tower_label.py
@@ -80,9 +80,8 @@ def main():
         organization_id = module.resolve_name_to_id('organizations', organization)
 
     # Attempt to look up an existing item based on the provided data
-    existing_item = module.get_one('labels', **{
+    existing_item, name = module.get_one('labels', name_or_id=name, **{
         'data': {
-            'name': name,
             'organization': organization_id,
         }
     })
diff --git a/awx_collection/plugins/modules/tower_notification_template.py b/awx_collection/plugins/modules/tower_notification_template.py
index ec25038e34..4ad387fc5d 100644
--- a/awx_collection/plugins/modules/tower_notification_template.py
+++ b/awx_collection/plugins/modules/tower_notification_template.py
@@ -380,9 +380,8 @@ def main():
         organization_id = module.resolve_name_to_id('organizations', organization)
 
     # Attempt to look up an existing item based on the provided data
-    existing_item = module.get_one('notification_templates', **{
+    existing_item, name = module.get_one('notification_templates', name_or_id=name, **{
         'data': {
-            'name': name,
             'organization': organization_id,
         }
     })
diff --git a/awx_collection/plugins/modules/tower_organization.py b/awx_collection/plugins/modules/tower_organization.py
index 1637828149..33da6b0f90 100644
--- a/awx_collection/plugins/modules/tower_organization.py
+++ b/awx_collection/plugins/modules/tower_organization.py
@@ -117,11 +117,7 @@ def main():
     state = module.params.get('state')
 
     # Attempt to look up organization based on the provided name
-    organization = module.get_one('organizations', **{
-        'data': {
-            'name': name,
-        }
-    })
+    organization, name = module.get_one('organizations', name_or_id=name)
 
     if state == 'absent':
         # If the state was absent we can let the module delete it if needed, the module will handle exiting from this
diff --git a/awx_collection/plugins/modules/tower_project.py b/awx_collection/plugins/modules/tower_project.py
index 8662029f66..bd33ad9ef2 100644
--- a/awx_collection/plugins/modules/tower_project.py
+++ b/awx_collection/plugins/modules/tower_project.py
@@ -239,9 +239,8 @@ def main():
         credential = module.resolve_name_to_id('credentials', credential)
 
     # Attempt to look up project based on the provided name and org ID
-    project = module.get_one('projects', **{
+    project, name = module.get_one('projects', name_or_id=name, **{
         'data': {
-            'name': name,
             'organization': org_id
         }
     })
diff --git a/awx_collection/plugins/modules/tower_project_update.py b/awx_collection/plugins/modules/tower_project_update.py
index cc32446d65..7622001411 100644
--- a/awx_collection/plugins/modules/tower_project_update.py
+++ b/awx_collection/plugins/modules/tower_project_update.py
@@ -109,10 +109,10 @@ def main():
             module.fail_json(msg='Could not find Project with ID: {0}'.format(name))
         project = results['json']['results'][0]
     else:
-        lookup_data = {'name': name}
+        lookup_data = {}
         if organization:
             lookup_data['organization'] = module.resolve_name_to_id('organizations', organization)
-        project = module.get_one('projects', data=lookup_data)
+        project, name = module.get_one('projects', name_or_id=name, data=lookup_data)
         if project is None:
             module.fail_json(msg="Unable to find project")
 
diff --git a/awx_collection/plugins/modules/tower_schedule.py b/awx_collection/plugins/modules/tower_schedule.py
index 4922aaa688..c69905bfac 100644
--- a/awx_collection/plugins/modules/tower_schedule.py
+++ b/awx_collection/plugins/modules/tower_schedule.py
@@ -190,11 +190,7 @@ def main():
         unified_job_template_id = module.resolve_name_to_id('unified_job_templates', unified_job_template)
 
     # Attempt to look up an existing item based on the provided data
-    existing_item = module.get_one('schedules', **{
-        'data': {
-            'name': name,
-        }
-    })
+    existing_item, name = module.get_one('schedules', name_or_id=name)
 
     # Create the data that gets sent for create and update
     new_fields = {}
diff --git a/awx_collection/plugins/modules/tower_team.py b/awx_collection/plugins/modules/tower_team.py
index 8ed56e48dc..7f7f5fa632 100644
--- a/awx_collection/plugins/modules/tower_team.py
+++ b/awx_collection/plugins/modules/tower_team.py
@@ -87,9 +87,8 @@ def main():
     org_id = module.resolve_name_to_id('organizations', organization)
 
     # Attempt to look up team based on the provided name and org ID
-    team = module.get_one('teams', **{
+    team, name = module.get_one('teams', name_or_id=name, **{
         'data': {
-            'name': name,
             'organization': org_id
         }
     })
diff --git a/awx_collection/plugins/modules/tower_token.py b/awx_collection/plugins/modules/tower_token.py
index ee6fd5c200..2680caaf93 100644
--- a/awx_collection/plugins/modules/tower_token.py
+++ b/awx_collection/plugins/modules/tower_token.py
@@ -164,7 +164,7 @@ def main():
 
     if state == 'absent':
         if not existing_token:
-            existing_token = module.get_one('tokens', **{
+            existing_token, token_name = module.get_one('tokens', **{
                 'data': {
                     'id': existing_token_id,
                 }
diff --git a/awx_collection/plugins/modules/tower_user.py b/awx_collection/plugins/modules/tower_user.py
index 19cf00fa1f..56f231dae8 100644
--- a/awx_collection/plugins/modules/tower_user.py
+++ b/awx_collection/plugins/modules/tower_user.py
@@ -134,9 +134,7 @@ def main():
     # Attempt to look up the related items the user specified (these will fail the module if not found)
 
     # Attempt to look up an existing item based on the provided data
-    existing_item = module.get_one('users', name_or_id=username)
-    # If we got an item back make sure the name field reflects the actual name (incase we were passed an ID)
-    username = existing_item['username'] if (existing_item) else username
+    existing_item, username = module.get_one('users', name_or_id=username)
 
     if state == 'absent':
         # If the state was absent we can let the module delete it if needed, the module will handle exiting from this
diff --git a/awx_collection/plugins/modules/tower_workflow_job_template.py b/awx_collection/plugins/modules/tower_workflow_job_template.py
index 8fb350b919..21818cb4c6 100644
--- a/awx_collection/plugins/modules/tower_workflow_job_template.py
+++ b/awx_collection/plugins/modules/tower_workflow_job_template.py
@@ -184,7 +184,7 @@ def main():
     state = module.params.get('state')
 
     new_fields = {}
-    search_fields = {'name': name}
+    search_fields = {}
 
     # Attempt to look up the related items the user specified (these will fail the module if not found)
     organization = module.params.get('organization')
@@ -193,7 +193,7 @@ def main():
         search_fields['organization'] = new_fields['organization'] = organization_id
 
     # Attempt to look up an existing item based on the provided data
-    existing_item = module.get_one('workflow_job_templates', **{'data': search_fields})
+    existing_item, name = module.get_one('workflow_job_templates', name_or_id=name, **{'data': search_fields})
 
     if state == 'absent':
         # If the state was absent we can let the module delete it if needed, the module will handle exiting from this
diff --git a/awx_collection/plugins/modules/tower_workflow_job_template_node.py b/awx_collection/plugins/modules/tower_workflow_job_template_node.py
index 7ef9e14619..2ba74c1fb9 100644
--- a/awx_collection/plugins/modules/tower_workflow_job_template_node.py
+++ b/awx_collection/plugins/modules/tower_workflow_job_template_node.py
@@ -198,12 +198,14 @@ def main():
     workflow_job_template = module.params.get('workflow_job_template')
     workflow_job_template_id = None
     if workflow_job_template:
-        wfjt_search_fields = {'name': workflow_job_template}
+        wfjt_search_fields = {}
         organization = module.params.get('organization')
         if organization:
             organization_id = module.resolve_name_to_id('organizations', organization)
             wfjt_search_fields['organization'] = organization_id
-        wfjt_data = module.get_one('workflow_job_templates', **{'data': wfjt_search_fields})
+        wfjt_data, workflow_job_template = module.get_one('workflow_job_templates', name_or_id=workflow_job_template, **{
+            'data': wfjt_search_fields
+        })
         if wfjt_data is None:
             module.fail_json(msg="The workflow {0} in organization {1} was not found on the Tower server".format(
                 workflow_job_template, organization
@@ -212,7 +214,7 @@ def main():
         search_fields['workflow_job_template'] = new_fields['workflow_job_template'] = workflow_job_template_id
 
     # Attempt to look up an existing item based on the provided data
-    existing_item = module.get_one('workflow_job_template_nodes', **{'data': search_fields})
+    existing_item, junk = module.get_one('workflow_job_template_nodes', **{'data': search_fields})
 
     if state == 'absent':
         # If the state was absent we can let the module delete it if needed, the module will handle exiting from this
@@ -249,7 +251,7 @@ def main():
                 lookup_data = {'identifier': sub_name}
                 if workflow_job_template_id:
                     lookup_data['workflow_job_template'] = workflow_job_template_id
-            sub_obj = module.get_one(endpoint, **{'data': lookup_data})
+            sub_obj, junk = module.get_one(endpoint, **{'data': lookup_data})
             if sub_obj is None:
                 module.fail_json(msg='Could not find {0} entry with name {1}'.format(association, sub_name))
             id_list.append(sub_obj['id'])
diff --git a/awx_collection/plugins/modules/tower_workflow_launch.py b/awx_collection/plugins/modules/tower_workflow_launch.py
index f8ab793bad..0e9cbb9ad6 100644
--- a/awx_collection/plugins/modules/tower_workflow_launch.py
+++ b/awx_collection/plugins/modules/tower_workflow_launch.py
@@ -138,10 +138,10 @@ def main():
         post_data['inventory'] = module.resolve_name_to_id('inventories', inventory)
 
     # Attempt to look up job_template based on the provided name
-    lookup_data = {'name': name}
+    lookup_data = {}
     if organization:
         lookup_data['organization'] = module.resolve_name_to_id('organizations', organization)
-    workflow_job_template = module.get_one('workflow_job_templates', data=lookup_data)
+    workflow_job_template, name = module.get_one('workflow_job_templates', name_or_id=name, data=lookup_data)
 
     if workflow_job_template is None:
         module.fail_json(msg="Unable to find workflow job template")
diff --git a/awx_collection/tests/integration/targets/tower_credential_input_source/tasks/main.yml b/awx_collection/tests/integration/targets/tower_credential_input_source/tasks/main.yml
index 45be47ddf7..ecc6d39af4 100644
--- a/awx_collection/tests/integration/targets/tower_credential_input_source/tasks/main.yml
+++ b/awx_collection/tests/integration/targets/tower_credential_input_source/tasks/main.yml
@@ -13,11 +13,11 @@
       url: "https://cyberark.example.com"
       app_id: "My-App-ID"
     organization: Default
-  register: result
+  register: src_cred_result
 
 - assert:
     that:
-      - "result is changed"
+      - "src_cred_result is changed"
 
 - name: Add Tower credential Target
   tower_credential:
@@ -27,17 +27,17 @@
     inputs:
       username: user
     organization: Default
-  register: result
+  register: target_cred_result
 
 - assert:
     that:
-      - "result is changed"
+      - "target_cred_result is changed"
 
 - name: Add credential Input Source
   tower_credential_input_source:
     input_field_name: password
-    target_credential: "{{ target_cred_name }}"
-    source_credential: "{{ src_cred_name }}"
+    target_credential: "{{ target_cred_result.id }}"
+    source_credential: "{{ src_cred_result.id }}"
     metadata:
       object_query: "Safe=MY_SAFE;Object=AWX-user"
       object_query_format: "Exact"
diff --git a/awx_collection/tests/integration/targets/tower_credential_type/tasks/main.yml b/awx_collection/tests/integration/targets/tower_credential_type/tasks/main.yml
index a15cd26795..a38f2eeaae 100644
--- a/awx_collection/tests/integration/targets/tower_credential_type/tasks/main.yml
+++ b/awx_collection/tests/integration/targets/tower_credential_type/tasks/main.yml
@@ -18,7 +18,7 @@
 
 - name: Remove a Tower credential type
   tower_credential_type:
-    name: "{{ cred_type_name }}"
+    name: "{{ result.id }}"
     state: absent
   register: result
 
diff --git a/awx_collection/tests/integration/targets/tower_group/tasks/main.yml b/awx_collection/tests/integration/targets/tower_group/tasks/main.yml
index 38e76719cf..e59d3c82db 100644
--- a/awx_collection/tests/integration/targets/tower_group/tasks/main.yml
+++ b/awx_collection/tests/integration/targets/tower_group/tasks/main.yml
@@ -14,11 +14,12 @@
     name: "{{ inv_name }}"
     organization: Default
     state: present
+  register: result
 
 - name: Create a Group
   tower_group:
     name: "{{ group_name1 }}"
-    inventory: "{{ inv_name }}"
+    inventory: "{{ result.id }}"
     state: present
     variables:
       foo: bar
@@ -30,7 +31,7 @@
 
 - name: Delete a Group
   tower_group:
-    name: "{{ group_name1 }}"
+    name: "{{ result.id }}"
     inventory: "{{ inv_name }}"
     state: absent
   register: result
diff --git a/awx_collection/tests/integration/targets/tower_host/tasks/main.yml b/awx_collection/tests/integration/targets/tower_host/tasks/main.yml
index 597d6ef734..34e02220a7 100644
--- a/awx_collection/tests/integration/targets/tower_host/tasks/main.yml
+++ b/awx_collection/tests/integration/targets/tower_host/tasks/main.yml
@@ -9,11 +9,12 @@
     name: "{{ inv_name }}"
     organization: Default
     state: present
+  register: result
 
 - name: Create a Host
   tower_host:
     name: "{{ host_name }}"
-    inventory: "{{ inv_name }}"
+    inventory: "{{ result.id }}"
     state: present
     variables:
       foo: bar
@@ -25,7 +26,7 @@
 
 - name: Delete a Host
   tower_host:
-    name: "{{ host_name }}"
+    name: "{{ result.id }}"
     inventory: "{{ inv_name }}"
     state: absent
   register: result
diff --git a/awx_collection/tests/integration/targets/tower_instance_group/tasks/main.yml b/awx_collection/tests/integration/targets/tower_instance_group/tasks/main.yml
index 4ae9cfaffc..0ca696edab 100644
--- a/awx_collection/tests/integration/targets/tower_instance_group/tasks/main.yml
+++ b/awx_collection/tests/integration/targets/tower_instance_group/tasks/main.yml
@@ -19,11 +19,11 @@
           host: "https://openshift.org"
           bearer_token: "asdf1234"
           verify_ssl: false
-      register: result
+      register: cred_result
 
     - assert:
         that:
-          - "result is changed"
+          - "cred_result is changed"
 
     - name: Create an Instance Group
       tower_instance_group:
@@ -37,10 +37,22 @@
         that:
           - "result is changed"
 
+    - name: Update an Instance Group
+      tower_instance_group:
+        name: "{{ result.id }}"
+        policy_instance_percentage: 34
+        policy_instance_minimum: 24
+        state: present
+      register: result
+
+    - assert:
+        that:
+          - "result is changed"
+
     - name: Create a container group
       tower_instance_group:
         name: "{{ group_name2 }}"
-        credential: "{{ cred_name1 }}"
+        credential: "{{ cred_result.id }}"
       register: result
 
     - assert:
diff --git a/awx_collection/tests/integration/targets/tower_inventory/tasks/main.yml b/awx_collection/tests/integration/targets/tower_inventory/tasks/main.yml
index 3360a57b8c..552b32f47c 100644
--- a/awx_collection/tests/integration/targets/tower_inventory/tasks/main.yml
+++ b/awx_collection/tests/integration/targets/tower_inventory/tasks/main.yml
@@ -29,7 +29,7 @@
       tower_inventory:
         name: "{{ inv_name1 }}"
         organization: Default
-        insights_credential: "{{ cred_name1 }}"
+        insights_credential: "{{ results.id }}"
         state: present
       register: result
 
@@ -39,7 +39,7 @@
 
     - name: Test Inventory module idempotency
       tower_inventory:
-        name: "{{ inv_name1 }}"
+        name: "{{ result.id }}"
         organization: Default
         insights_credential: "{{ cred_name1 }}"
         state: present
diff --git a/awx_collection/tests/integration/targets/tower_inventory_source/tasks/main.yml b/awx_collection/tests/integration/targets/tower_inventory_source/tasks/main.yml
index fb5f33c3ca..17154a54fe 100644
--- a/awx_collection/tests/integration/targets/tower_inventory_source/tasks/main.yml
+++ b/awx_collection/tests/integration/targets/tower_inventory_source/tasks/main.yml
@@ -16,6 +16,7 @@
     host: https://example.org:5000
     password: passw0rd
     domain: test
+  register: credential_result
 
 - name: Add a Tower inventory
   tower_inventory:
@@ -28,7 +29,7 @@
     name: "{{ openstack_inv_source }}"
     description: Source for Test inventory
     inventory: "{{ openstack_inv }}"
-    credential: "{{ openstack_cred }}"
+    credential: "{{ credential_result.id }}"
     overwrite: true
     update_on_launch: true
     source_vars:
@@ -42,7 +43,7 @@
 
 - name: Delete the inventory source with an invalid cred, source_project, sourece_script specified
   tower_inventory_source:
-    name: "{{ openstack_inv_source }}"
+    name: "{{ result.id }}"
     inventory: "{{ openstack_inv }}"
     credential: "Does Not Exit"
     source_project: "Does Not Exist"
diff --git a/awx_collection/tests/integration/targets/tower_job_template/tasks/main.yml b/awx_collection/tests/integration/targets/tower_job_template/tasks/main.yml
index a744b89464..6b3717d5e5 100644
--- a/awx_collection/tests/integration/targets/tower_job_template/tasks/main.yml
+++ b/awx_collection/tests/integration/targets/tower_job_template/tasks/main.yml
@@ -22,14 +22,14 @@
     state: present
     scm_type: git
     scm_url: https://github.com/ansible/ansible-tower-samples.git
-
-  register: result
+  register: proj_result
 
 - name: Create Credential1
   tower_credential:
     name: "{{ cred1 }}"
     organization: Default
     kind: tower
+  register: cred1_result
 
 - name: Create Credential2
   tower_credential:
@@ -84,19 +84,19 @@
     credentials: ["{{ cred1 }}", "{{ cred2 }}"]
     job_type: run
     state: present
-  register: result
+  register: jt1_result
 
 - assert:
     that:
-      - "result is changed"
+      - "jt1_result is changed"
 
 - name: Add a credential to this JT
   tower_job_template:
     name: "{{ jt1 }}"
-    project: "{{ proj1 }}"
+    project: "{{ proj_result.id }}"
     playbook: hello_world.yml
     credentials:
-      - "{{ cred1 }}"
+      - "{{ cred1_result.id }}"
   register: result
 
 - assert:
@@ -105,7 +105,7 @@
 
 - name: Try to add the same credential to this JT
   tower_job_template:
-    name: "{{ jt1 }}"
+    name: "{{ jt1_result.id }}"
     project: "{{ proj1 }}"
     playbook: hello_world.yml
     credentials:
diff --git a/awx_collection/tools/roles/generate/templates/tower_module.j2 b/awx_collection/tools/roles/generate/templates/tower_module.j2
index 3606cff547..8c82da660d 100644
--- a/awx_collection/tools/roles/generate/templates/tower_module.j2
+++ b/awx_collection/tools/roles/generate/templates/tower_module.j2
@@ -175,9 +175,8 @@ def main():
 {% endfor %}
 
     # Attempt to look up an existing item based on the provided data
-    existing_item = module.get_one('{{ item_type }}', **{
+    existing_item, name = module.get_one('{{ item_type }}', name_or_id={{ name_option }}, **{
         'data': {
-            '{{ name_option }}': {{ name_option }},
 {% if 'organization' in item['json']['actions']['POST'] and item['json']['actions']['POST']['organization']['type'] == 'id' %}
             'organization': org_id,
 {% endif %}

From 0a8db586d14a68476ad32d6ed1236c780e5bfe17 Mon Sep 17 00:00:00 2001
From: John Westcott IV <john.westcott.iv@redhat.com>
Date: Tue, 8 Sep 2020 11:02:25 -0400
Subject: [PATCH 59/69] Changing how get_one returns

---
 .../plugins/module_utils/tower_api.py         | 41 ++++++++-----------
 .../plugins/modules/tower_credential.py       |  4 +-
 .../modules/tower_credential_input_source.py  |  2 +-
 .../plugins/modules/tower_credential_type.py  |  5 ++-
 awx_collection/plugins/modules/tower_group.py |  6 +--
 awx_collection/plugins/modules/tower_host.py  |  4 +-
 .../plugins/modules/tower_instance_group.py   |  4 +-
 .../plugins/modules/tower_inventory.py        |  4 +-
 .../plugins/modules/tower_inventory_source.py | 34 +++++----------
 .../plugins/modules/tower_job_cancel.py       |  2 +-
 .../plugins/modules/tower_job_launch.py       |  2 +-
 .../plugins/modules/tower_job_template.py     |  4 +-
 .../plugins/modules/tower_job_wait.py         |  2 +-
 awx_collection/plugins/modules/tower_label.py |  4 +-
 .../modules/tower_notification_template.py    |  4 +-
 .../plugins/modules/tower_organization.py     |  4 +-
 .../plugins/modules/tower_project.py          |  4 +-
 .../plugins/modules/tower_project_update.py   | 20 ++++-----
 .../plugins/modules/tower_schedule.py         |  4 +-
 awx_collection/plugins/modules/tower_team.py  |  4 +-
 awx_collection/plugins/modules/tower_token.py |  2 +-
 awx_collection/plugins/modules/tower_user.py  |  4 +-
 .../modules/tower_workflow_job_template.py    |  4 +-
 .../tower_workflow_job_template_node.py       |  6 +--
 .../plugins/modules/tower_workflow_launch.py  |  2 +-
 25 files changed, 76 insertions(+), 100 deletions(-)

diff --git a/awx_collection/plugins/module_utils/tower_api.py b/awx_collection/plugins/module_utils/tower_api.py
index cf2860a87b..7ba5b1de7d 100644
--- a/awx_collection/plugins/module_utils/tower_api.py
+++ b/awx_collection/plugins/module_utils/tower_api.py
@@ -25,6 +25,11 @@ class TowerAPIModule(TowerModule):
     }
     session = None
     cookie_jar = CookieJar()
+    IDENTITY_FIELDS = {
+        'users': 'username',
+        'workflow_job_template_nodes': 'identifier',
+        'instances': 'hostname'
+    }
 
     def __init__(self, argument_spec, direct_params=None, error_callback=None, warn_callback=None, **kwargs):
         kwargs['supports_check_mode'] = True
@@ -44,30 +49,20 @@ class TowerAPIModule(TowerModule):
 
     @staticmethod
     def get_name_field_from_endpoint(endpoint):
-        if endpoint == 'users':
-            return 'username'
-        elif endpoint == 'instances':
-            return 'hostname'
-        return 'name'
+        return TowerAPIModule.IDENTITY_FIELDS.get(endpoint, 'name')
 
-    @staticmethod
-    def get_item_name(item):
+    def get_item_name(self, item):
         if 'name' in item:
             return item['name']
-        elif 'username' in item:
-            return item['username']
-        elif 'identifier' in item:
-            return item['identifier']
-        elif 'hostname' in item:
-            return item['hostname']
-        elif item.get('type', None) == 'o_auth2_access_token':
-            # An oauth2 token has no name, instead we will use its id for any of the messages
-            rerurn item['id']
-        elif item.get('type', None) == 'credential_input_source':
-            # An credential_input_source has no name, instead we will use its id for any of the messages
-            return existing_item['id']
-        return 'Unknown'
 
+        for field_name in TowerAPIModule.IDENTITY_FIELDS.values():
+            if field_name in item:
+                return item[field_name]
+
+        if item.get('type', None) in ('o_auth2_access_token', 'credential_input_source'):
+            return item['id']
+
+        self.exit_json(msg='Cannot determine identity field for {0} object.'.format(item.get('type', 'unknown')))
 
     def head_endpoint(self, endpoint, *args, **kwargs):
         return self.make_request('HEAD', endpoint, **kwargs)
@@ -141,18 +136,18 @@ class TowerAPIModule(TowerModule):
             self.fail_json(msg="The endpoint did not provide count and results")
 
         if response['json']['count'] == 0:
-            return None, name_or_id
+            return None
         elif response['json']['count'] > 1:
             if name_or_id:
                 # Since we did a name or ID search and got > 1 return something if the id matches
                 for asset in response['json']['results']:
                     if asset['id'] == name_or_id:
-                        return asset, asset['id'][name_field]
+                        return asset
             # We got > 1 and either didn't find something by ID (which means multiple names)
             # Or we weren't running with a or search and just got back too many to begin with.
             self.fail_json(msg="An unexpected number of items was returned from the API ({0})".format(response['json']['count']))
 
-        return response['json']['results'][0], response['json']['results'][0][name_field]
+        return response['json']['results'][0]
 
     def get_one_by_name_or_id(self, endpoint, name_or_id):
         name_field = self.get_name_field_from_endpoint(endpoint)
diff --git a/awx_collection/plugins/modules/tower_credential.py b/awx_collection/plugins/modules/tower_credential.py
index 146484ca66..f244ae812e 100644
--- a/awx_collection/plugins/modules/tower_credential.py
+++ b/awx_collection/plugins/modules/tower_credential.py
@@ -370,7 +370,7 @@ def main():
     if organization:
         lookup_data['organization'] = org_id
 
-    credential, name = module.get_one('credentials', name_or_id=name, **{'data': lookup_data})
+    credential = module.get_one('credentials', name_or_id=name, **{'data': lookup_data})
 
     if state == 'absent':
         # If the state was absent we can let the module delete it if needed, the module will handle exiting from this
@@ -396,7 +396,7 @@ def main():
 
     # Create the data that gets sent for create and update
     credential_fields = {
-        'name': new_name if new_name else name,
+        'name': new_name if new_name else (module.get_item_name(credential) if credential else name),
         'credential_type': cred_type_id,
     }
     if has_inputs:
diff --git a/awx_collection/plugins/modules/tower_credential_input_source.py b/awx_collection/plugins/modules/tower_credential_input_source.py
index 0966ff3334..cdc55cb1f0 100644
--- a/awx_collection/plugins/modules/tower_credential_input_source.py
+++ b/awx_collection/plugins/modules/tower_credential_input_source.py
@@ -102,7 +102,7 @@ def main():
         'target_credential': target_credential_id,
         'input_field_name': input_field_name,
     }
-    credential_input_source, junk = module.get_one('credential_input_sources', **{'data': lookup_data})
+    credential_input_source = module.get_one('credential_input_sources', **{'data': lookup_data})
 
     if state == 'absent':
         module.delete_if_needed(credential_input_source)
diff --git a/awx_collection/plugins/modules/tower_credential_type.py b/awx_collection/plugins/modules/tower_credential_type.py
index 3ab21c4330..37bb7f6502 100644
--- a/awx_collection/plugins/modules/tower_credential_type.py
+++ b/awx_collection/plugins/modules/tower_credential_type.py
@@ -115,7 +115,6 @@ def main():
 
     # These will be passed into the create/updates
     credential_type_params = {
-        'name': new_name if new_name else name,
         'managed_by_tower': False,
     }
     if kind:
@@ -128,12 +127,14 @@ def main():
         credential_type_params['injectors'] = module.params.get('injectors')
 
     # Attempt to look up credential_type based on the provided name
-    credential_type, name = module.get_one('credential_types', name_or_id=name)
+    credential_type = module.get_one('credential_types', name_or_id=name)
 
     if state == 'absent':
         # If the state was absent we can let the module delete it if needed, the module will handle exiting from this
         module.delete_if_needed(credential_type)
 
+    credential_type_params['name'] = new_name if new_name else (module.get_item_name(credential_type) if credential_type else name)
+
     # If the state was present and we can let the module build or update the existing credential type, this will return on its own
     module.create_or_update_if_needed(credential_type, credential_type_params, endpoint='credential_types', item_type='credential type')
 
diff --git a/awx_collection/plugins/modules/tower_group.py b/awx_collection/plugins/modules/tower_group.py
index 778c54b0c7..6781dc5883 100644
--- a/awx_collection/plugins/modules/tower_group.py
+++ b/awx_collection/plugins/modules/tower_group.py
@@ -108,7 +108,7 @@ def main():
     inventory_id = module.resolve_name_to_id('inventories', inventory)
 
     # Attempt to look up the object based on the provided name and inventory ID
-    group, name = module.get_one('groups', name_or_id=name, **{
+    group = module.get_one('groups', name_or_id=name, **{
         'data': {
             'inventory': inventory_id
         }
@@ -120,7 +120,7 @@ def main():
 
     # Create the data that gets sent for create and update
     group_fields = {
-        'name': new_name if new_name else name,
+        'name': new_name if new_name else (module.get_item_name(group) if group else name),
         'inventory': inventory_id,
     }
     if description is not None:
@@ -135,7 +135,7 @@ def main():
             continue
         id_list = []
         for sub_name in name_list:
-            sub_obj, sub_name = module.get_one(resource, name_or_id=sub_name, **{
+            sub_obj = module.get_one(resource, name_or_id=sub_name, **{
                 'data': {'inventory': inventory_id},
             })
             if sub_obj is None:
diff --git a/awx_collection/plugins/modules/tower_host.py b/awx_collection/plugins/modules/tower_host.py
index d0cf12bcb9..6c84f88a99 100644
--- a/awx_collection/plugins/modules/tower_host.py
+++ b/awx_collection/plugins/modules/tower_host.py
@@ -104,7 +104,7 @@ def main():
     inventory_id = module.resolve_name_to_id('inventories', inventory)
 
     # Attempt to look up host based on the provided name and inventory ID
-    host, name = module.get_one('hosts', name_or_id=name, **{
+    host = module.get_one('hosts', name_or_id=name, **{
         'data': {
             'inventory': inventory_id
         }
@@ -116,7 +116,7 @@ def main():
 
     # Create the data that gets sent for create and update
     host_fields = {
-        'name': new_name if new_name else name,
+        'name': new_name if new_name else (module.get_item_name(host) if host else name),
         'inventory': inventory_id,
         'enabled': enabled,
     }
diff --git a/awx_collection/plugins/modules/tower_instance_group.py b/awx_collection/plugins/modules/tower_instance_group.py
index cc8c97033f..77c4ac4ece 100644
--- a/awx_collection/plugins/modules/tower_instance_group.py
+++ b/awx_collection/plugins/modules/tower_instance_group.py
@@ -109,7 +109,7 @@ def main():
     state = module.params.get('state')
 
     # Attempt to look up an existing item based on the provided data
-    existing_item, name = module.get_one('instance_groups', name_or_id=name)
+    existing_item = module.get_one('instance_groups', name_or_id=name)
 
     if state is 'absent':
         # If the state was absent we can let the module delete it if needed, the module will handle exiting from this
@@ -127,7 +127,7 @@ def main():
 
     # Create the data that gets sent for create and update
     new_fields = {}
-    new_fields['name'] = new_name if new_name else name
+    new_fields['name'] = new_name if new_name else (module.get_item_name(existing_item) if existing_item else name)
     if credential is not None:
         new_fields['credential'] = credential_id
     if policy_instance_percentage is not None:
diff --git a/awx_collection/plugins/modules/tower_inventory.py b/awx_collection/plugins/modules/tower_inventory.py
index e8462a2844..ce4eab93d8 100644
--- a/awx_collection/plugins/modules/tower_inventory.py
+++ b/awx_collection/plugins/modules/tower_inventory.py
@@ -109,7 +109,7 @@ def main():
     org_id = module.resolve_name_to_id('organizations', organization)
 
     # Attempt to look up inventory based on the provided name and org ID
-    inventory, name = module.get_one('inventories', name_or_id=name, **{
+    inventory = module.get_one('inventories', name_or_id=name, **{
         'data': {
             'organization': org_id
         }
@@ -121,7 +121,7 @@ def main():
 
     # Create the data that gets sent for create and update
     inventory_fields = {
-        'name': name,
+        'name': module.get_item_name(inventory) if inventory else name,
         'organization': org_id,
         'kind': kind,
         'host_filter': host_filter,
diff --git a/awx_collection/plugins/modules/tower_inventory_source.py b/awx_collection/plugins/modules/tower_inventory_source.py
index 289707ccd9..b6fb7fff3b 100644
--- a/awx_collection/plugins/modules/tower_inventory_source.py
+++ b/awx_collection/plugins/modules/tower_inventory_source.py
@@ -128,10 +128,6 @@ options:
         - list of notifications to send on error
       type: list
       elements: str
-    organization:
-      description:
-        - Name of the inventory source's inventory's organization.
-      type: str
 extends_documentation_fragment: awx.awx.auth
 '''
 
@@ -144,7 +140,6 @@ EXAMPLES = '''
     credential: previously-created-credential
     overwrite: True
     update_on_launch: True
-    organization: Default
     source_vars:
       private: false
 '''
@@ -173,7 +168,6 @@ def main():
         enabled_value=dict(),
         host_filter=dict(),
         credential=dict(),
-        organization=dict(),
         overwrite=dict(type='bool'),
         overwrite_vars=dict(type='bool'),
         custom_virtualenv=dict(),
@@ -196,30 +190,22 @@ def main():
     name = module.params.get('name')
     new_name = module.params.get('new_name')
     inventory = module.params.get('inventory')
-    organization = module.params.get('organization')
     source_script = module.params.get('source_script')
     credential = module.params.get('credential')
     source_project = module.params.get('source_project')
     state = module.params.get('state')
 
-<<<<<<< HEAD
-    lookup_data = {}
-    if organization:
-        lookup_data['organization'] = module.resolve_name_to_id('organizations', organization)
-    inventory_object = module.get_one('inventories', name_or_id=inventory, data=lookup_data)
-
-    if not inventory_object:
-        module.fail_json(msg='The specified inventory, {0}, was not found.'.format(lookup_data))
-
-    inventory_source_object = module.get_one('inventory_sources', name_or_id=name, **{
+    # Attempt to look up inventory source based on the provided name and inventory ID
+    inventory_id = module.resolve_name_to_id('inventories', inventory)
+    inventory_source = module.get_one('inventory_sources', name_or_id=name, **{
         'data': {
-            'inventory': inventory_object['id'],
+            'inventory': inventory_id,
         }
     })
 
     if state == 'absent':
         # If the state was absent we can let the module delete it if needed, the module will handle exiting from this
-        module.delete_if_needed(inventory_source_object)
+        module.delete_if_needed(inventory_source)
 
     # Attempt to look up associated field items the user specified.
     association_fields = {}
@@ -244,8 +230,8 @@ def main():
 
     # Create the data that gets sent for create and update
     inventory_source_fields = {
-        'name': new_name if new_name else name,
-        'inventory': inventory_object['id'],
+        'name': new_name if new_name else (module.get_item_name(inventory_source) if inventory_source else name),
+        'inventory': inventory_id,
     }
 
     # Attempt to look up the related items the user specified (these will fail the module if not found)
@@ -274,12 +260,12 @@ def main():
         inventory_source_fields['source_vars'] = dumps(inventory_source_fields['source_vars'])
 
     # Sanity check on arguments
-    if state == 'present' and not inventory_source_object and not inventory_source_fields['source']:
+    if state == 'present' and not inventory_source and not inventory_source_fields['source']:
         module.fail_json(msg="If creating a new inventory source, the source param must be present")
 
-    # If the state was present we can let the module build or update the existing inventory_source_object, this will return on its own
+    # If the state was present we can let the module build or update the existing inventory_source, this will return on its own
     module.create_or_update_if_needed(
-        inventory_source_object, inventory_source_fields,
+        inventory_source, inventory_source_fields,
         endpoint='inventory_sources', item_type='inventory source',
         associations=association_fields
     )
diff --git a/awx_collection/plugins/modules/tower_job_cancel.py b/awx_collection/plugins/modules/tower_job_cancel.py
index 0bfe41d9c0..7404d452a4 100644
--- a/awx_collection/plugins/modules/tower_job_cancel.py
+++ b/awx_collection/plugins/modules/tower_job_cancel.py
@@ -68,7 +68,7 @@ def main():
     fail_if_not_running = module.params.get('fail_if_not_running')
 
     # Attempt to look up the job based on the provided name
-    job, job_name = module.get_one('jobs', **{
+    job = module.get_one('jobs', **{
         'data': {
             'id': job_id,
         }
diff --git a/awx_collection/plugins/modules/tower_job_launch.py b/awx_collection/plugins/modules/tower_job_launch.py
index 39c5b9caf4..9b118afcec 100644
--- a/awx_collection/plugins/modules/tower_job_launch.py
+++ b/awx_collection/plugins/modules/tower_job_launch.py
@@ -201,7 +201,7 @@ def main():
             post_data['credentials'].append(module.resolve_name_to_id('credentials', credential))
 
     # Attempt to look up job_template based on the provided name
-    job_template, name = module.get_one('job_templates', name_or_id=name)
+    job_template = module.get_one('job_templates', name_or_id=name)
 
     if job_template is None:
         module.fail_json(msg="Unable to find job template by name {0}".format(name))
diff --git a/awx_collection/plugins/modules/tower_job_template.py b/awx_collection/plugins/modules/tower_job_template.py
index 7f59e3f945..96ab600cf8 100644
--- a/awx_collection/plugins/modules/tower_job_template.py
+++ b/awx_collection/plugins/modules/tower_job_template.py
@@ -419,14 +419,14 @@ def main():
         search_fields['organization'] = new_fields['organization'] = organization_id
 
     # Attempt to look up an existing item based on the provided data
-    existing_item, name = module.get_one('job_templates', name_or_id=name, **{'data': search_fields})
+    existing_item = module.get_one('job_templates', name_or_id=name, **{'data': search_fields})
 
     if state == 'absent':
         # If the state was absent we can let the module delete it if needed, the module will handle exiting from this
         module.delete_if_needed(existing_item)
 
     # Create the data that gets sent for create and update
-    new_fields['name'] = new_name if new_name else name
+    new_fields['name'] = new_name if new_name else (module.get_item_name(existing_item) if existing_item else name)
     for field_name in (
         'description', 'job_type', 'playbook', 'scm_branch', 'forks', 'limit', 'verbosity',
         'job_tags', 'force_handlers', 'skip_tags', 'start_at_task', 'timeout', 'use_fact_cache',
diff --git a/awx_collection/plugins/modules/tower_job_wait.py b/awx_collection/plugins/modules/tower_job_wait.py
index 399926805f..6f71a1be5b 100644
--- a/awx_collection/plugins/modules/tower_job_wait.py
+++ b/awx_collection/plugins/modules/tower_job_wait.py
@@ -130,7 +130,7 @@ def main():
         )
 
     # Attempt to look up job based on the provided id
-    job, junk = module.get_one('jobs', **{
+    job = module.get_one('jobs', **{
         'data': {
             'id': job_id,
         }
diff --git a/awx_collection/plugins/modules/tower_label.py b/awx_collection/plugins/modules/tower_label.py
index 30b4843c41..7c520064a8 100644
--- a/awx_collection/plugins/modules/tower_label.py
+++ b/awx_collection/plugins/modules/tower_label.py
@@ -80,7 +80,7 @@ def main():
         organization_id = module.resolve_name_to_id('organizations', organization)
 
     # Attempt to look up an existing item based on the provided data
-    existing_item, name = module.get_one('labels', name_or_id=name, **{
+    existing_item = module.get_one('labels', name_or_id=name, **{
         'data': {
             'organization': organization_id,
         }
@@ -88,7 +88,7 @@ def main():
 
     # Create the data that gets sent for create and update
     new_fields = {}
-    new_fields['name'] = new_name if new_name else name
+    new_fields['name'] = new_name if new_name else (module.get_item_name(existing_item) if existing_item else name)
     if organization:
         new_fields['organization'] = organization_id
 
diff --git a/awx_collection/plugins/modules/tower_notification_template.py b/awx_collection/plugins/modules/tower_notification_template.py
index 4ad387fc5d..95e5971e79 100644
--- a/awx_collection/plugins/modules/tower_notification_template.py
+++ b/awx_collection/plugins/modules/tower_notification_template.py
@@ -380,7 +380,7 @@ def main():
         organization_id = module.resolve_name_to_id('organizations', organization)
 
     # Attempt to look up an existing item based on the provided data
-    existing_item, name = module.get_one('notification_templates', name_or_id=name, **{
+    existing_item = module.get_one('notification_templates', name_or_id=name, **{
         'data': {
             'organization': organization_id,
         }
@@ -403,7 +403,7 @@ def main():
     new_fields = {}
     if final_notification_configuration:
         new_fields['notification_configuration'] = final_notification_configuration
-    new_fields['name'] = new_name if new_name else name
+    new_fields['name'] = new_name if new_name else (module.get_item_name(existing_item) if existing_item else name)
     if description is not None:
         new_fields['description'] = description
     if organization is not None:
diff --git a/awx_collection/plugins/modules/tower_organization.py b/awx_collection/plugins/modules/tower_organization.py
index 33da6b0f90..5042ecf22c 100644
--- a/awx_collection/plugins/modules/tower_organization.py
+++ b/awx_collection/plugins/modules/tower_organization.py
@@ -117,7 +117,7 @@ def main():
     state = module.params.get('state')
 
     # Attempt to look up organization based on the provided name
-    organization, name = module.get_one('organizations', name_or_id=name)
+    organization = module.get_one('organizations', name_or_id=name)
 
     if state == 'absent':
         # If the state was absent we can let the module delete it if needed, the module will handle exiting from this
@@ -150,7 +150,7 @@ def main():
             association_fields['notification_templates_approvals'].append(module.resolve_name_to_id('notification_templates', item))
 
     # Create the data that gets sent for create and update
-    org_fields = {'name': name}
+    org_fields = {'name': module.get_item_name(organization) if organization else name}
     if description is not None:
         org_fields['description'] = description
     if custom_virtualenv is not None:
diff --git a/awx_collection/plugins/modules/tower_project.py b/awx_collection/plugins/modules/tower_project.py
index bd33ad9ef2..468f63e09d 100644
--- a/awx_collection/plugins/modules/tower_project.py
+++ b/awx_collection/plugins/modules/tower_project.py
@@ -239,7 +239,7 @@ def main():
         credential = module.resolve_name_to_id('credentials', credential)
 
     # Attempt to look up project based on the provided name and org ID
-    project, name = module.get_one('projects', name_or_id=name, **{
+    project = module.get_one('projects', name_or_id=name, **{
         'data': {
             'organization': org_id
         }
@@ -272,7 +272,7 @@ def main():
 
     # Create the data that gets sent for create and update
     project_fields = {
-        'name': name,
+        'name': module.get_item_name(project) if project else name,
         'scm_type': scm_type,
         'scm_url': scm_url,
         'scm_branch': scm_branch,
diff --git a/awx_collection/plugins/modules/tower_project_update.py b/awx_collection/plugins/modules/tower_project_update.py
index 7622001411..c2ebf2e422 100644
--- a/awx_collection/plugins/modules/tower_project_update.py
+++ b/awx_collection/plugins/modules/tower_project_update.py
@@ -103,18 +103,12 @@ def main():
     timeout = module.params.get('timeout')
 
     # Attempt to look up project based on the provided name or id
-    if name.isdigit():
-        results = module.get_endpoint('projects', **{'data': {'id': name}})
-        if results['json']['count'] == 0:
-            module.fail_json(msg='Could not find Project with ID: {0}'.format(name))
-        project = results['json']['results'][0]
-    else:
-        lookup_data = {}
-        if organization:
-            lookup_data['organization'] = module.resolve_name_to_id('organizations', organization)
-        project, name = module.get_one('projects', name_or_id=name, data=lookup_data)
-        if project is None:
-            module.fail_json(msg="Unable to find project")
+    lookup_data = {}
+    if organization:
+        lookup_data['organization'] = module.resolve_name_to_id('organizations', organization)
+    project = module.get_one('projects', name_or_id=name, data=lookup_data)
+    if project is None:
+        module.fail_json(msg="Unable to find project")
 
     # Update the project
     result = module.post_endpoint(project['related']['update'])
@@ -138,7 +132,7 @@ def main():
     # Invoke wait function
     module.wait_on_url(
         url=result['json']['url'],
-        object_name=name,
+        object_name=module.get_item_name(project),
         object_type='Project Update',
         timeout=timeout, interval=interval
     )
diff --git a/awx_collection/plugins/modules/tower_schedule.py b/awx_collection/plugins/modules/tower_schedule.py
index c69905bfac..66498c36cd 100644
--- a/awx_collection/plugins/modules/tower_schedule.py
+++ b/awx_collection/plugins/modules/tower_schedule.py
@@ -190,13 +190,13 @@ def main():
         unified_job_template_id = module.resolve_name_to_id('unified_job_templates', unified_job_template)
 
     # Attempt to look up an existing item based on the provided data
-    existing_item, name = module.get_one('schedules', name_or_id=name)
+    existing_item = module.get_one('schedules', name_or_id=name)
 
     # Create the data that gets sent for create and update
     new_fields = {}
     if rrule is not None:
         new_fields['rrule'] = rrule
-    new_fields['name'] = new_name if new_name else name
+    new_fields['name'] = new_name if new_name else (module.get_item_name(existing_item) if existing_item else name)
     if description is not None:
         new_fields['description'] = description
     if extra_data is not None:
diff --git a/awx_collection/plugins/modules/tower_team.py b/awx_collection/plugins/modules/tower_team.py
index 7f7f5fa632..9339610c75 100644
--- a/awx_collection/plugins/modules/tower_team.py
+++ b/awx_collection/plugins/modules/tower_team.py
@@ -87,7 +87,7 @@ def main():
     org_id = module.resolve_name_to_id('organizations', organization)
 
     # Attempt to look up team based on the provided name and org ID
-    team, name = module.get_one('teams', name_or_id=name, **{
+    team = module.get_one('teams', name_or_id=name, **{
         'data': {
             'organization': org_id
         }
@@ -99,7 +99,7 @@ def main():
 
     # Create the data that gets sent for create and update
     team_fields = {
-        'name': new_name if new_name else name,
+        'name': new_name if new_name else (module.get_item_name(team) if team else name),
         'organization': org_id
     }
     if description is not None:
diff --git a/awx_collection/plugins/modules/tower_token.py b/awx_collection/plugins/modules/tower_token.py
index 2680caaf93..ee6fd5c200 100644
--- a/awx_collection/plugins/modules/tower_token.py
+++ b/awx_collection/plugins/modules/tower_token.py
@@ -164,7 +164,7 @@ def main():
 
     if state == 'absent':
         if not existing_token:
-            existing_token, token_name = module.get_one('tokens', **{
+            existing_token = module.get_one('tokens', **{
                 'data': {
                     'id': existing_token_id,
                 }
diff --git a/awx_collection/plugins/modules/tower_user.py b/awx_collection/plugins/modules/tower_user.py
index 56f231dae8..0b0dd6d45d 100644
--- a/awx_collection/plugins/modules/tower_user.py
+++ b/awx_collection/plugins/modules/tower_user.py
@@ -134,7 +134,7 @@ def main():
     # Attempt to look up the related items the user specified (these will fail the module if not found)
 
     # Attempt to look up an existing item based on the provided data
-    existing_item, username = module.get_one('users', name_or_id=username)
+    existing_item = module.get_one('users', name_or_id=username)
 
     if state == 'absent':
         # If the state was absent we can let the module delete it if needed, the module will handle exiting from this
@@ -143,7 +143,7 @@ def main():
     # Create the data that gets sent for create and update
     new_fields = {}
     if username:
-        new_fields['username'] = username
+        new_fields['username'] = module.get_item_name(existing_item) if existing_item else name
     if first_name:
         new_fields['first_name'] = first_name
     if last_name:
diff --git a/awx_collection/plugins/modules/tower_workflow_job_template.py b/awx_collection/plugins/modules/tower_workflow_job_template.py
index 21818cb4c6..aec78518d9 100644
--- a/awx_collection/plugins/modules/tower_workflow_job_template.py
+++ b/awx_collection/plugins/modules/tower_workflow_job_template.py
@@ -193,7 +193,7 @@ def main():
         search_fields['organization'] = new_fields['organization'] = organization_id
 
     # Attempt to look up an existing item based on the provided data
-    existing_item, name = module.get_one('workflow_job_templates', name_or_id=name, **{'data': search_fields})
+    existing_item = module.get_one('workflow_job_templates', name_or_id=name, **{'data': search_fields})
 
     if state == 'absent':
         # If the state was absent we can let the module delete it if needed, the module will handle exiting from this
@@ -208,7 +208,7 @@ def main():
         new_fields['webhook_credential'] = module.resolve_name_to_id('webhook_credential', webhook_credential)
 
     # Create the data that gets sent for create and update
-    new_fields['name'] = new_name if new_name else name
+    new_fields['name'] = new_name if new_name else (module.get_item_name(existing_item) if existing_item else name)
     for field_name in (
             'description', 'survey_enabled', 'allow_simultaneous',
             'limit', 'scm_branch', 'extra_vars',
diff --git a/awx_collection/plugins/modules/tower_workflow_job_template_node.py b/awx_collection/plugins/modules/tower_workflow_job_template_node.py
index 2ba74c1fb9..0705de6785 100644
--- a/awx_collection/plugins/modules/tower_workflow_job_template_node.py
+++ b/awx_collection/plugins/modules/tower_workflow_job_template_node.py
@@ -203,7 +203,7 @@ def main():
         if organization:
             organization_id = module.resolve_name_to_id('organizations', organization)
             wfjt_search_fields['organization'] = organization_id
-        wfjt_data, workflow_job_template = module.get_one('workflow_job_templates', name_or_id=workflow_job_template, **{
+        wfjt_data = module.get_one('workflow_job_templates', name_or_id=workflow_job_template, **{
             'data': wfjt_search_fields
         })
         if wfjt_data is None:
@@ -214,7 +214,7 @@ def main():
         search_fields['workflow_job_template'] = new_fields['workflow_job_template'] = workflow_job_template_id
 
     # Attempt to look up an existing item based on the provided data
-    existing_item, junk = module.get_one('workflow_job_template_nodes', **{'data': search_fields})
+    existing_item = module.get_one('workflow_job_template_nodes', **{'data': search_fields})
 
     if state == 'absent':
         # If the state was absent we can let the module delete it if needed, the module will handle exiting from this
@@ -251,7 +251,7 @@ def main():
                 lookup_data = {'identifier': sub_name}
                 if workflow_job_template_id:
                     lookup_data['workflow_job_template'] = workflow_job_template_id
-            sub_obj, junk = module.get_one(endpoint, **{'data': lookup_data})
+            sub_obj = module.get_one(endpoint, **{'data': lookup_data})
             if sub_obj is None:
                 module.fail_json(msg='Could not find {0} entry with name {1}'.format(association, sub_name))
             id_list.append(sub_obj['id'])
diff --git a/awx_collection/plugins/modules/tower_workflow_launch.py b/awx_collection/plugins/modules/tower_workflow_launch.py
index 0e9cbb9ad6..a1de4a46bc 100644
--- a/awx_collection/plugins/modules/tower_workflow_launch.py
+++ b/awx_collection/plugins/modules/tower_workflow_launch.py
@@ -141,7 +141,7 @@ def main():
     lookup_data = {}
     if organization:
         lookup_data['organization'] = module.resolve_name_to_id('organizations', organization)
-    workflow_job_template, name = module.get_one('workflow_job_templates', name_or_id=name, data=lookup_data)
+    workflow_job_template = module.get_one('workflow_job_templates', name_or_id=name, data=lookup_data)
 
     if workflow_job_template is None:
         module.fail_json(msg="Unable to find workflow job template")

From 06814442946b9912fe19b4ffa9af05ab589a95d8 Mon Sep 17 00:00:00 2001
From: "Christian M. Adams" <rooftopcellist@gmail.com>
Date: Fri, 4 Sep 2020 14:49:51 -0400
Subject: [PATCH 60/69] Provide a distinct column name for inventory_name in
 unifiedjob analytics csv

---
 awx/main/analytics/collectors.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/awx/main/analytics/collectors.py b/awx/main/analytics/collectors.py
index 45cc247bf4..ba27905092 100644
--- a/awx/main/analytics/collectors.py
+++ b/awx/main/analytics/collectors.py
@@ -273,7 +273,7 @@ def copy_tables(since, full_path, subset=None):
                                  main_unifiedjob.organization_id,
                                  main_organization.name as organization_name,
                                  main_job.inventory_id, 
-                                 main_inventory.name, 
+                                 main_inventory.name as inventory_name,
                                  main_unifiedjob.created,  
                                  main_unifiedjob.name,  
                                  main_unifiedjob.unified_job_template_id, 

From 6467d34445152ab78adba7ec2a2133dd8ea70fcb Mon Sep 17 00:00:00 2001
From: John Westcott IV <john.westcott.iv@redhat.com>
Date: Tue, 8 Sep 2020 11:36:33 -0400
Subject: [PATCH 61/69] Touching up tower_inventory_source after rebase

---
 .../plugins/modules/tower_inventory_source.py | 33 +++++++++++++------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/awx_collection/plugins/modules/tower_inventory_source.py b/awx_collection/plugins/modules/tower_inventory_source.py
index b6fb7fff3b..5945d411d8 100644
--- a/awx_collection/plugins/modules/tower_inventory_source.py
+++ b/awx_collection/plugins/modules/tower_inventory_source.py
@@ -128,6 +128,10 @@ options:
         - list of notifications to send on error
       type: list
       elements: str
+    organization:
+      description:
+        - Name of the inventory source's inventory's organization.
+      type: str
 extends_documentation_fragment: awx.awx.auth
 '''
 
@@ -140,6 +144,7 @@ EXAMPLES = '''
     credential: previously-created-credential
     overwrite: True
     update_on_launch: True
+    organization: Default
     source_vars:
       private: false
 '''
@@ -168,6 +173,7 @@ def main():
         enabled_value=dict(),
         host_filter=dict(),
         credential=dict(),
+        organization=dict(),
         overwrite=dict(type='bool'),
         overwrite_vars=dict(type='bool'),
         custom_virtualenv=dict(),
@@ -190,22 +196,29 @@ def main():
     name = module.params.get('name')
     new_name = module.params.get('new_name')
     inventory = module.params.get('inventory')
+    organization = module.params.get('organization')
     source_script = module.params.get('source_script')
     credential = module.params.get('credential')
     source_project = module.params.get('source_project')
     state = module.params.get('state')
 
-    # Attempt to look up inventory source based on the provided name and inventory ID
-    inventory_id = module.resolve_name_to_id('inventories', inventory)
-    inventory_source = module.get_one('inventory_sources', name_or_id=name, **{
+    lookup_data = {}
+    if organization:
+        lookup_data['organization'] = module.resolve_name_to_id('organizations', organization)
+    inventory_object = module.get_one('inventories', name_or_id=inventory, data=lookup_data)
+
+    if not inventory_object:
+        module.fail_json(msg='The specified inventory, {0}, was not found.'.format(lookup_data))
+
+    inventory_source_object = module.get_one('inventory_sources', name_or_id=name, **{
         'data': {
-            'inventory': inventory_id,
+            'inventory': inventory_object['id'],
         }
     })
 
     if state == 'absent':
         # If the state was absent we can let the module delete it if needed, the module will handle exiting from this
-        module.delete_if_needed(inventory_source)
+        module.delete_if_needed(inventory_source_object)
 
     # Attempt to look up associated field items the user specified.
     association_fields = {}
@@ -230,8 +243,8 @@ def main():
 
     # Create the data that gets sent for create and update
     inventory_source_fields = {
-        'name': new_name if new_name else (module.get_item_name(inventory_source) if inventory_source else name),
-        'inventory': inventory_id,
+        'name': new_name if new_name else name,
+        'inventory': inventory_object['id'],
     }
 
     # Attempt to look up the related items the user specified (these will fail the module if not found)
@@ -260,12 +273,12 @@ def main():
         inventory_source_fields['source_vars'] = dumps(inventory_source_fields['source_vars'])
 
     # Sanity check on arguments
-    if state == 'present' and not inventory_source and not inventory_source_fields['source']:
+    if state == 'present' and not inventory_source_object and not inventory_source_fields['source']:
         module.fail_json(msg="If creating a new inventory source, the source param must be present")
 
-    # If the state was present we can let the module build or update the existing inventory_source, this will return on its own
+    # If the state was present we can let the module build or update the existing inventory_source_object, this will return on its own
     module.create_or_update_if_needed(
-        inventory_source, inventory_source_fields,
+        inventory_source_object, inventory_source_fields,
         endpoint='inventory_sources', item_type='inventory source',
         associations=association_fields
     )

From d6f35a71d7114573b7b50ab9b0686f6ca8d0468c Mon Sep 17 00:00:00 2001
From: John Westcott IV <john.westcott.iv@redhat.com>
Date: Tue, 8 Sep 2020 11:51:47 -0400
Subject: [PATCH 62/69] Adding allow_unknown option for get_item_name

---
 awx_collection/plugins/module_utils/tower_api.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/awx_collection/plugins/module_utils/tower_api.py b/awx_collection/plugins/module_utils/tower_api.py
index 7ba5b1de7d..e0d2027ba5 100644
--- a/awx_collection/plugins/module_utils/tower_api.py
+++ b/awx_collection/plugins/module_utils/tower_api.py
@@ -51,7 +51,7 @@ class TowerAPIModule(TowerModule):
     def get_name_field_from_endpoint(endpoint):
         return TowerAPIModule.IDENTITY_FIELDS.get(endpoint, 'name')
 
-    def get_item_name(self, item):
+    def get_item_name(self, item, allow_unknown=False):
         if 'name' in item:
             return item['name']
 
@@ -62,6 +62,9 @@ class TowerAPIModule(TowerModule):
         if item.get('type', None) in ('o_auth2_access_token', 'credential_input_source'):
             return item['id']
 
+        if allow_unknown:
+            return 'unknown'
+
         self.exit_json(msg='Cannot determine identity field for {0} object.'.format(item.get('type', 'unknown')))
 
     def head_endpoint(self, endpoint, *args, **kwargs):
@@ -358,7 +361,7 @@ class TowerAPIModule(TowerModule):
                 item_url = existing_item['url']
                 item_type = existing_item['type']
                 item_id = existing_item['id']
-                item_name = self.get_item_name(existing_item)
+                item_name = self.get_item_name(existing_item, allow_unknown=True)
             except KeyError as ke:
                 self.fail_json(msg="Unable to process delete of item due to missing data {0}".format(ke))
 
@@ -434,7 +437,7 @@ class TowerAPIModule(TowerModule):
 
             # We have to rely on item_type being passed in since we don't have an existing item that declares its type
             # We will pull the item_name out from the new_item, if it exists
-            item_name = self.get_item_name(new_item)
+            item_name = self.get_item_name(new_item, allow_unknown=True)
 
             response = self.post_endpoint(endpoint, **{'data': new_item})
             if response['status_code'] == 201:

From c2cfaec7d122f228cd6de59a3eb300a99ac06c4e Mon Sep 17 00:00:00 2001
From: John Westcott IV <john.westcott.iv@redhat.com>
Date: Tue, 8 Sep 2020 11:52:53 -0400
Subject: [PATCH 63/69] Fixing name -> username

---
 awx_collection/plugins/modules/tower_user.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/awx_collection/plugins/modules/tower_user.py b/awx_collection/plugins/modules/tower_user.py
index 0b0dd6d45d..4b648356e4 100644
--- a/awx_collection/plugins/modules/tower_user.py
+++ b/awx_collection/plugins/modules/tower_user.py
@@ -143,7 +143,7 @@ def main():
     # Create the data that gets sent for create and update
     new_fields = {}
     if username:
-        new_fields['username'] = module.get_item_name(existing_item) if existing_item else name
+        new_fields['username'] = module.get_item_name(existing_item) if existing_item else username
     if first_name:
         new_fields['first_name'] = first_name
     if last_name:

From e09274e533b3d0cf57b52dfa07fe18d8a2135cdb Mon Sep 17 00:00:00 2001
From: Seth Foster <fosterbseth@gmail.com>
Date: Tue, 8 Sep 2020 12:16:06 -0400
Subject: [PATCH 64/69] PR #8074 - limit how many jobs the task manager can
 start on a given run

---
 awx/main/scheduler/task_manager.py | 13 +++++++++++++
 awx/settings/defaults.py           |  3 +++
 2 files changed, 16 insertions(+)

diff --git a/awx/main/scheduler/task_manager.py b/awx/main/scheduler/task_manager.py
index cba6161d83..9f4818bd37 100644
--- a/awx/main/scheduler/task_manager.py
+++ b/awx/main/scheduler/task_manager.py
@@ -12,6 +12,7 @@ import random
 from django.db import transaction, connection
 from django.utils.translation import ugettext_lazy as _, gettext_noop
 from django.utils.timezone import now as tz_now
+from django.conf import settings
 
 # AWX
 from awx.main.dispatch.reaper import reap_job
@@ -45,6 +46,12 @@ class TaskManager():
 
     def __init__(self):
         self.graph = dict()
+        # start task limit indicates how many pending jobs can be started on this
+        # .schedule() run. Starting jobs is expensive, and there is code in place to reap
+        # the task manager after 5 minutes. At scale, the task manager can easily take more than
+        # 5 minutes to start pending jobs. If this limit is reached, pending jobs
+        # will no longer be started and will be started on the next task manager cycle.
+        self.start_task_limit = settings.START_TASK_LIMIT
         for rampart_group in InstanceGroup.objects.prefetch_related('instances'):
             self.graph[rampart_group.name] = dict(graph=DependencyGraph(rampart_group.name),
                                                   capacity_total=rampart_group.capacity,
@@ -189,6 +196,10 @@ class TaskManager():
         return result
 
     def start_task(self, task, rampart_group, dependent_tasks=None, instance=None):
+        self.start_task_limit -= 1
+        if self.start_task_limit == 0:
+            # schedule another run immediately after this task manager
+            schedule_task_manager()
         from awx.main.tasks import handle_work_error, handle_work_success
 
         dependent_tasks = dependent_tasks or []
@@ -448,6 +459,8 @@ class TaskManager():
     def process_pending_tasks(self, pending_tasks):
         running_workflow_templates = set([wf.unified_job_template_id for wf in self.get_running_workflow_jobs()])
         for task in pending_tasks:
+            if self.start_task_limit <= 0:
+                break
             if self.is_job_blocked(task):
                 logger.debug("{} is blocked from running".format(task.log_format))
                 continue
diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py
index 8d42af1ae4..05e7ed77e3 100644
--- a/awx/settings/defaults.py
+++ b/awx/settings/defaults.py
@@ -203,6 +203,9 @@ JOB_EVENT_MAX_QUEUE_SIZE = 10000
 # The number of job events to migrate per-transaction when moving from int -> bigint
 JOB_EVENT_MIGRATION_CHUNK_SIZE = 1000000
 
+# The maximum allowed jobs to start on a given task manager cycle
+START_TASK_LIMIT = 100
+
 # Disallow sending session cookies over insecure connections
 SESSION_COOKIE_SECURE = True
 

From 13e675766667746f6e2916f03344723bfe97c7e6 Mon Sep 17 00:00:00 2001
From: Keith Grant <keithjgrant@redhat.com>
Date: Tue, 8 Sep 2020 10:17:18 -0700
Subject: [PATCH 65/69] add ids to CodeMirror FormGroup containers

---
 awx/ui_next/src/components/CodeMirrorInput/CodeMirrorField.jsx | 3 ++-
 awx/ui_next/src/components/CodeMirrorInput/CodeMirrorInput.jsx | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/awx/ui_next/src/components/CodeMirrorInput/CodeMirrorField.jsx b/awx/ui_next/src/components/CodeMirrorInput/CodeMirrorField.jsx
index 60d7896a38..d08ab12674 100644
--- a/awx/ui_next/src/components/CodeMirrorInput/CodeMirrorField.jsx
+++ b/awx/ui_next/src/components/CodeMirrorInput/CodeMirrorField.jsx
@@ -30,6 +30,7 @@ function CodeMirrorField({
 
   return (
     <FormGroup
+      id={`${id}-field`}
       fieldId={id}
       helperText={helperText}
       helperTextInvalid={meta.error}
@@ -39,7 +40,7 @@ function CodeMirrorField({
       labelIcon={<FieldTooltip content={tooltip} />}
     >
       <CodeMirrorInput
-        id="webhook-headers"
+        id={id}
         {...rest}
         {...field}
         onChange={value => {
diff --git a/awx/ui_next/src/components/CodeMirrorInput/CodeMirrorInput.jsx b/awx/ui_next/src/components/CodeMirrorInput/CodeMirrorInput.jsx
index d945462987..92a9071332 100644
--- a/awx/ui_next/src/components/CodeMirrorInput/CodeMirrorInput.jsx
+++ b/awx/ui_next/src/components/CodeMirrorInput/CodeMirrorInput.jsx
@@ -107,6 +107,7 @@ CodeMirrorInput.propTypes = {
   hasErrors: bool,
   fullHeight: bool,
   rows: number,
+  className: string,
 };
 CodeMirrorInput.defaultProps = {
   readOnly: false,
@@ -114,6 +115,7 @@ CodeMirrorInput.defaultProps = {
   rows: 6,
   fullHeight: false,
   hasErrors: false,
+  className: '',
 };
 
 export default CodeMirrorInput;

From 4c0e288feef3fdc0a539ab6565bba52f5ae1aa78 Mon Sep 17 00:00:00 2001
From: John Westcott IV <john.westcott.iv@redhat.com>
Date: Tue, 8 Sep 2020 13:38:44 -0400
Subject: [PATCH 66/69] Touching up to missing sport of get_one returning
 multiple params

---
 awx_collection/plugins/modules/tower_job_template.py          | 2 +-
 awx_collection/tools/roles/generate/templates/tower_module.j2 | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/awx_collection/plugins/modules/tower_job_template.py b/awx_collection/plugins/modules/tower_job_template.py
index 96ab600cf8..3a42a3ade1 100644
--- a/awx_collection/plugins/modules/tower_job_template.py
+++ b/awx_collection/plugins/modules/tower_job_template.py
@@ -453,7 +453,7 @@ def main():
         new_fields['inventory'] = module.resolve_name_to_id('inventories', inventory)
     if project is not None:
         if organization_id is not None:
-            project_data, project = module.get_one('projects', name_or_id=project, **{
+            project_data = module.get_one('projects', name_or_id=project, **{
                 'data': {
                     'organization': organization_id,
                 }
diff --git a/awx_collection/tools/roles/generate/templates/tower_module.j2 b/awx_collection/tools/roles/generate/templates/tower_module.j2
index 8c82da660d..60e65cf92c 100644
--- a/awx_collection/tools/roles/generate/templates/tower_module.j2
+++ b/awx_collection/tools/roles/generate/templates/tower_module.j2
@@ -175,7 +175,7 @@ def main():
 {% endfor %}
 
     # Attempt to look up an existing item based on the provided data
-    existing_item, name = module.get_one('{{ item_type }}', name_or_id={{ name_option }}, **{
+    existing_item = module.get_one('{{ item_type }}', name_or_id={{ name_option }}, **{
         'data': {
 {% if 'organization' in item['json']['actions']['POST'] and item['json']['actions']['POST']['organization']['type'] == 'id' %}
             'organization': org_id,
@@ -194,7 +194,7 @@ def main():
     new_fields = {}
 {% for option in item['json']['actions']['POST'] %}
 {% if option == name_option %}
-    new_fields['{{ name_option }}'] = new_{{ name_option }} if new_{{ name_option }} else {{ name_option }}
+    new_fields['{{ name_option }}'] = new_{{ name_option }} if new_{{ name_option }} else (module.get_item_name(existing_item) if existing_item else {{ name_option }}t)
 {% else %}
     if {{ option }} is not None:
 {% if item['json']['actions']['POST'][option]['type'] == 'id' %}

From 09b8f82bbb9aa5c12a474819d6d3340d022c3f81 Mon Sep 17 00:00:00 2001
From: John Westcott IV <john.westcott.iv@redhat.com>
Date: Tue, 8 Sep 2020 15:28:21 -0400
Subject: [PATCH 67/69] Fixing test issue and 'modornizing' test

---
 .../tasks/main.yml                            | 184 +++++++++---------
 1 file changed, 96 insertions(+), 88 deletions(-)

diff --git a/awx_collection/tests/integration/targets/tower_credential_input_source/tasks/main.yml b/awx_collection/tests/integration/targets/tower_credential_input_source/tasks/main.yml
index ecc6d39af4..608c524aaf 100644
--- a/awx_collection/tests/integration/targets/tower_credential_input_source/tasks/main.yml
+++ b/awx_collection/tests/integration/targets/tower_credential_input_source/tasks/main.yml
@@ -1,105 +1,113 @@
 ---
+- name: Generate a random string for test
+  set_fact:
+    test_id: "{{ lookup('password', '/dev/null chars=ascii_letters length=16') }}"
+  when: test_id is not defined
+
 - name: Generate names
   set_fact:
-    src_cred_name: src_cred
-    target_cred_name: target_cred
+    src_cred_name: "AWX-Collection-tests-tower_credential_input_source-src_cred-{{ test_id }}"
+    target_cred_name: "AWX-Collection-tests-tower_credential_input_source-target_cred-{{ test_id }}"
 
-- name: Add Tower credential Lookup
-  tower_credential:
-    description: Credential for Testing Source
-    name: "{{ src_cred_name }}"
-    credential_type: CyberArk AIM Central Credential Provider Lookup
-    inputs:
-      url: "https://cyberark.example.com"
-      app_id: "My-App-ID"
-    organization: Default
-  register: src_cred_result
+- block:
+    - name: Add Tower credential Lookup
+      tower_credential:
+        description: Credential for Testing Source
+        name: "{{ src_cred_name }}"
+        credential_type: CyberArk AIM Central Credential Provider Lookup
+        inputs:
+          url: "https://cyberark.example.com"
+          app_id: "My-App-ID"
+        organization: Default
+      register: src_cred_result
 
-- assert:
-    that:
-      - "src_cred_result is changed"
+    - assert:
+        that:
+          - "src_cred_result is changed"
 
-- name: Add Tower credential Target
-  tower_credential:
-    description: Credential for Testing Target
-    name: "{{ target_cred_name }}"
-    credential_type: Machine
-    inputs:
-      username: user
-    organization: Default
-  register: target_cred_result
+    - name: Add Tower credential Target
+      tower_credential:
+        description: Credential for Testing Target
+        name: "{{ target_cred_name }}"
+        credential_type: Machine
+        inputs:
+          username: user
+        organization: Default
+      register: target_cred_result
 
-- assert:
-    that:
-      - "target_cred_result is changed"
+    - assert:
+        that:
+          - "target_cred_result is changed"
 
-- name: Add credential Input Source
-  tower_credential_input_source:
-    input_field_name: password
-    target_credential: "{{ target_cred_result.id }}"
-    source_credential: "{{ src_cred_result.id }}"
-    metadata:
-      object_query: "Safe=MY_SAFE;Object=AWX-user"
-      object_query_format: "Exact"
-    state: present
+    - name: Add credential Input Source
+      tower_credential_input_source:
+        input_field_name: password
+        target_credential: "{{ target_cred_result.id }}"
+        source_credential: "{{ src_cred_result.id }}"
+        metadata:
+          object_query: "Safe=MY_SAFE;Object=AWX-user"
+          object_query_format: "Exact"
+        state: present
+      register: result
 
-- assert:
-    that:
-      - "result is changed"
+    - assert:
+        that:
+          - "result is changed"
 
-- name: Add Second Tower credential Lookup
-  tower_credential:
-    description: Credential for Testing Source Change
-    name: "{{ src_cred_name }}-2"
-    credential_type: CyberArk AIM Central Credential Provider Lookup
-    inputs:
-      url: "https://cyberark-prod.example.com"
-      app_id: "My-App-ID"
-    organization: Default
-  register: result
+    - name: Add Second Tower credential Lookup
+      tower_credential:
+        description: Credential for Testing Source Change
+        name: "{{ src_cred_name }}-2"
+        credential_type: CyberArk AIM Central Credential Provider Lookup
+        inputs:
+          url: "https://cyberark-prod.example.com"
+          app_id: "My-App-ID"
+        organization: Default
+      register: result
 
-- name: Change credential Input Source
-  tower_credential_input_source:
-    input_field_name: password
-    target_credential: "{{ target_cred_name }}"
-    source_credential: "{{ src_cred_name }}-2"
-    state: present
+    - name: Change credential Input Source
+      tower_credential_input_source:
+        input_field_name: password
+        target_credential: "{{ target_cred_name }}"
+        source_credential: "{{ src_cred_name }}-2"
+        state: present
 
-- assert:
-    that:
-      - "result is changed"
+    - assert:
+        that:
+          - "result is changed"
 
-- name: Remove a Tower credential source
-  tower_credential_input_source:
-    input_field_name: password
-    target_credential: "{{ target_cred_name }}"
-    state: absent
-  register: result
+  always:
+    - name: Remove a Tower credential source
+      tower_credential_input_source:
+        input_field_name: password
+        target_credential: "{{ target_cred_name }}"
+        state: absent
+      register: result
 
-- assert:
-    that:
-      - "result is changed"
+    - assert:
+        that:
+          - "result is changed"
 
-- name: Remove Tower credential Lookup
-  tower_credential:
-    name: "{{ src_cred_name }}"
-    organization: Default
-    credential_type: CyberArk AIM Central Credential Provider Lookup
-    state: absent
-  register: result
+    - name: Remove Tower credential Lookup
+      tower_credential:
+        name: "{{ src_cred_name }}"
+        organization: Default
+        credential_type: CyberArk AIM Central Credential Provider Lookup
+        state: absent
+      register: result
 
-- name: Remove Alt Tower credential Lookup
-  tower_credential:
-    name: "{{ src_cred_name }}-2"
-    organization: Default
-    credential_type: CyberArk AIM Central Credential Provider Lookup
-    state: absent
-  register: result
+    - name: Remove Alt Tower credential Lookup
+      tower_credential:
+        name: "{{ src_cred_name }}-2"
+        organization: Default
+        credential_type: CyberArk AIM Central Credential Provider Lookup
+        state: absent
+      register: result
 
-- name: Remove Tower credential
-  tower_credential:
-    name: "{{ target_cred_name }}"
-    organization: Default
-    credential_type: Machine
-    state: absent
-  register: result
+    - name: Remove Tower credential
+      tower_credential:
+        name: "{{ target_cred_name }}"
+        organization: Default
+        credential_type: Machine
+        state: absent
+      register: result

From faa33efdd27aae1ed77f5c79f8f5fc55c1391d04 Mon Sep 17 00:00:00 2001
From: John Westcott IV <john.westcott.iv@redhat.com>
Date: Tue, 8 Sep 2020 15:28:37 -0400
Subject: [PATCH 68/69] Fixing registered name

---
 .../tests/integration/targets/tower_inventory/tasks/main.yml    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/awx_collection/tests/integration/targets/tower_inventory/tasks/main.yml b/awx_collection/tests/integration/targets/tower_inventory/tasks/main.yml
index 552b32f47c..43dfe39a04 100644
--- a/awx_collection/tests/integration/targets/tower_inventory/tasks/main.yml
+++ b/awx_collection/tests/integration/targets/tower_inventory/tasks/main.yml
@@ -29,7 +29,7 @@
       tower_inventory:
         name: "{{ inv_name1 }}"
         organization: Default
-        insights_credential: "{{ results.id }}"
+        insights_credential: "{{ result.id }}"
         state: present
       register: result
 

From 570251dc3d479d1b04e3675b697c2c61690ef2b4 Mon Sep 17 00:00:00 2001
From: John Westcott IV <john.westcott.iv@redhat.com>
Date: Tue, 8 Sep 2020 15:28:57 -0400
Subject: [PATCH 69/69] Modifying get_item_name to handle a None object

---
 .../plugins/module_utils/tower_api.py         | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/awx_collection/plugins/module_utils/tower_api.py b/awx_collection/plugins/module_utils/tower_api.py
index e0d2027ba5..36cfa21551 100644
--- a/awx_collection/plugins/module_utils/tower_api.py
+++ b/awx_collection/plugins/module_utils/tower_api.py
@@ -52,20 +52,24 @@ class TowerAPIModule(TowerModule):
         return TowerAPIModule.IDENTITY_FIELDS.get(endpoint, 'name')
 
     def get_item_name(self, item, allow_unknown=False):
-        if 'name' in item:
-            return item['name']
+        if item:
+            if 'name' in item:
+                return item['name']
 
-        for field_name in TowerAPIModule.IDENTITY_FIELDS.values():
-            if field_name in item:
-                return item[field_name]
+            for field_name in TowerAPIModule.IDENTITY_FIELDS.values():
+                if field_name in item:
+                    return item[field_name]
 
-        if item.get('type', None) in ('o_auth2_access_token', 'credential_input_source'):
-            return item['id']
+            if item.get('type', None) in ('o_auth2_access_token', 'credential_input_source'):
+                return item['id']
 
         if allow_unknown:
             return 'unknown'
 
-        self.exit_json(msg='Cannot determine identity field for {0} object.'.format(item.get('type', 'unknown')))
+        if item:
+            self.exit_json(msg='Cannot determine identity field for {0} object.'.format(item.get('type', 'unknown')))
+        else:
+            self.exit_json(msg='Cannot determine identity field for Undefined object.')
 
     def head_endpoint(self, endpoint, *args, **kwargs):
         return self.make_request('HEAD', endpoint, **kwargs)