From be6657239d3a181febb62b22a53957a968813d7b Mon Sep 17 00:00:00 2001
From: nixocio <nixocio@gmail.com>
Date: Tue, 29 Mar 2022 10:22:07 -0400
Subject: [PATCH] Add UI changes to JobsEdit

Add UI changes to JobsEdit
---
 .../screens/Setting/Jobs/JobsEdit/JobsEdit.js |  5 +++
 .../shared/data.allSettingOptions.json        | 40 +++++++++++++++++++
 .../Setting/shared/data.allSettings.json      |  4 ++
 .../Setting/shared/data.jobSettings.json      |  4 ++
 4 files changed, 53 insertions(+)

diff --git a/awx/ui/src/screens/Setting/Jobs/JobsEdit/JobsEdit.js b/awx/ui/src/screens/Setting/Jobs/JobsEdit/JobsEdit.js
index 22066243b7..cc245aea86 100644
--- a/awx/ui/src/screens/Setting/Jobs/JobsEdit/JobsEdit.js
+++ b/awx/ui/src/screens/Setting/Jobs/JobsEdit/JobsEdit.js
@@ -85,6 +85,7 @@ function JobsEdit() {
         form.AWX_ANSIBLE_CALLBACK_PLUGINS
       ),
       AWX_TASK_ENV: formatJson(form.AWX_TASK_ENV),
+      GALAXY_TASK_ENV: formatJson(form.GALAXY_TASK_ENV),
     });
   };
 
@@ -217,6 +218,10 @@ function JobsEdit() {
                   config={jobs.AWX_MOUNT_ISOLATED_PATHS_ON_K8S}
                 />
                 <ObjectField name="AWX_TASK_ENV" config={jobs.AWX_TASK_ENV} />
+                <ObjectField
+                  name="GALAXY_TASK_ENV"
+                  config={jobs.GALAXY_TASK_ENV}
+                />
                 {submitError && <FormSubmitError error={submitError} />}
                 {revertError && <FormSubmitError error={revertError} />}
               </FormColumnLayout>
diff --git a/awx/ui/src/screens/Setting/shared/data.allSettingOptions.json b/awx/ui/src/screens/Setting/shared/data.allSettingOptions.json
index ab0bc3f8e1..abb93fd143 100644
--- a/awx/ui/src/screens/Setting/shared/data.allSettingOptions.json
+++ b/awx/ui/src/screens/Setting/shared/data.allSettingOptions.json
@@ -231,6 +231,26 @@
           "read_only": false
         }
       },
+      "GALAXY_TASK_ENV": {
+              "type": "nested object",
+               "required": true,
+              "label": "Environment Variables for Galaxy Commands",
+               "help_text": "Additional environment variables set for invocations of ansible-galaxy within project updates. Useful if you must use a proxy server for ansible-galaxy but not git.",
+               "category": "Jobs",
+               "category_slug": "jobs",
+               "placeholder": {
+                    "HTTP_PROXY": "myproxy.local:8080"
+                },
+               "default": {
+                   "ANSIBLE_FORCE_COLOR": "false",
+                    "GIT_SSH_COMMAND": "ssh -o StrictHostKeyChecking=no"
+              },
+                "child": {
+                  "type": "string",
+                    "required": true,
+                  "read_only": false
+              }
+             },
       "INSIGHTS_TRACKING_STATE": {
         "type": "boolean",
         "required": false,
@@ -3942,6 +3962,26 @@
           "type": "string"
         }
       },
+      "GALAXY_TASK_ENV": {
+              "type": "nested object",
+               "required": true,
+              "label": "Environment Variables for Galaxy Commands",
+               "help_text": "Additional environment variables set for invocations of ansible-galaxy within project updates. Useful if you must use a proxy server for ansible-galaxy but not git.",
+               "category": "Jobs",
+               "category_slug": "jobs",
+               "placeholder": {
+                    "HTTP_PROXY": "myproxy.local:8080"
+                },
+               "default": {
+                   "ANSIBLE_FORCE_COLOR": "false",
+                    "GIT_SSH_COMMAND": "ssh -o StrictHostKeyChecking=no"
+              },
+                "child": {
+                  "type": "string",
+                    "required": true,
+                  "read_only": false
+              }
+             },
       "INSIGHTS_TRACKING_STATE": {
         "type": "boolean",
         "label": "Gather data for Insights for Ansible Automation Platform",
diff --git a/awx/ui/src/screens/Setting/shared/data.allSettings.json b/awx/ui/src/screens/Setting/shared/data.allSettings.json
index 555713c239..c72f5c3c8e 100644
--- a/awx/ui/src/screens/Setting/shared/data.allSettings.json
+++ b/awx/ui/src/screens/Setting/shared/data.allSettings.json
@@ -38,6 +38,10 @@
   "AWX_ISOLATION_BASE_PATH":"/tmp",
   "AWX_ISOLATION_SHOW_PATHS":[],
   "AWX_TASK_ENV":{},
+  "GALAXY_TASK_ENV": {
+    "ANSIBLE_FORCE_COLOR": "false",
+    "GIT_SSH_COMMAND": "ssh -o StrictHostKeyChecking=no"
+   },
   "INSIGHTS_TRACKING_STATE":false,
   "PROJECT_UPDATE_VVV":false,
   "AWX_ROLES_ENABLED":true,
diff --git a/awx/ui/src/screens/Setting/shared/data.jobSettings.json b/awx/ui/src/screens/Setting/shared/data.jobSettings.json
index e24eedb36d..242c1b8054 100644
--- a/awx/ui/src/screens/Setting/shared/data.jobSettings.json
+++ b/awx/ui/src/screens/Setting/shared/data.jobSettings.json
@@ -7,6 +7,10 @@
   "AWX_ISOLATION_BASE_PATH": "/tmp",
   "AWX_ISOLATION_SHOW_PATHS": [],
   "AWX_TASK_ENV": {},
+   "GALAXY_TASK_ENV": {
+     "ANSIBLE_FORCE_COLOR": "false",
+      "GIT_SSH_COMMAND": "ssh -o StrictHostKeyChecking=no"
+     },
   "PROJECT_UPDATE_VVV": false,
   "AWX_ROLES_ENABLED": true,
   "AWX_COLLECTIONS_ENABLED": true,