From fcb8fc1cb4f2aa6a7cb1ed689fa4fec9f6cb948f Mon Sep 17 00:00:00 2001
From: Jason Frey <fryguy9@gmail.com>
Date: Fri, 24 May 2024 09:41:51 -0400
Subject: [PATCH] Merge pull request #9184 from
 jaisejose1123/fix_vault_credentials

Fix for vault credentials in service-catalog's provisioning and retirement summary

(cherry picked from commit 36e192bafa6f0178d2d1e120d8c31be77dbdd044)
---
 app/helpers/catalog_helper.rb                 |   1 -
 .../schema.js                                 |   8 +-
 .../ansible-edit-catalog-form.spec.js.snap    | 652 +++++++++---------
 3 files changed, 330 insertions(+), 331 deletions(-)

diff --git a/app/helpers/catalog_helper.rb b/app/helpers/catalog_helper.rb
index b4a1e850fac..6d665742e56 100644
--- a/app/helpers/catalog_helper.rb
+++ b/app/helpers/catalog_helper.rb
@@ -193,7 +193,6 @@ def catalog_generic_template_info(type, record, info)
       rows.push(row_data(_('Playbook'), info[:playbook]))
       rows.push(row_data(_('Machine Credential'), info[:machine_credential]))
       rows.push(row_data(_('Vault Credential'), info[:vault_credential]))
-      rows.push(row_data(_('Vault Credential'), info[:vault_credential]))
       rows.push(row_data(_('Cloud Credential'), info[:cloud_credential]))
       rows.push(row_data(_('Max TTL (mins)'), record.config_info[type][:execution_ttl]))
       rows.push(row_data(_('Hosts'), record.config_info[type][:hosts]))
diff --git a/app/javascript/components/ansible-playbook-edit-catalog-form/schema.js b/app/javascript/components/ansible-playbook-edit-catalog-form/schema.js
index a53d410fccb..4069ac86389 100644
--- a/app/javascript/components/ansible-playbook-edit-catalog-form/schema.js
+++ b/app/javascript/components/ansible-playbook-edit-catalog-form/schema.js
@@ -163,8 +163,8 @@ const provisionTabSchema = (
       },
       {
         component: componentTypes.SELECT,
-        id: 'config_info.provision.vault_credentials',
-        name: 'config_info.provision.vault_credentials',
+        id: 'config_info.provision.vault_credential_id',
+        name: 'config_info.provision.vault_credential_id',
         label: __('Vault Credential'),
         options: transformGeneralOptions(vaultCredentials),
         condition: {
@@ -371,8 +371,8 @@ const retirementTabSchema = (
       },
       {
         component: componentTypes.SELECT,
-        id: 'config_info.retirement.vault_credentials',
-        name: 'config_info.retirement.vault_credentials',
+        id: 'config_info.retirement.vault_credential_id',
+        name: 'config_info.retirement.vault_credential_id',
         label: __('Vault Credential'),
         options: transformGeneralOptions(vaultCredentials),
         condition: {
diff --git a/app/javascript/spec/ansible-edit-catalog-form/__snapshots__/ansible-edit-catalog-form.spec.js.snap b/app/javascript/spec/ansible-edit-catalog-form/__snapshots__/ansible-edit-catalog-form.spec.js.snap
index a819073e45d..f4b3fd2abcd 100644
--- a/app/javascript/spec/ansible-edit-catalog-form/__snapshots__/ansible-edit-catalog-form.spec.js.snap
+++ b/app/javascript/spec/ansible-edit-catalog-form/__snapshots__/ansible-edit-catalog-form.spec.js.snap
@@ -2541,10 +2541,10 @@ exports[`Ansible playbook edit catalog Form Component should not render some fie
                         "isNotEmpty": true,
                         "when": "config_info.provision.repository_id",
                       },
-                      "id": "config_info.provision.vault_credentials",
+                      "id": "config_info.provision.vault_credential_id",
                       "includeEmpty": true,
                       "label": "Vault Credential",
-                      "name": "config_info.provision.vault_credentials",
+                      "name": "config_info.provision.vault_credential_id",
                       "options": Array [],
                     },
                     Object {
@@ -3268,10 +3268,10 @@ exports[`Ansible playbook edit catalog Form Component should not render some fie
                         "isNotEmpty": true,
                         "when": "config_info.retirement.repository_id",
                       },
-                      "id": "config_info.retirement.vault_credentials",
+                      "id": "config_info.retirement.vault_credential_id",
                       "includeEmpty": true,
                       "label": "Vault Credential",
-                      "name": "config_info.retirement.vault_credentials",
+                      "name": "config_info.retirement.vault_credential_id",
                       "options": Array [],
                     },
                     Object {
@@ -4758,10 +4758,10 @@ exports[`Ansible playbook edit catalog Form Component should not render some fie
                           "isNotEmpty": true,
                           "when": "config_info.provision.repository_id",
                         },
-                        "id": "config_info.provision.vault_credentials",
+                        "id": "config_info.provision.vault_credential_id",
                         "includeEmpty": true,
                         "label": "Vault Credential",
-                        "name": "config_info.provision.vault_credentials",
+                        "name": "config_info.provision.vault_credential_id",
                         "options": Array [],
                       },
                       Object {
@@ -5485,10 +5485,10 @@ exports[`Ansible playbook edit catalog Form Component should not render some fie
                           "isNotEmpty": true,
                           "when": "config_info.retirement.repository_id",
                         },
-                        "id": "config_info.retirement.vault_credentials",
+                        "id": "config_info.retirement.vault_credential_id",
                         "includeEmpty": true,
                         "label": "Vault Credential",
-                        "name": "config_info.retirement.vault_credentials",
+                        "name": "config_info.retirement.vault_credential_id",
                         "options": Array [],
                       },
                       Object {
@@ -6971,10 +6971,10 @@ exports[`Ansible playbook edit catalog Form Component should not render some fie
                             "isNotEmpty": true,
                             "when": "config_info.provision.repository_id",
                           },
-                          "id": "config_info.provision.vault_credentials",
+                          "id": "config_info.provision.vault_credential_id",
                           "includeEmpty": true,
                           "label": "Vault Credential",
-                          "name": "config_info.provision.vault_credentials",
+                          "name": "config_info.provision.vault_credential_id",
                           "options": Array [],
                         },
                         Object {
@@ -7698,10 +7698,10 @@ exports[`Ansible playbook edit catalog Form Component should not render some fie
                             "isNotEmpty": true,
                             "when": "config_info.retirement.repository_id",
                           },
-                          "id": "config_info.retirement.vault_credentials",
+                          "id": "config_info.retirement.vault_credential_id",
                           "includeEmpty": true,
                           "label": "Vault Credential",
-                          "name": "config_info.retirement.vault_credentials",
+                          "name": "config_info.retirement.vault_credential_id",
                           "options": Array [],
                         },
                         Object {
@@ -9180,10 +9180,10 @@ exports[`Ansible playbook edit catalog Form Component should not render some fie
                                 "isNotEmpty": true,
                                 "when": "config_info.provision.repository_id",
                               },
-                              "id": "config_info.provision.vault_credentials",
+                              "id": "config_info.provision.vault_credential_id",
                               "includeEmpty": true,
                               "label": "Vault Credential",
-                              "name": "config_info.provision.vault_credentials",
+                              "name": "config_info.provision.vault_credential_id",
                               "options": Array [],
                             },
                             Object {
@@ -9907,10 +9907,10 @@ exports[`Ansible playbook edit catalog Form Component should not render some fie
                                 "isNotEmpty": true,
                                 "when": "config_info.retirement.repository_id",
                               },
-                              "id": "config_info.retirement.vault_credentials",
+                              "id": "config_info.retirement.vault_credential_id",
                               "includeEmpty": true,
                               "label": "Vault Credential",
-                              "name": "config_info.retirement.vault_credentials",
+                              "name": "config_info.retirement.vault_credential_id",
                               "options": Array [],
                             },
                             Object {
@@ -11216,10 +11216,10 @@ exports[`Ansible playbook edit catalog Form Component should not render some fie
                                 "isNotEmpty": true,
                                 "when": "config_info.provision.repository_id",
                               },
-                              "id": "config_info.provision.vault_credentials",
+                              "id": "config_info.provision.vault_credential_id",
                               "includeEmpty": true,
                               "label": "Vault Credential",
-                              "name": "config_info.provision.vault_credentials",
+                              "name": "config_info.provision.vault_credential_id",
                               "options": Array [],
                             },
                             Object {
@@ -11943,10 +11943,10 @@ exports[`Ansible playbook edit catalog Form Component should not render some fie
                                 "isNotEmpty": true,
                                 "when": "config_info.retirement.repository_id",
                               },
-                              "id": "config_info.retirement.vault_credentials",
+                              "id": "config_info.retirement.vault_credential_id",
                               "includeEmpty": true,
                               "label": "Vault Credential",
-                              "name": "config_info.retirement.vault_credentials",
+                              "name": "config_info.retirement.vault_credential_id",
                               "options": Array [],
                             },
                             Object {
@@ -13263,10 +13263,10 @@ exports[`Ansible playbook edit catalog Form Component should not render some fie
                                   "isNotEmpty": true,
                                   "when": "config_info.provision.repository_id",
                                 },
-                                "id": "config_info.provision.vault_credentials",
+                                "id": "config_info.provision.vault_credential_id",
                                 "includeEmpty": true,
                                 "label": "Vault Credential",
-                                "name": "config_info.provision.vault_credentials",
+                                "name": "config_info.provision.vault_credential_id",
                                 "options": Array [],
                               },
                               Object {
@@ -13990,10 +13990,10 @@ exports[`Ansible playbook edit catalog Form Component should not render some fie
                                   "isNotEmpty": true,
                                   "when": "config_info.retirement.repository_id",
                                 },
-                                "id": "config_info.retirement.vault_credentials",
+                                "id": "config_info.retirement.vault_credential_id",
                                 "includeEmpty": true,
                                 "label": "Vault Credential",
-                                "name": "config_info.retirement.vault_credentials",
+                                "name": "config_info.retirement.vault_credential_id",
                                 "options": Array [],
                               },
                               Object {
@@ -15305,10 +15305,10 @@ exports[`Ansible playbook edit catalog Form Component should not render some fie
                                   "isNotEmpty": true,
                                   "when": "config_info.provision.repository_id",
                                 },
-                                "id": "config_info.provision.vault_credentials",
+                                "id": "config_info.provision.vault_credential_id",
                                 "includeEmpty": true,
                                 "label": "Vault Credential",
-                                "name": "config_info.provision.vault_credentials",
+                                "name": "config_info.provision.vault_credential_id",
                                 "options": Array [],
                               },
                               Object {
@@ -16032,10 +16032,10 @@ exports[`Ansible playbook edit catalog Form Component should not render some fie
                                   "isNotEmpty": true,
                                   "when": "config_info.retirement.repository_id",
                                 },
-                                "id": "config_info.retirement.vault_credentials",
+                                "id": "config_info.retirement.vault_credential_id",
                                 "includeEmpty": true,
                                 "label": "Vault Credential",
-                                "name": "config_info.retirement.vault_credentials",
+                                "name": "config_info.retirement.vault_credential_id",
                                 "options": Array [],
                               },
                               Object {
@@ -17367,10 +17367,10 @@ exports[`Ansible playbook edit catalog Form Component should not render some fie
                                     "isNotEmpty": true,
                                     "when": "config_info.provision.repository_id",
                                   },
-                                  "id": "config_info.provision.vault_credentials",
+                                  "id": "config_info.provision.vault_credential_id",
                                   "includeEmpty": true,
                                   "label": "Vault Credential",
-                                  "name": "config_info.provision.vault_credentials",
+                                  "name": "config_info.provision.vault_credential_id",
                                   "options": Array [],
                                 },
                                 Object {
@@ -18094,10 +18094,10 @@ exports[`Ansible playbook edit catalog Form Component should not render some fie
                                     "isNotEmpty": true,
                                     "when": "config_info.retirement.repository_id",
                                   },
-                                  "id": "config_info.retirement.vault_credentials",
+                                  "id": "config_info.retirement.vault_credential_id",
                                   "includeEmpty": true,
                                   "label": "Vault Credential",
-                                  "name": "config_info.retirement.vault_credentials",
+                                  "name": "config_info.retirement.vault_credential_id",
                                   "options": Array [],
                                 },
                                 Object {
@@ -19409,10 +19409,10 @@ exports[`Ansible playbook edit catalog Form Component should not render some fie
                                     "isNotEmpty": true,
                                     "when": "config_info.provision.repository_id",
                                   },
-                                  "id": "config_info.provision.vault_credentials",
+                                  "id": "config_info.provision.vault_credential_id",
                                   "includeEmpty": true,
                                   "label": "Vault Credential",
-                                  "name": "config_info.provision.vault_credentials",
+                                  "name": "config_info.provision.vault_credential_id",
                                   "options": Array [],
                                 },
                                 Object {
@@ -20136,10 +20136,10 @@ exports[`Ansible playbook edit catalog Form Component should not render some fie
                                     "isNotEmpty": true,
                                     "when": "config_info.retirement.repository_id",
                                   },
-                                  "id": "config_info.retirement.vault_credentials",
+                                  "id": "config_info.retirement.vault_credential_id",
                                   "includeEmpty": true,
                                   "label": "Vault Credential",
-                                  "name": "config_info.retirement.vault_credentials",
+                                  "name": "config_info.retirement.vault_credential_id",
                                   "options": Array [],
                                 },
                                 Object {
@@ -21462,10 +21462,10 @@ exports[`Ansible playbook edit catalog Form Component should not render some fie
                                       "isNotEmpty": true,
                                       "when": "config_info.provision.repository_id",
                                     },
-                                    "id": "config_info.provision.vault_credentials",
+                                    "id": "config_info.provision.vault_credential_id",
                                     "includeEmpty": true,
                                     "label": "Vault Credential",
-                                    "name": "config_info.provision.vault_credentials",
+                                    "name": "config_info.provision.vault_credential_id",
                                     "options": Array [],
                                   },
                                   Object {
@@ -22189,10 +22189,10 @@ exports[`Ansible playbook edit catalog Form Component should not render some fie
                                       "isNotEmpty": true,
                                       "when": "config_info.retirement.repository_id",
                                     },
-                                    "id": "config_info.retirement.vault_credentials",
+                                    "id": "config_info.retirement.vault_credential_id",
                                     "includeEmpty": true,
                                     "label": "Vault Credential",
-                                    "name": "config_info.retirement.vault_credentials",
+                                    "name": "config_info.retirement.vault_credential_id",
                                     "options": Array [],
                                   },
                                   Object {
@@ -23492,10 +23492,10 @@ exports[`Ansible playbook edit catalog Form Component should not render some fie
                                           "isNotEmpty": true,
                                           "when": "config_info.provision.repository_id",
                                         },
-                                        "id": "config_info.provision.vault_credentials",
+                                        "id": "config_info.provision.vault_credential_id",
                                         "includeEmpty": true,
                                         "label": "Vault Credential",
-                                        "name": "config_info.provision.vault_credentials",
+                                        "name": "config_info.provision.vault_credential_id",
                                         "options": Array [],
                                       },
                                       Object {
@@ -24219,10 +24219,10 @@ exports[`Ansible playbook edit catalog Form Component should not render some fie
                                           "isNotEmpty": true,
                                           "when": "config_info.retirement.repository_id",
                                         },
-                                        "id": "config_info.retirement.vault_credentials",
+                                        "id": "config_info.retirement.vault_credential_id",
                                         "includeEmpty": true,
                                         "label": "Vault Credential",
-                                        "name": "config_info.retirement.vault_credentials",
+                                        "name": "config_info.retirement.vault_credential_id",
                                         "options": Array [],
                                       },
                                       Object {
@@ -25525,10 +25525,10 @@ exports[`Ansible playbook edit catalog Form Component should not render some fie
                                             "isNotEmpty": true,
                                             "when": "config_info.provision.repository_id",
                                           },
-                                          "id": "config_info.provision.vault_credentials",
+                                          "id": "config_info.provision.vault_credential_id",
                                           "includeEmpty": true,
                                           "label": "Vault Credential",
-                                          "name": "config_info.provision.vault_credentials",
+                                          "name": "config_info.provision.vault_credential_id",
                                           "options": Array [],
                                         },
                                         Object {
@@ -26252,10 +26252,10 @@ exports[`Ansible playbook edit catalog Form Component should not render some fie
                                             "isNotEmpty": true,
                                             "when": "config_info.retirement.repository_id",
                                           },
-                                          "id": "config_info.retirement.vault_credentials",
+                                          "id": "config_info.retirement.vault_credential_id",
                                           "includeEmpty": true,
                                           "label": "Vault Credential",
-                                          "name": "config_info.retirement.vault_credentials",
+                                          "name": "config_info.retirement.vault_credential_id",
                                           "options": Array [],
                                         },
                                         Object {
@@ -40779,11 +40779,11 @@ exports[`Ansible playbook edit catalog Form Component should not render some fie
                                               "when": "config_info.provision.repository_id",
                                             }
                                           }
-                                          id="config_info.provision.vault_credentials"
+                                          id="config_info.provision.vault_credential_id"
                                           includeEmpty={true}
-                                          key="config_info.provision.vault_credentials"
+                                          key="config_info.provision.vault_credential_id"
                                           label="Vault Credential"
-                                          name="config_info.provision.vault_credentials"
+                                          name="config_info.provision.vault_credential_id"
                                           options={Array []}
                                         >
                                           <FormConditionWrapper
@@ -40796,10 +40796,10 @@ exports[`Ansible playbook edit catalog Form Component should not render some fie
                                             field={
                                               Object {
                                                 "component": "select",
-                                                "id": "config_info.provision.vault_credentials",
+                                                "id": "config_info.provision.vault_credential_id",
                                                 "includeEmpty": true,
                                                 "label": "Vault Credential",
-                                                "name": "config_info.provision.vault_credentials",
+                                                "name": "config_info.provision.vault_credential_id",
                                                 "options": Array [],
                                               }
                                             }
@@ -40814,10 +40814,10 @@ exports[`Ansible playbook edit catalog Form Component should not render some fie
                                               field={
                                                 Object {
                                                   "component": "select",
-                                                  "id": "config_info.provision.vault_credentials",
+                                                  "id": "config_info.provision.vault_credential_id",
                                                   "includeEmpty": true,
                                                   "label": "Vault Credential",
-                                                  "name": "config_info.provision.vault_credentials",
+                                                  "name": "config_info.provision.vault_credential_id",
                                                   "options": Array [],
                                                 }
                                               }
@@ -40845,10 +40845,10 @@ exports[`Ansible playbook edit catalog Form Component should not render some fie
                                                   field={
                                                     Object {
                                                       "component": "select",
-                                                      "id": "config_info.provision.vault_credentials",
+                                                      "id": "config_info.provision.vault_credential_id",
                                                       "includeEmpty": true,
                                                       "label": "Vault Credential",
-                                                      "name": "config_info.provision.vault_credentials",
+                                                      "name": "config_info.provision.vault_credential_id",
                                                       "options": Array [],
                                                     }
                                                   }
@@ -40873,10 +40873,10 @@ exports[`Ansible playbook edit catalog Form Component should not render some fie
                                                     field={
                                                       Object {
                                                         "component": "select",
-                                                        "id": "config_info.provision.vault_credentials",
+                                                        "id": "config_info.provision.vault_credential_id",
                                                         "includeEmpty": true,
                                                         "label": "Vault Credential",
-                                                        "name": "config_info.provision.vault_credentials",
+                                                        "name": "config_info.provision.vault_credential_id",
                                                         "options": Array [],
                                                       }
                                                     }
@@ -40900,10 +40900,10 @@ exports[`Ansible playbook edit catalog Form Component should not render some fie
                                                       field={
                                                         Object {
                                                           "component": "select",
-                                                          "id": "config_info.provision.vault_credentials",
+                                                          "id": "config_info.provision.vault_credential_id",
                                                           "includeEmpty": true,
                                                           "label": "Vault Credential",
-                                                          "name": "config_info.provision.vault_credentials",
+                                                          "name": "config_info.provision.vault_credential_id",
                                                           "options": Array [],
                                                         }
                                                       }
@@ -40922,19 +40922,19 @@ exports[`Ansible playbook edit catalog Form Component should not render some fie
                                                       >
                                                         <SelectWithOnChange
                                                           component="select"
-                                                          id="config_info.provision.vault_credentials"
+                                                          id="config_info.provision.vault_credential_id"
                                                           includeEmpty={true}
                                                           label="Vault Credential"
-                                                          name="config_info.provision.vault_credentials"
+                                                          name="config_info.provision.vault_credential_id"
                                                           options={Array []}
                                                           placeholder="<Choose>"
                                                         >
                                                           <Select
                                                             component="select"
-                                                            id="config_info.provision.vault_credentials"
+                                                            id="config_info.provision.vault_credential_id"
                                                             label="Vault Credential"
                                                             loadingMessage="Loading..."
-                                                            name="config_info.provision.vault_credentials"
+                                                            name="config_info.provision.vault_credential_id"
                                                             options={
                                                               Array [
                                                                 Object {
@@ -40947,12 +40947,12 @@ exports[`Ansible playbook edit catalog Form Component should not render some fie
                                                           >
                                                             <Select
                                                               SelectComponent={[Function]}
-                                                              id="config_info.provision.vault_credentials"
+                                                              id="config_info.provision.vault_credential_id"
                                                               invalidText=""
                                                               labelText="Vault Credential"
                                                               loadOptionsChangeCounter={1}
                                                               loadingMessage="Loading..."
-                                                              name="config_info.provision.vault_credentials"
+                                                              name="config_info.provision.vault_credential_id"
                                                               onBlur={[Function]}
                                                               onChange={[Function]}
                                                               onFocus={[Function]}
@@ -40972,13 +40972,13 @@ exports[`Ansible playbook edit catalog Form Component should not render some fie
                                                                 className=""
                                                                 closeMenuOnSelect={true}
                                                                 hideSelectedOptions={false}
-                                                                id="config_info.provision.vault_credentials"
+                                                                id="config_info.provision.vault_credential_id"
                                                                 invalidText=""
                                                                 isClearable={false}
                                                                 isFetching={false}
                                                                 isSearchable={false}
                                                                 labelText="Vault Credential"
-                                                                name="config_info.provision.vault_credentials"
+                                                                name="config_info.provision.vault_credential_id"
                                                                 noOptionsMessage={[Function]}
                                                                 onBlur={[Function]}
                                                                 onChange={[Function]}
@@ -40999,13 +40999,13 @@ exports[`Ansible playbook edit catalog Form Component should not render some fie
                                                                   className=""
                                                                   disabled={false}
                                                                   helperText=""
-                                                                  id="config_info.provision.vault_credentials"
+                                                                  id="config_info.provision.vault_credential_id"
                                                                   inline={false}
                                                                   invalid={false}
                                                                   invalidText=""
                                                                   labelText="Vault Credential"
                                                                   light={false}
-                                                                  name="config_info.provision.vault_credentials"
+                                                                  name="config_info.provision.vault_credential_id"
                                                                   onBlur={[Function]}
                                                                   onChange={[Function]}
                                                                   onFocus={[Function]}
@@ -41019,7 +41019,7 @@ exports[`Ansible playbook edit catalog Form Component should not render some fie
                                                                     >
                                                                       <label
                                                                         className="bx--label"
-                                                                        htmlFor="config_info.provision.vault_credentials"
+                                                                        htmlFor="config_info.provision.vault_credential_id"
                                                                       >
                                                                         Vault Credential
                                                                       </label>
@@ -41029,8 +41029,8 @@ exports[`Ansible playbook edit catalog Form Component should not render some fie
                                                                       >
                                                                         <select
                                                                           className="bx--select-input"
-                                                                          id="config_info.provision.vault_credentials"
-                                                                          name="config_info.provision.vault_credentials"
+                                                                          id="config_info.provision.vault_credential_id"
+                                                                          name="config_info.provision.vault_credential_id"
                                                                           onBlur={[Function]}
                                                                           onChange={[Function]}
                                                                           onFocus={[Function]}
@@ -50742,11 +50742,11 @@ exports[`Ansible playbook edit catalog Form Component should not render some fie
                                               "when": "config_info.retirement.repository_id",
                                             }
                                           }
-                                          id="config_info.retirement.vault_credentials"
+                                          id="config_info.retirement.vault_credential_id"
                                           includeEmpty={true}
-                                          key="config_info.retirement.vault_credentials"
+                                          key="config_info.retirement.vault_credential_id"
                                           label="Vault Credential"
-                                          name="config_info.retirement.vault_credentials"
+                                          name="config_info.retirement.vault_credential_id"
                                           options={Array []}
                                         >
                                           <FormConditionWrapper
@@ -50759,10 +50759,10 @@ exports[`Ansible playbook edit catalog Form Component should not render some fie
                                             field={
                                               Object {
                                                 "component": "select",
-                                                "id": "config_info.retirement.vault_credentials",
+                                                "id": "config_info.retirement.vault_credential_id",
                                                 "includeEmpty": true,
                                                 "label": "Vault Credential",
-                                                "name": "config_info.retirement.vault_credentials",
+                                                "name": "config_info.retirement.vault_credential_id",
                                                 "options": Array [],
                                               }
                                             }
@@ -50777,10 +50777,10 @@ exports[`Ansible playbook edit catalog Form Component should not render some fie
                                               field={
                                                 Object {
                                                   "component": "select",
-                                                  "id": "config_info.retirement.vault_credentials",
+                                                  "id": "config_info.retirement.vault_credential_id",
                                                   "includeEmpty": true,
                                                   "label": "Vault Credential",
-                                                  "name": "config_info.retirement.vault_credentials",
+                                                  "name": "config_info.retirement.vault_credential_id",
                                                   "options": Array [],
                                                 }
                                               }
@@ -50808,10 +50808,10 @@ exports[`Ansible playbook edit catalog Form Component should not render some fie
                                                   field={
                                                     Object {
                                                       "component": "select",
-                                                      "id": "config_info.retirement.vault_credentials",
+                                                      "id": "config_info.retirement.vault_credential_id",
                                                       "includeEmpty": true,
                                                       "label": "Vault Credential",
-                                                      "name": "config_info.retirement.vault_credentials",
+                                                      "name": "config_info.retirement.vault_credential_id",
                                                       "options": Array [],
                                                     }
                                                   }
@@ -50836,10 +50836,10 @@ exports[`Ansible playbook edit catalog Form Component should not render some fie
                                                     field={
                                                       Object {
                                                         "component": "select",
-                                                        "id": "config_info.retirement.vault_credentials",
+                                                        "id": "config_info.retirement.vault_credential_id",
                                                         "includeEmpty": true,
                                                         "label": "Vault Credential",
-                                                        "name": "config_info.retirement.vault_credentials",
+                                                        "name": "config_info.retirement.vault_credential_id",
                                                         "options": Array [],
                                                       }
                                                     }
@@ -50863,10 +50863,10 @@ exports[`Ansible playbook edit catalog Form Component should not render some fie
                                                       field={
                                                         Object {
                                                           "component": "select",
-                                                          "id": "config_info.retirement.vault_credentials",
+                                                          "id": "config_info.retirement.vault_credential_id",
                                                           "includeEmpty": true,
                                                           "label": "Vault Credential",
-                                                          "name": "config_info.retirement.vault_credentials",
+                                                          "name": "config_info.retirement.vault_credential_id",
                                                           "options": Array [],
                                                         }
                                                       }
@@ -54662,10 +54662,10 @@ exports[`Ansible playbook edit catalog Form Component should not render some fie
                                               "isNotEmpty": true,
                                               "when": "config_info.provision.repository_id",
                                             },
-                                            "id": "config_info.provision.vault_credentials",
+                                            "id": "config_info.provision.vault_credential_id",
                                             "includeEmpty": true,
                                             "label": "Vault Credential",
-                                            "name": "config_info.provision.vault_credentials",
+                                            "name": "config_info.provision.vault_credential_id",
                                             "options": Array [],
                                           },
                                           Object {
@@ -55389,10 +55389,10 @@ exports[`Ansible playbook edit catalog Form Component should not render some fie
                                               "isNotEmpty": true,
                                               "when": "config_info.retirement.repository_id",
                                             },
-                                            "id": "config_info.retirement.vault_credentials",
+                                            "id": "config_info.retirement.vault_credential_id",
                                             "includeEmpty": true,
                                             "label": "Vault Credential",
-                                            "name": "config_info.retirement.vault_credentials",
+                                            "name": "config_info.retirement.vault_credential_id",
                                             "options": Array [],
                                           },
                                           Object {
@@ -55859,7 +55859,7 @@ exports[`Ansible playbook edit catalog Form Component should not render some fie
                                   "config_info.provision.playbook_id": false,
                                   "config_info.provision.repository_id": false,
                                   "config_info.provision.specify_host_type": false,
-                                  "config_info.provision.vault_credentials": false,
+                                  "config_info.provision.vault_credential_id": false,
                                   "config_info.provision.verbosity": false,
                                   "config_info.retirement.become_method": false,
                                   "config_info.retirement.cloud_type": false,
@@ -55901,7 +55901,7 @@ exports[`Ansible playbook edit catalog Form Component should not render some fie
                                   "config_info.provision.playbook_id": false,
                                   "config_info.provision.repository_id": false,
                                   "config_info.provision.specify_host_type": false,
-                                  "config_info.provision.vault_credentials": false,
+                                  "config_info.provision.vault_credential_id": false,
                                   "config_info.provision.verbosity": false,
                                   "config_info.retirement.become_method": false,
                                   "config_info.retirement.cloud_type": false,
@@ -56068,7 +56068,7 @@ exports[`Ansible playbook edit catalog Form Component should not render some fie
                                   "config_info.provision.playbook_id": false,
                                   "config_info.provision.repository_id": false,
                                   "config_info.provision.specify_host_type": false,
-                                  "config_info.provision.vault_credentials": false,
+                                  "config_info.provision.vault_credential_id": false,
                                   "config_info.provision.verbosity": false,
                                   "config_info.retirement.become_method": false,
                                   "config_info.retirement.cloud_type": false,
@@ -57151,10 +57151,10 @@ exports[`Ansible playbook edit catalog Form Component should not render some fie
                                               "isNotEmpty": true,
                                               "when": "config_info.provision.repository_id",
                                             },
-                                            "id": "config_info.provision.vault_credentials",
+                                            "id": "config_info.provision.vault_credential_id",
                                             "includeEmpty": true,
                                             "label": "Vault Credential",
-                                            "name": "config_info.provision.vault_credentials",
+                                            "name": "config_info.provision.vault_credential_id",
                                             "options": Array [],
                                           },
                                           Object {
@@ -57878,10 +57878,10 @@ exports[`Ansible playbook edit catalog Form Component should not render some fie
                                               "isNotEmpty": true,
                                               "when": "config_info.retirement.repository_id",
                                             },
-                                            "id": "config_info.retirement.vault_credentials",
+                                            "id": "config_info.retirement.vault_credential_id",
                                             "includeEmpty": true,
                                             "label": "Vault Credential",
-                                            "name": "config_info.retirement.vault_credentials",
+                                            "name": "config_info.retirement.vault_credential_id",
                                             "options": Array [],
                                           },
                                           Object {
@@ -60802,10 +60802,10 @@ exports[`Ansible playbook edit catalog Form Component should render correct form
                         "isNotEmpty": true,
                         "when": "config_info.provision.repository_id",
                       },
-                      "id": "config_info.provision.vault_credentials",
+                      "id": "config_info.provision.vault_credential_id",
                       "includeEmpty": true,
                       "label": "Vault Credential",
-                      "name": "config_info.provision.vault_credentials",
+                      "name": "config_info.provision.vault_credential_id",
                       "options": Array [],
                     },
                     Object {
@@ -61529,10 +61529,10 @@ exports[`Ansible playbook edit catalog Form Component should render correct form
                         "isNotEmpty": true,
                         "when": "config_info.retirement.repository_id",
                       },
-                      "id": "config_info.retirement.vault_credentials",
+                      "id": "config_info.retirement.vault_credential_id",
                       "includeEmpty": true,
                       "label": "Vault Credential",
-                      "name": "config_info.retirement.vault_credentials",
+                      "name": "config_info.retirement.vault_credential_id",
                       "options": Array [],
                     },
                     Object {
@@ -63028,10 +63028,10 @@ exports[`Ansible playbook edit catalog Form Component should render correct form
                           "isNotEmpty": true,
                           "when": "config_info.provision.repository_id",
                         },
-                        "id": "config_info.provision.vault_credentials",
+                        "id": "config_info.provision.vault_credential_id",
                         "includeEmpty": true,
                         "label": "Vault Credential",
-                        "name": "config_info.provision.vault_credentials",
+                        "name": "config_info.provision.vault_credential_id",
                         "options": Array [],
                       },
                       Object {
@@ -63755,10 +63755,10 @@ exports[`Ansible playbook edit catalog Form Component should render correct form
                           "isNotEmpty": true,
                           "when": "config_info.retirement.repository_id",
                         },
-                        "id": "config_info.retirement.vault_credentials",
+                        "id": "config_info.retirement.vault_credential_id",
                         "includeEmpty": true,
                         "label": "Vault Credential",
-                        "name": "config_info.retirement.vault_credentials",
+                        "name": "config_info.retirement.vault_credential_id",
                         "options": Array [],
                       },
                       Object {
@@ -65250,10 +65250,10 @@ exports[`Ansible playbook edit catalog Form Component should render correct form
                             "isNotEmpty": true,
                             "when": "config_info.provision.repository_id",
                           },
-                          "id": "config_info.provision.vault_credentials",
+                          "id": "config_info.provision.vault_credential_id",
                           "includeEmpty": true,
                           "label": "Vault Credential",
-                          "name": "config_info.provision.vault_credentials",
+                          "name": "config_info.provision.vault_credential_id",
                           "options": Array [],
                         },
                         Object {
@@ -65977,10 +65977,10 @@ exports[`Ansible playbook edit catalog Form Component should render correct form
                             "isNotEmpty": true,
                             "when": "config_info.retirement.repository_id",
                           },
-                          "id": "config_info.retirement.vault_credentials",
+                          "id": "config_info.retirement.vault_credential_id",
                           "includeEmpty": true,
                           "label": "Vault Credential",
-                          "name": "config_info.retirement.vault_credentials",
+                          "name": "config_info.retirement.vault_credential_id",
                           "options": Array [],
                         },
                         Object {
@@ -67468,10 +67468,10 @@ exports[`Ansible playbook edit catalog Form Component should render correct form
                                 "isNotEmpty": true,
                                 "when": "config_info.provision.repository_id",
                               },
-                              "id": "config_info.provision.vault_credentials",
+                              "id": "config_info.provision.vault_credential_id",
                               "includeEmpty": true,
                               "label": "Vault Credential",
-                              "name": "config_info.provision.vault_credentials",
+                              "name": "config_info.provision.vault_credential_id",
                               "options": Array [],
                             },
                             Object {
@@ -68195,10 +68195,10 @@ exports[`Ansible playbook edit catalog Form Component should render correct form
                                 "isNotEmpty": true,
                                 "when": "config_info.retirement.repository_id",
                               },
-                              "id": "config_info.retirement.vault_credentials",
+                              "id": "config_info.retirement.vault_credential_id",
                               "includeEmpty": true,
                               "label": "Vault Credential",
-                              "name": "config_info.retirement.vault_credentials",
+                              "name": "config_info.retirement.vault_credential_id",
                               "options": Array [],
                             },
                             Object {
@@ -69504,10 +69504,10 @@ exports[`Ansible playbook edit catalog Form Component should render correct form
                                 "isNotEmpty": true,
                                 "when": "config_info.provision.repository_id",
                               },
-                              "id": "config_info.provision.vault_credentials",
+                              "id": "config_info.provision.vault_credential_id",
                               "includeEmpty": true,
                               "label": "Vault Credential",
-                              "name": "config_info.provision.vault_credentials",
+                              "name": "config_info.provision.vault_credential_id",
                               "options": Array [],
                             },
                             Object {
@@ -70231,10 +70231,10 @@ exports[`Ansible playbook edit catalog Form Component should render correct form
                                 "isNotEmpty": true,
                                 "when": "config_info.retirement.repository_id",
                               },
-                              "id": "config_info.retirement.vault_credentials",
+                              "id": "config_info.retirement.vault_credential_id",
                               "includeEmpty": true,
                               "label": "Vault Credential",
-                              "name": "config_info.retirement.vault_credentials",
+                              "name": "config_info.retirement.vault_credential_id",
                               "options": Array [],
                             },
                             Object {
@@ -71551,10 +71551,10 @@ exports[`Ansible playbook edit catalog Form Component should render correct form
                                   "isNotEmpty": true,
                                   "when": "config_info.provision.repository_id",
                                 },
-                                "id": "config_info.provision.vault_credentials",
+                                "id": "config_info.provision.vault_credential_id",
                                 "includeEmpty": true,
                                 "label": "Vault Credential",
-                                "name": "config_info.provision.vault_credentials",
+                                "name": "config_info.provision.vault_credential_id",
                                 "options": Array [],
                               },
                               Object {
@@ -72278,10 +72278,10 @@ exports[`Ansible playbook edit catalog Form Component should render correct form
                                   "isNotEmpty": true,
                                   "when": "config_info.retirement.repository_id",
                                 },
-                                "id": "config_info.retirement.vault_credentials",
+                                "id": "config_info.retirement.vault_credential_id",
                                 "includeEmpty": true,
                                 "label": "Vault Credential",
-                                "name": "config_info.retirement.vault_credentials",
+                                "name": "config_info.retirement.vault_credential_id",
                                 "options": Array [],
                               },
                               Object {
@@ -73593,10 +73593,10 @@ exports[`Ansible playbook edit catalog Form Component should render correct form
                                   "isNotEmpty": true,
                                   "when": "config_info.provision.repository_id",
                                 },
-                                "id": "config_info.provision.vault_credentials",
+                                "id": "config_info.provision.vault_credential_id",
                                 "includeEmpty": true,
                                 "label": "Vault Credential",
-                                "name": "config_info.provision.vault_credentials",
+                                "name": "config_info.provision.vault_credential_id",
                                 "options": Array [],
                               },
                               Object {
@@ -74320,10 +74320,10 @@ exports[`Ansible playbook edit catalog Form Component should render correct form
                                   "isNotEmpty": true,
                                   "when": "config_info.retirement.repository_id",
                                 },
-                                "id": "config_info.retirement.vault_credentials",
+                                "id": "config_info.retirement.vault_credential_id",
                                 "includeEmpty": true,
                                 "label": "Vault Credential",
-                                "name": "config_info.retirement.vault_credentials",
+                                "name": "config_info.retirement.vault_credential_id",
                                 "options": Array [],
                               },
                               Object {
@@ -75655,10 +75655,10 @@ exports[`Ansible playbook edit catalog Form Component should render correct form
                                     "isNotEmpty": true,
                                     "when": "config_info.provision.repository_id",
                                   },
-                                  "id": "config_info.provision.vault_credentials",
+                                  "id": "config_info.provision.vault_credential_id",
                                   "includeEmpty": true,
                                   "label": "Vault Credential",
-                                  "name": "config_info.provision.vault_credentials",
+                                  "name": "config_info.provision.vault_credential_id",
                                   "options": Array [],
                                 },
                                 Object {
@@ -76382,10 +76382,10 @@ exports[`Ansible playbook edit catalog Form Component should render correct form
                                     "isNotEmpty": true,
                                     "when": "config_info.retirement.repository_id",
                                   },
-                                  "id": "config_info.retirement.vault_credentials",
+                                  "id": "config_info.retirement.vault_credential_id",
                                   "includeEmpty": true,
                                   "label": "Vault Credential",
-                                  "name": "config_info.retirement.vault_credentials",
+                                  "name": "config_info.retirement.vault_credential_id",
                                   "options": Array [],
                                 },
                                 Object {
@@ -77697,10 +77697,10 @@ exports[`Ansible playbook edit catalog Form Component should render correct form
                                     "isNotEmpty": true,
                                     "when": "config_info.provision.repository_id",
                                   },
-                                  "id": "config_info.provision.vault_credentials",
+                                  "id": "config_info.provision.vault_credential_id",
                                   "includeEmpty": true,
                                   "label": "Vault Credential",
-                                  "name": "config_info.provision.vault_credentials",
+                                  "name": "config_info.provision.vault_credential_id",
                                   "options": Array [],
                                 },
                                 Object {
@@ -78424,10 +78424,10 @@ exports[`Ansible playbook edit catalog Form Component should render correct form
                                     "isNotEmpty": true,
                                     "when": "config_info.retirement.repository_id",
                                   },
-                                  "id": "config_info.retirement.vault_credentials",
+                                  "id": "config_info.retirement.vault_credential_id",
                                   "includeEmpty": true,
                                   "label": "Vault Credential",
-                                  "name": "config_info.retirement.vault_credentials",
+                                  "name": "config_info.retirement.vault_credential_id",
                                   "options": Array [],
                                 },
                                 Object {
@@ -79750,10 +79750,10 @@ exports[`Ansible playbook edit catalog Form Component should render correct form
                                       "isNotEmpty": true,
                                       "when": "config_info.provision.repository_id",
                                     },
-                                    "id": "config_info.provision.vault_credentials",
+                                    "id": "config_info.provision.vault_credential_id",
                                     "includeEmpty": true,
                                     "label": "Vault Credential",
-                                    "name": "config_info.provision.vault_credentials",
+                                    "name": "config_info.provision.vault_credential_id",
                                     "options": Array [],
                                   },
                                   Object {
@@ -80477,10 +80477,10 @@ exports[`Ansible playbook edit catalog Form Component should render correct form
                                       "isNotEmpty": true,
                                       "when": "config_info.retirement.repository_id",
                                     },
-                                    "id": "config_info.retirement.vault_credentials",
+                                    "id": "config_info.retirement.vault_credential_id",
                                     "includeEmpty": true,
                                     "label": "Vault Credential",
-                                    "name": "config_info.retirement.vault_credentials",
+                                    "name": "config_info.retirement.vault_credential_id",
                                     "options": Array [],
                                   },
                                   Object {
@@ -81780,10 +81780,10 @@ exports[`Ansible playbook edit catalog Form Component should render correct form
                                           "isNotEmpty": true,
                                           "when": "config_info.provision.repository_id",
                                         },
-                                        "id": "config_info.provision.vault_credentials",
+                                        "id": "config_info.provision.vault_credential_id",
                                         "includeEmpty": true,
                                         "label": "Vault Credential",
-                                        "name": "config_info.provision.vault_credentials",
+                                        "name": "config_info.provision.vault_credential_id",
                                         "options": Array [],
                                       },
                                       Object {
@@ -82507,10 +82507,10 @@ exports[`Ansible playbook edit catalog Form Component should render correct form
                                           "isNotEmpty": true,
                                           "when": "config_info.retirement.repository_id",
                                         },
-                                        "id": "config_info.retirement.vault_credentials",
+                                        "id": "config_info.retirement.vault_credential_id",
                                         "includeEmpty": true,
                                         "label": "Vault Credential",
-                                        "name": "config_info.retirement.vault_credentials",
+                                        "name": "config_info.retirement.vault_credential_id",
                                         "options": Array [],
                                       },
                                       Object {
@@ -83813,10 +83813,10 @@ exports[`Ansible playbook edit catalog Form Component should render correct form
                                             "isNotEmpty": true,
                                             "when": "config_info.provision.repository_id",
                                           },
-                                          "id": "config_info.provision.vault_credentials",
+                                          "id": "config_info.provision.vault_credential_id",
                                           "includeEmpty": true,
                                           "label": "Vault Credential",
-                                          "name": "config_info.provision.vault_credentials",
+                                          "name": "config_info.provision.vault_credential_id",
                                           "options": Array [],
                                         },
                                         Object {
@@ -84540,10 +84540,10 @@ exports[`Ansible playbook edit catalog Form Component should render correct form
                                             "isNotEmpty": true,
                                             "when": "config_info.retirement.repository_id",
                                           },
-                                          "id": "config_info.retirement.vault_credentials",
+                                          "id": "config_info.retirement.vault_credential_id",
                                           "includeEmpty": true,
                                           "label": "Vault Credential",
-                                          "name": "config_info.retirement.vault_credentials",
+                                          "name": "config_info.retirement.vault_credential_id",
                                           "options": Array [],
                                         },
                                         Object {
@@ -99067,11 +99067,11 @@ exports[`Ansible playbook edit catalog Form Component should render correct form
                                               "when": "config_info.provision.repository_id",
                                             }
                                           }
-                                          id="config_info.provision.vault_credentials"
+                                          id="config_info.provision.vault_credential_id"
                                           includeEmpty={true}
-                                          key="config_info.provision.vault_credentials"
+                                          key="config_info.provision.vault_credential_id"
                                           label="Vault Credential"
-                                          name="config_info.provision.vault_credentials"
+                                          name="config_info.provision.vault_credential_id"
                                           options={Array []}
                                         >
                                           <FormConditionWrapper
@@ -99084,10 +99084,10 @@ exports[`Ansible playbook edit catalog Form Component should render correct form
                                             field={
                                               Object {
                                                 "component": "select",
-                                                "id": "config_info.provision.vault_credentials",
+                                                "id": "config_info.provision.vault_credential_id",
                                                 "includeEmpty": true,
                                                 "label": "Vault Credential",
-                                                "name": "config_info.provision.vault_credentials",
+                                                "name": "config_info.provision.vault_credential_id",
                                                 "options": Array [],
                                               }
                                             }
@@ -99102,10 +99102,10 @@ exports[`Ansible playbook edit catalog Form Component should render correct form
                                               field={
                                                 Object {
                                                   "component": "select",
-                                                  "id": "config_info.provision.vault_credentials",
+                                                  "id": "config_info.provision.vault_credential_id",
                                                   "includeEmpty": true,
                                                   "label": "Vault Credential",
-                                                  "name": "config_info.provision.vault_credentials",
+                                                  "name": "config_info.provision.vault_credential_id",
                                                   "options": Array [],
                                                 }
                                               }
@@ -99133,10 +99133,10 @@ exports[`Ansible playbook edit catalog Form Component should render correct form
                                                   field={
                                                     Object {
                                                       "component": "select",
-                                                      "id": "config_info.provision.vault_credentials",
+                                                      "id": "config_info.provision.vault_credential_id",
                                                       "includeEmpty": true,
                                                       "label": "Vault Credential",
-                                                      "name": "config_info.provision.vault_credentials",
+                                                      "name": "config_info.provision.vault_credential_id",
                                                       "options": Array [],
                                                     }
                                                   }
@@ -99161,10 +99161,10 @@ exports[`Ansible playbook edit catalog Form Component should render correct form
                                                     field={
                                                       Object {
                                                         "component": "select",
-                                                        "id": "config_info.provision.vault_credentials",
+                                                        "id": "config_info.provision.vault_credential_id",
                                                         "includeEmpty": true,
                                                         "label": "Vault Credential",
-                                                        "name": "config_info.provision.vault_credentials",
+                                                        "name": "config_info.provision.vault_credential_id",
                                                         "options": Array [],
                                                       }
                                                     }
@@ -99188,10 +99188,10 @@ exports[`Ansible playbook edit catalog Form Component should render correct form
                                                       field={
                                                         Object {
                                                           "component": "select",
-                                                          "id": "config_info.provision.vault_credentials",
+                                                          "id": "config_info.provision.vault_credential_id",
                                                           "includeEmpty": true,
                                                           "label": "Vault Credential",
-                                                          "name": "config_info.provision.vault_credentials",
+                                                          "name": "config_info.provision.vault_credential_id",
                                                           "options": Array [],
                                                         }
                                                       }
@@ -99210,19 +99210,19 @@ exports[`Ansible playbook edit catalog Form Component should render correct form
                                                       >
                                                         <SelectWithOnChange
                                                           component="select"
-                                                          id="config_info.provision.vault_credentials"
+                                                          id="config_info.provision.vault_credential_id"
                                                           includeEmpty={true}
                                                           label="Vault Credential"
-                                                          name="config_info.provision.vault_credentials"
+                                                          name="config_info.provision.vault_credential_id"
                                                           options={Array []}
                                                           placeholder="<Choose>"
                                                         >
                                                           <Select
                                                             component="select"
-                                                            id="config_info.provision.vault_credentials"
+                                                            id="config_info.provision.vault_credential_id"
                                                             label="Vault Credential"
                                                             loadingMessage="Loading..."
-                                                            name="config_info.provision.vault_credentials"
+                                                            name="config_info.provision.vault_credential_id"
                                                             options={
                                                               Array [
                                                                 Object {
@@ -99235,12 +99235,12 @@ exports[`Ansible playbook edit catalog Form Component should render correct form
                                                           >
                                                             <Select
                                                               SelectComponent={[Function]}
-                                                              id="config_info.provision.vault_credentials"
+                                                              id="config_info.provision.vault_credential_id"
                                                               invalidText=""
                                                               labelText="Vault Credential"
                                                               loadOptionsChangeCounter={1}
                                                               loadingMessage="Loading..."
-                                                              name="config_info.provision.vault_credentials"
+                                                              name="config_info.provision.vault_credential_id"
                                                               onBlur={[Function]}
                                                               onChange={[Function]}
                                                               onFocus={[Function]}
@@ -99260,13 +99260,13 @@ exports[`Ansible playbook edit catalog Form Component should render correct form
                                                                 className=""
                                                                 closeMenuOnSelect={true}
                                                                 hideSelectedOptions={false}
-                                                                id="config_info.provision.vault_credentials"
+                                                                id="config_info.provision.vault_credential_id"
                                                                 invalidText=""
                                                                 isClearable={false}
                                                                 isFetching={false}
                                                                 isSearchable={false}
                                                                 labelText="Vault Credential"
-                                                                name="config_info.provision.vault_credentials"
+                                                                name="config_info.provision.vault_credential_id"
                                                                 noOptionsMessage={[Function]}
                                                                 onBlur={[Function]}
                                                                 onChange={[Function]}
@@ -99287,13 +99287,13 @@ exports[`Ansible playbook edit catalog Form Component should render correct form
                                                                   className=""
                                                                   disabled={false}
                                                                   helperText=""
-                                                                  id="config_info.provision.vault_credentials"
+                                                                  id="config_info.provision.vault_credential_id"
                                                                   inline={false}
                                                                   invalid={false}
                                                                   invalidText=""
                                                                   labelText="Vault Credential"
                                                                   light={false}
-                                                                  name="config_info.provision.vault_credentials"
+                                                                  name="config_info.provision.vault_credential_id"
                                                                   onBlur={[Function]}
                                                                   onChange={[Function]}
                                                                   onFocus={[Function]}
@@ -99307,7 +99307,7 @@ exports[`Ansible playbook edit catalog Form Component should render correct form
                                                                     >
                                                                       <label
                                                                         className="bx--label"
-                                                                        htmlFor="config_info.provision.vault_credentials"
+                                                                        htmlFor="config_info.provision.vault_credential_id"
                                                                       >
                                                                         Vault Credential
                                                                       </label>
@@ -99317,8 +99317,8 @@ exports[`Ansible playbook edit catalog Form Component should render correct form
                                                                       >
                                                                         <select
                                                                           className="bx--select-input"
-                                                                          id="config_info.provision.vault_credentials"
-                                                                          name="config_info.provision.vault_credentials"
+                                                                          id="config_info.provision.vault_credential_id"
+                                                                          name="config_info.provision.vault_credential_id"
                                                                           onBlur={[Function]}
                                                                           onChange={[Function]}
                                                                           onFocus={[Function]}
@@ -111094,11 +111094,11 @@ exports[`Ansible playbook edit catalog Form Component should render correct form
                                               "when": "config_info.retirement.repository_id",
                                             }
                                           }
-                                          id="config_info.retirement.vault_credentials"
+                                          id="config_info.retirement.vault_credential_id"
                                           includeEmpty={true}
-                                          key="config_info.retirement.vault_credentials"
+                                          key="config_info.retirement.vault_credential_id"
                                           label="Vault Credential"
-                                          name="config_info.retirement.vault_credentials"
+                                          name="config_info.retirement.vault_credential_id"
                                           options={Array []}
                                         >
                                           <FormConditionWrapper
@@ -111111,10 +111111,10 @@ exports[`Ansible playbook edit catalog Form Component should render correct form
                                             field={
                                               Object {
                                                 "component": "select",
-                                                "id": "config_info.retirement.vault_credentials",
+                                                "id": "config_info.retirement.vault_credential_id",
                                                 "includeEmpty": true,
                                                 "label": "Vault Credential",
-                                                "name": "config_info.retirement.vault_credentials",
+                                                "name": "config_info.retirement.vault_credential_id",
                                                 "options": Array [],
                                               }
                                             }
@@ -111129,10 +111129,10 @@ exports[`Ansible playbook edit catalog Form Component should render correct form
                                               field={
                                                 Object {
                                                   "component": "select",
-                                                  "id": "config_info.retirement.vault_credentials",
+                                                  "id": "config_info.retirement.vault_credential_id",
                                                   "includeEmpty": true,
                                                   "label": "Vault Credential",
-                                                  "name": "config_info.retirement.vault_credentials",
+                                                  "name": "config_info.retirement.vault_credential_id",
                                                   "options": Array [],
                                                 }
                                               }
@@ -111160,10 +111160,10 @@ exports[`Ansible playbook edit catalog Form Component should render correct form
                                                   field={
                                                     Object {
                                                       "component": "select",
-                                                      "id": "config_info.retirement.vault_credentials",
+                                                      "id": "config_info.retirement.vault_credential_id",
                                                       "includeEmpty": true,
                                                       "label": "Vault Credential",
-                                                      "name": "config_info.retirement.vault_credentials",
+                                                      "name": "config_info.retirement.vault_credential_id",
                                                       "options": Array [],
                                                     }
                                                   }
@@ -111188,10 +111188,10 @@ exports[`Ansible playbook edit catalog Form Component should render correct form
                                                     field={
                                                       Object {
                                                         "component": "select",
-                                                        "id": "config_info.retirement.vault_credentials",
+                                                        "id": "config_info.retirement.vault_credential_id",
                                                         "includeEmpty": true,
                                                         "label": "Vault Credential",
-                                                        "name": "config_info.retirement.vault_credentials",
+                                                        "name": "config_info.retirement.vault_credential_id",
                                                         "options": Array [],
                                                       }
                                                     }
@@ -111215,10 +111215,10 @@ exports[`Ansible playbook edit catalog Form Component should render correct form
                                                       field={
                                                         Object {
                                                           "component": "select",
-                                                          "id": "config_info.retirement.vault_credentials",
+                                                          "id": "config_info.retirement.vault_credential_id",
                                                           "includeEmpty": true,
                                                           "label": "Vault Credential",
-                                                          "name": "config_info.retirement.vault_credentials",
+                                                          "name": "config_info.retirement.vault_credential_id",
                                                           "options": Array [],
                                                         }
                                                       }
@@ -111237,19 +111237,19 @@ exports[`Ansible playbook edit catalog Form Component should render correct form
                                                       >
                                                         <SelectWithOnChange
                                                           component="select"
-                                                          id="config_info.retirement.vault_credentials"
+                                                          id="config_info.retirement.vault_credential_id"
                                                           includeEmpty={true}
                                                           label="Vault Credential"
-                                                          name="config_info.retirement.vault_credentials"
+                                                          name="config_info.retirement.vault_credential_id"
                                                           options={Array []}
                                                           placeholder="<Choose>"
                                                         >
                                                           <Select
                                                             component="select"
-                                                            id="config_info.retirement.vault_credentials"
+                                                            id="config_info.retirement.vault_credential_id"
                                                             label="Vault Credential"
                                                             loadingMessage="Loading..."
-                                                            name="config_info.retirement.vault_credentials"
+                                                            name="config_info.retirement.vault_credential_id"
                                                             options={
                                                               Array [
                                                                 Object {
@@ -111262,12 +111262,12 @@ exports[`Ansible playbook edit catalog Form Component should render correct form
                                                           >
                                                             <Select
                                                               SelectComponent={[Function]}
-                                                              id="config_info.retirement.vault_credentials"
+                                                              id="config_info.retirement.vault_credential_id"
                                                               invalidText=""
                                                               labelText="Vault Credential"
                                                               loadOptionsChangeCounter={1}
                                                               loadingMessage="Loading..."
-                                                              name="config_info.retirement.vault_credentials"
+                                                              name="config_info.retirement.vault_credential_id"
                                                               onBlur={[Function]}
                                                               onChange={[Function]}
                                                               onFocus={[Function]}
@@ -111287,13 +111287,13 @@ exports[`Ansible playbook edit catalog Form Component should render correct form
                                                                 className=""
                                                                 closeMenuOnSelect={true}
                                                                 hideSelectedOptions={false}
-                                                                id="config_info.retirement.vault_credentials"
+                                                                id="config_info.retirement.vault_credential_id"
                                                                 invalidText=""
                                                                 isClearable={false}
                                                                 isFetching={false}
                                                                 isSearchable={false}
                                                                 labelText="Vault Credential"
-                                                                name="config_info.retirement.vault_credentials"
+                                                                name="config_info.retirement.vault_credential_id"
                                                                 noOptionsMessage={[Function]}
                                                                 onBlur={[Function]}
                                                                 onChange={[Function]}
@@ -111314,13 +111314,13 @@ exports[`Ansible playbook edit catalog Form Component should render correct form
                                                                   className=""
                                                                   disabled={false}
                                                                   helperText=""
-                                                                  id="config_info.retirement.vault_credentials"
+                                                                  id="config_info.retirement.vault_credential_id"
                                                                   inline={false}
                                                                   invalid={false}
                                                                   invalidText=""
                                                                   labelText="Vault Credential"
                                                                   light={false}
-                                                                  name="config_info.retirement.vault_credentials"
+                                                                  name="config_info.retirement.vault_credential_id"
                                                                   onBlur={[Function]}
                                                                   onChange={[Function]}
                                                                   onFocus={[Function]}
@@ -111334,7 +111334,7 @@ exports[`Ansible playbook edit catalog Form Component should render correct form
                                                                     >
                                                                       <label
                                                                         className="bx--label"
-                                                                        htmlFor="config_info.retirement.vault_credentials"
+                                                                        htmlFor="config_info.retirement.vault_credential_id"
                                                                       >
                                                                         Vault Credential
                                                                       </label>
@@ -111344,8 +111344,8 @@ exports[`Ansible playbook edit catalog Form Component should render correct form
                                                                       >
                                                                         <select
                                                                           className="bx--select-input"
-                                                                          id="config_info.retirement.vault_credentials"
-                                                                          name="config_info.retirement.vault_credentials"
+                                                                          id="config_info.retirement.vault_credential_id"
+                                                                          name="config_info.retirement.vault_credential_id"
                                                                           onBlur={[Function]}
                                                                           onChange={[Function]}
                                                                           onFocus={[Function]}
@@ -115823,10 +115823,10 @@ exports[`Ansible playbook edit catalog Form Component should render correct form
                                               "isNotEmpty": true,
                                               "when": "config_info.provision.repository_id",
                                             },
-                                            "id": "config_info.provision.vault_credentials",
+                                            "id": "config_info.provision.vault_credential_id",
                                             "includeEmpty": true,
                                             "label": "Vault Credential",
-                                            "name": "config_info.provision.vault_credentials",
+                                            "name": "config_info.provision.vault_credential_id",
                                             "options": Array [],
                                           },
                                           Object {
@@ -116550,10 +116550,10 @@ exports[`Ansible playbook edit catalog Form Component should render correct form
                                               "isNotEmpty": true,
                                               "when": "config_info.retirement.repository_id",
                                             },
-                                            "id": "config_info.retirement.vault_credentials",
+                                            "id": "config_info.retirement.vault_credential_id",
                                             "includeEmpty": true,
                                             "label": "Vault Credential",
-                                            "name": "config_info.retirement.vault_credentials",
+                                            "name": "config_info.retirement.vault_credential_id",
                                             "options": Array [],
                                           },
                                           Object {
@@ -117033,7 +117033,7 @@ exports[`Ansible playbook edit catalog Form Component should render correct form
                                   "config_info.provision.playbook_id": false,
                                   "config_info.provision.repository_id": false,
                                   "config_info.provision.specify_host_type": false,
-                                  "config_info.provision.vault_credentials": false,
+                                  "config_info.provision.vault_credential_id": false,
                                   "config_info.provision.verbosity": false,
                                   "config_info.retirement.become_method": false,
                                   "config_info.retirement.cloud_credential_id": false,
@@ -117047,7 +117047,7 @@ exports[`Ansible playbook edit catalog Form Component should render correct form
                                   "config_info.retirement.remove_resources": false,
                                   "config_info.retirement.repository_id": false,
                                   "config_info.retirement.specify_host_type": false,
-                                  "config_info.retirement.vault_credentials": false,
+                                  "config_info.retirement.vault_credential_id": false,
                                   "config_info.retirement.verbosity": false,
                                   "currency_id": false,
                                   "description": false,
@@ -117079,7 +117079,7 @@ exports[`Ansible playbook edit catalog Form Component should render correct form
                                   "config_info.provision.playbook_id": false,
                                   "config_info.provision.repository_id": false,
                                   "config_info.provision.specify_host_type": false,
-                                  "config_info.provision.vault_credentials": false,
+                                  "config_info.provision.vault_credential_id": false,
                                   "config_info.provision.verbosity": false,
                                   "config_info.retirement.become_method": false,
                                   "config_info.retirement.cloud_credential_id": false,
@@ -117093,7 +117093,7 @@ exports[`Ansible playbook edit catalog Form Component should render correct form
                                   "config_info.retirement.remove_resources": false,
                                   "config_info.retirement.repository_id": false,
                                   "config_info.retirement.specify_host_type": false,
-                                  "config_info.retirement.vault_credentials": false,
+                                  "config_info.retirement.vault_credential_id": false,
                                   "config_info.retirement.verbosity": false,
                                   "currency_id": false,
                                   "description": false,
@@ -117259,7 +117259,7 @@ exports[`Ansible playbook edit catalog Form Component should render correct form
                                   "config_info.provision.playbook_id": false,
                                   "config_info.provision.repository_id": false,
                                   "config_info.provision.specify_host_type": false,
-                                  "config_info.provision.vault_credentials": false,
+                                  "config_info.provision.vault_credential_id": false,
                                   "config_info.provision.verbosity": false,
                                   "config_info.retirement.become_method": false,
                                   "config_info.retirement.cloud_credential_id": false,
@@ -117273,7 +117273,7 @@ exports[`Ansible playbook edit catalog Form Component should render correct form
                                   "config_info.retirement.remove_resources": false,
                                   "config_info.retirement.repository_id": false,
                                   "config_info.retirement.specify_host_type": false,
-                                  "config_info.retirement.vault_credentials": false,
+                                  "config_info.retirement.vault_credential_id": false,
                                   "config_info.retirement.verbosity": false,
                                   "currency_id": false,
                                   "description": false,
@@ -118346,10 +118346,10 @@ exports[`Ansible playbook edit catalog Form Component should render correct form
                                               "isNotEmpty": true,
                                               "when": "config_info.provision.repository_id",
                                             },
-                                            "id": "config_info.provision.vault_credentials",
+                                            "id": "config_info.provision.vault_credential_id",
                                             "includeEmpty": true,
                                             "label": "Vault Credential",
-                                            "name": "config_info.provision.vault_credentials",
+                                            "name": "config_info.provision.vault_credential_id",
                                             "options": Array [],
                                           },
                                           Object {
@@ -119073,10 +119073,10 @@ exports[`Ansible playbook edit catalog Form Component should render correct form
                                               "isNotEmpty": true,
                                               "when": "config_info.retirement.repository_id",
                                             },
-                                            "id": "config_info.retirement.vault_credentials",
+                                            "id": "config_info.retirement.vault_credential_id",
                                             "includeEmpty": true,
                                             "label": "Vault Credential",
-                                            "name": "config_info.retirement.vault_credentials",
+                                            "name": "config_info.retirement.vault_credential_id",
                                             "options": Array [],
                                           },
                                           Object {
@@ -121988,10 +121988,10 @@ exports[`Ansible playbook edit catalog Form Component should render retirement p
                         "isNotEmpty": true,
                         "when": "config_info.provision.repository_id",
                       },
-                      "id": "config_info.provision.vault_credentials",
+                      "id": "config_info.provision.vault_credential_id",
                       "includeEmpty": true,
                       "label": "Vault Credential",
-                      "name": "config_info.provision.vault_credentials",
+                      "name": "config_info.provision.vault_credential_id",
                       "options": Array [],
                     },
                     Object {
@@ -122715,10 +122715,10 @@ exports[`Ansible playbook edit catalog Form Component should render retirement p
                         "isNotEmpty": true,
                         "when": "config_info.retirement.repository_id",
                       },
-                      "id": "config_info.retirement.vault_credentials",
+                      "id": "config_info.retirement.vault_credential_id",
                       "includeEmpty": true,
                       "label": "Vault Credential",
-                      "name": "config_info.retirement.vault_credentials",
+                      "name": "config_info.retirement.vault_credential_id",
                       "options": Array [],
                     },
                     Object {
@@ -124205,10 +124205,10 @@ exports[`Ansible playbook edit catalog Form Component should render retirement p
                           "isNotEmpty": true,
                           "when": "config_info.provision.repository_id",
                         },
-                        "id": "config_info.provision.vault_credentials",
+                        "id": "config_info.provision.vault_credential_id",
                         "includeEmpty": true,
                         "label": "Vault Credential",
-                        "name": "config_info.provision.vault_credentials",
+                        "name": "config_info.provision.vault_credential_id",
                         "options": Array [],
                       },
                       Object {
@@ -124932,10 +124932,10 @@ exports[`Ansible playbook edit catalog Form Component should render retirement p
                           "isNotEmpty": true,
                           "when": "config_info.retirement.repository_id",
                         },
-                        "id": "config_info.retirement.vault_credentials",
+                        "id": "config_info.retirement.vault_credential_id",
                         "includeEmpty": true,
                         "label": "Vault Credential",
-                        "name": "config_info.retirement.vault_credentials",
+                        "name": "config_info.retirement.vault_credential_id",
                         "options": Array [],
                       },
                       Object {
@@ -126418,10 +126418,10 @@ exports[`Ansible playbook edit catalog Form Component should render retirement p
                             "isNotEmpty": true,
                             "when": "config_info.provision.repository_id",
                           },
-                          "id": "config_info.provision.vault_credentials",
+                          "id": "config_info.provision.vault_credential_id",
                           "includeEmpty": true,
                           "label": "Vault Credential",
-                          "name": "config_info.provision.vault_credentials",
+                          "name": "config_info.provision.vault_credential_id",
                           "options": Array [],
                         },
                         Object {
@@ -127145,10 +127145,10 @@ exports[`Ansible playbook edit catalog Form Component should render retirement p
                             "isNotEmpty": true,
                             "when": "config_info.retirement.repository_id",
                           },
-                          "id": "config_info.retirement.vault_credentials",
+                          "id": "config_info.retirement.vault_credential_id",
                           "includeEmpty": true,
                           "label": "Vault Credential",
-                          "name": "config_info.retirement.vault_credentials",
+                          "name": "config_info.retirement.vault_credential_id",
                           "options": Array [],
                         },
                         Object {
@@ -128627,10 +128627,10 @@ exports[`Ansible playbook edit catalog Form Component should render retirement p
                                 "isNotEmpty": true,
                                 "when": "config_info.provision.repository_id",
                               },
-                              "id": "config_info.provision.vault_credentials",
+                              "id": "config_info.provision.vault_credential_id",
                               "includeEmpty": true,
                               "label": "Vault Credential",
-                              "name": "config_info.provision.vault_credentials",
+                              "name": "config_info.provision.vault_credential_id",
                               "options": Array [],
                             },
                             Object {
@@ -129354,10 +129354,10 @@ exports[`Ansible playbook edit catalog Form Component should render retirement p
                                 "isNotEmpty": true,
                                 "when": "config_info.retirement.repository_id",
                               },
-                              "id": "config_info.retirement.vault_credentials",
+                              "id": "config_info.retirement.vault_credential_id",
                               "includeEmpty": true,
                               "label": "Vault Credential",
-                              "name": "config_info.retirement.vault_credentials",
+                              "name": "config_info.retirement.vault_credential_id",
                               "options": Array [],
                             },
                             Object {
@@ -130663,10 +130663,10 @@ exports[`Ansible playbook edit catalog Form Component should render retirement p
                                 "isNotEmpty": true,
                                 "when": "config_info.provision.repository_id",
                               },
-                              "id": "config_info.provision.vault_credentials",
+                              "id": "config_info.provision.vault_credential_id",
                               "includeEmpty": true,
                               "label": "Vault Credential",
-                              "name": "config_info.provision.vault_credentials",
+                              "name": "config_info.provision.vault_credential_id",
                               "options": Array [],
                             },
                             Object {
@@ -131390,10 +131390,10 @@ exports[`Ansible playbook edit catalog Form Component should render retirement p
                                 "isNotEmpty": true,
                                 "when": "config_info.retirement.repository_id",
                               },
-                              "id": "config_info.retirement.vault_credentials",
+                              "id": "config_info.retirement.vault_credential_id",
                               "includeEmpty": true,
                               "label": "Vault Credential",
-                              "name": "config_info.retirement.vault_credentials",
+                              "name": "config_info.retirement.vault_credential_id",
                               "options": Array [],
                             },
                             Object {
@@ -132710,10 +132710,10 @@ exports[`Ansible playbook edit catalog Form Component should render retirement p
                                   "isNotEmpty": true,
                                   "when": "config_info.provision.repository_id",
                                 },
-                                "id": "config_info.provision.vault_credentials",
+                                "id": "config_info.provision.vault_credential_id",
                                 "includeEmpty": true,
                                 "label": "Vault Credential",
-                                "name": "config_info.provision.vault_credentials",
+                                "name": "config_info.provision.vault_credential_id",
                                 "options": Array [],
                               },
                               Object {
@@ -133437,10 +133437,10 @@ exports[`Ansible playbook edit catalog Form Component should render retirement p
                                   "isNotEmpty": true,
                                   "when": "config_info.retirement.repository_id",
                                 },
-                                "id": "config_info.retirement.vault_credentials",
+                                "id": "config_info.retirement.vault_credential_id",
                                 "includeEmpty": true,
                                 "label": "Vault Credential",
-                                "name": "config_info.retirement.vault_credentials",
+                                "name": "config_info.retirement.vault_credential_id",
                                 "options": Array [],
                               },
                               Object {
@@ -134752,10 +134752,10 @@ exports[`Ansible playbook edit catalog Form Component should render retirement p
                                   "isNotEmpty": true,
                                   "when": "config_info.provision.repository_id",
                                 },
-                                "id": "config_info.provision.vault_credentials",
+                                "id": "config_info.provision.vault_credential_id",
                                 "includeEmpty": true,
                                 "label": "Vault Credential",
-                                "name": "config_info.provision.vault_credentials",
+                                "name": "config_info.provision.vault_credential_id",
                                 "options": Array [],
                               },
                               Object {
@@ -135479,10 +135479,10 @@ exports[`Ansible playbook edit catalog Form Component should render retirement p
                                   "isNotEmpty": true,
                                   "when": "config_info.retirement.repository_id",
                                 },
-                                "id": "config_info.retirement.vault_credentials",
+                                "id": "config_info.retirement.vault_credential_id",
                                 "includeEmpty": true,
                                 "label": "Vault Credential",
-                                "name": "config_info.retirement.vault_credentials",
+                                "name": "config_info.retirement.vault_credential_id",
                                 "options": Array [],
                               },
                               Object {
@@ -136814,10 +136814,10 @@ exports[`Ansible playbook edit catalog Form Component should render retirement p
                                     "isNotEmpty": true,
                                     "when": "config_info.provision.repository_id",
                                   },
-                                  "id": "config_info.provision.vault_credentials",
+                                  "id": "config_info.provision.vault_credential_id",
                                   "includeEmpty": true,
                                   "label": "Vault Credential",
-                                  "name": "config_info.provision.vault_credentials",
+                                  "name": "config_info.provision.vault_credential_id",
                                   "options": Array [],
                                 },
                                 Object {
@@ -137541,10 +137541,10 @@ exports[`Ansible playbook edit catalog Form Component should render retirement p
                                     "isNotEmpty": true,
                                     "when": "config_info.retirement.repository_id",
                                   },
-                                  "id": "config_info.retirement.vault_credentials",
+                                  "id": "config_info.retirement.vault_credential_id",
                                   "includeEmpty": true,
                                   "label": "Vault Credential",
-                                  "name": "config_info.retirement.vault_credentials",
+                                  "name": "config_info.retirement.vault_credential_id",
                                   "options": Array [],
                                 },
                                 Object {
@@ -138856,10 +138856,10 @@ exports[`Ansible playbook edit catalog Form Component should render retirement p
                                     "isNotEmpty": true,
                                     "when": "config_info.provision.repository_id",
                                   },
-                                  "id": "config_info.provision.vault_credentials",
+                                  "id": "config_info.provision.vault_credential_id",
                                   "includeEmpty": true,
                                   "label": "Vault Credential",
-                                  "name": "config_info.provision.vault_credentials",
+                                  "name": "config_info.provision.vault_credential_id",
                                   "options": Array [],
                                 },
                                 Object {
@@ -139583,10 +139583,10 @@ exports[`Ansible playbook edit catalog Form Component should render retirement p
                                     "isNotEmpty": true,
                                     "when": "config_info.retirement.repository_id",
                                   },
-                                  "id": "config_info.retirement.vault_credentials",
+                                  "id": "config_info.retirement.vault_credential_id",
                                   "includeEmpty": true,
                                   "label": "Vault Credential",
-                                  "name": "config_info.retirement.vault_credentials",
+                                  "name": "config_info.retirement.vault_credential_id",
                                   "options": Array [],
                                 },
                                 Object {
@@ -140909,10 +140909,10 @@ exports[`Ansible playbook edit catalog Form Component should render retirement p
                                       "isNotEmpty": true,
                                       "when": "config_info.provision.repository_id",
                                     },
-                                    "id": "config_info.provision.vault_credentials",
+                                    "id": "config_info.provision.vault_credential_id",
                                     "includeEmpty": true,
                                     "label": "Vault Credential",
-                                    "name": "config_info.provision.vault_credentials",
+                                    "name": "config_info.provision.vault_credential_id",
                                     "options": Array [],
                                   },
                                   Object {
@@ -141636,10 +141636,10 @@ exports[`Ansible playbook edit catalog Form Component should render retirement p
                                       "isNotEmpty": true,
                                       "when": "config_info.retirement.repository_id",
                                     },
-                                    "id": "config_info.retirement.vault_credentials",
+                                    "id": "config_info.retirement.vault_credential_id",
                                     "includeEmpty": true,
                                     "label": "Vault Credential",
-                                    "name": "config_info.retirement.vault_credentials",
+                                    "name": "config_info.retirement.vault_credential_id",
                                     "options": Array [],
                                   },
                                   Object {
@@ -142939,10 +142939,10 @@ exports[`Ansible playbook edit catalog Form Component should render retirement p
                                           "isNotEmpty": true,
                                           "when": "config_info.provision.repository_id",
                                         },
-                                        "id": "config_info.provision.vault_credentials",
+                                        "id": "config_info.provision.vault_credential_id",
                                         "includeEmpty": true,
                                         "label": "Vault Credential",
-                                        "name": "config_info.provision.vault_credentials",
+                                        "name": "config_info.provision.vault_credential_id",
                                         "options": Array [],
                                       },
                                       Object {
@@ -143666,10 +143666,10 @@ exports[`Ansible playbook edit catalog Form Component should render retirement p
                                           "isNotEmpty": true,
                                           "when": "config_info.retirement.repository_id",
                                         },
-                                        "id": "config_info.retirement.vault_credentials",
+                                        "id": "config_info.retirement.vault_credential_id",
                                         "includeEmpty": true,
                                         "label": "Vault Credential",
-                                        "name": "config_info.retirement.vault_credentials",
+                                        "name": "config_info.retirement.vault_credential_id",
                                         "options": Array [],
                                       },
                                       Object {
@@ -144972,10 +144972,10 @@ exports[`Ansible playbook edit catalog Form Component should render retirement p
                                             "isNotEmpty": true,
                                             "when": "config_info.provision.repository_id",
                                           },
-                                          "id": "config_info.provision.vault_credentials",
+                                          "id": "config_info.provision.vault_credential_id",
                                           "includeEmpty": true,
                                           "label": "Vault Credential",
-                                          "name": "config_info.provision.vault_credentials",
+                                          "name": "config_info.provision.vault_credential_id",
                                           "options": Array [],
                                         },
                                         Object {
@@ -145699,10 +145699,10 @@ exports[`Ansible playbook edit catalog Form Component should render retirement p
                                             "isNotEmpty": true,
                                             "when": "config_info.retirement.repository_id",
                                           },
-                                          "id": "config_info.retirement.vault_credentials",
+                                          "id": "config_info.retirement.vault_credential_id",
                                           "includeEmpty": true,
                                           "label": "Vault Credential",
-                                          "name": "config_info.retirement.vault_credentials",
+                                          "name": "config_info.retirement.vault_credential_id",
                                           "options": Array [],
                                         },
                                         Object {
@@ -160226,11 +160226,11 @@ exports[`Ansible playbook edit catalog Form Component should render retirement p
                                               "when": "config_info.provision.repository_id",
                                             }
                                           }
-                                          id="config_info.provision.vault_credentials"
+                                          id="config_info.provision.vault_credential_id"
                                           includeEmpty={true}
-                                          key="config_info.provision.vault_credentials"
+                                          key="config_info.provision.vault_credential_id"
                                           label="Vault Credential"
-                                          name="config_info.provision.vault_credentials"
+                                          name="config_info.provision.vault_credential_id"
                                           options={Array []}
                                         >
                                           <FormConditionWrapper
@@ -160243,10 +160243,10 @@ exports[`Ansible playbook edit catalog Form Component should render retirement p
                                             field={
                                               Object {
                                                 "component": "select",
-                                                "id": "config_info.provision.vault_credentials",
+                                                "id": "config_info.provision.vault_credential_id",
                                                 "includeEmpty": true,
                                                 "label": "Vault Credential",
-                                                "name": "config_info.provision.vault_credentials",
+                                                "name": "config_info.provision.vault_credential_id",
                                                 "options": Array [],
                                               }
                                             }
@@ -160261,10 +160261,10 @@ exports[`Ansible playbook edit catalog Form Component should render retirement p
                                               field={
                                                 Object {
                                                   "component": "select",
-                                                  "id": "config_info.provision.vault_credentials",
+                                                  "id": "config_info.provision.vault_credential_id",
                                                   "includeEmpty": true,
                                                   "label": "Vault Credential",
-                                                  "name": "config_info.provision.vault_credentials",
+                                                  "name": "config_info.provision.vault_credential_id",
                                                   "options": Array [],
                                                 }
                                               }
@@ -160292,10 +160292,10 @@ exports[`Ansible playbook edit catalog Form Component should render retirement p
                                                   field={
                                                     Object {
                                                       "component": "select",
-                                                      "id": "config_info.provision.vault_credentials",
+                                                      "id": "config_info.provision.vault_credential_id",
                                                       "includeEmpty": true,
                                                       "label": "Vault Credential",
-                                                      "name": "config_info.provision.vault_credentials",
+                                                      "name": "config_info.provision.vault_credential_id",
                                                       "options": Array [],
                                                     }
                                                   }
@@ -160320,10 +160320,10 @@ exports[`Ansible playbook edit catalog Form Component should render retirement p
                                                     field={
                                                       Object {
                                                         "component": "select",
-                                                        "id": "config_info.provision.vault_credentials",
+                                                        "id": "config_info.provision.vault_credential_id",
                                                         "includeEmpty": true,
                                                         "label": "Vault Credential",
-                                                        "name": "config_info.provision.vault_credentials",
+                                                        "name": "config_info.provision.vault_credential_id",
                                                         "options": Array [],
                                                       }
                                                     }
@@ -160347,10 +160347,10 @@ exports[`Ansible playbook edit catalog Form Component should render retirement p
                                                       field={
                                                         Object {
                                                           "component": "select",
-                                                          "id": "config_info.provision.vault_credentials",
+                                                          "id": "config_info.provision.vault_credential_id",
                                                           "includeEmpty": true,
                                                           "label": "Vault Credential",
-                                                          "name": "config_info.provision.vault_credentials",
+                                                          "name": "config_info.provision.vault_credential_id",
                                                           "options": Array [],
                                                         }
                                                       }
@@ -160369,19 +160369,19 @@ exports[`Ansible playbook edit catalog Form Component should render retirement p
                                                       >
                                                         <SelectWithOnChange
                                                           component="select"
-                                                          id="config_info.provision.vault_credentials"
+                                                          id="config_info.provision.vault_credential_id"
                                                           includeEmpty={true}
                                                           label="Vault Credential"
-                                                          name="config_info.provision.vault_credentials"
+                                                          name="config_info.provision.vault_credential_id"
                                                           options={Array []}
                                                           placeholder="<Choose>"
                                                         >
                                                           <Select
                                                             component="select"
-                                                            id="config_info.provision.vault_credentials"
+                                                            id="config_info.provision.vault_credential_id"
                                                             label="Vault Credential"
                                                             loadingMessage="Loading..."
-                                                            name="config_info.provision.vault_credentials"
+                                                            name="config_info.provision.vault_credential_id"
                                                             options={
                                                               Array [
                                                                 Object {
@@ -160394,12 +160394,12 @@ exports[`Ansible playbook edit catalog Form Component should render retirement p
                                                           >
                                                             <Select
                                                               SelectComponent={[Function]}
-                                                              id="config_info.provision.vault_credentials"
+                                                              id="config_info.provision.vault_credential_id"
                                                               invalidText=""
                                                               labelText="Vault Credential"
                                                               loadOptionsChangeCounter={1}
                                                               loadingMessage="Loading..."
-                                                              name="config_info.provision.vault_credentials"
+                                                              name="config_info.provision.vault_credential_id"
                                                               onBlur={[Function]}
                                                               onChange={[Function]}
                                                               onFocus={[Function]}
@@ -160419,13 +160419,13 @@ exports[`Ansible playbook edit catalog Form Component should render retirement p
                                                                 className=""
                                                                 closeMenuOnSelect={true}
                                                                 hideSelectedOptions={false}
-                                                                id="config_info.provision.vault_credentials"
+                                                                id="config_info.provision.vault_credential_id"
                                                                 invalidText=""
                                                                 isClearable={false}
                                                                 isFetching={false}
                                                                 isSearchable={false}
                                                                 labelText="Vault Credential"
-                                                                name="config_info.provision.vault_credentials"
+                                                                name="config_info.provision.vault_credential_id"
                                                                 noOptionsMessage={[Function]}
                                                                 onBlur={[Function]}
                                                                 onChange={[Function]}
@@ -160446,13 +160446,13 @@ exports[`Ansible playbook edit catalog Form Component should render retirement p
                                                                   className=""
                                                                   disabled={false}
                                                                   helperText=""
-                                                                  id="config_info.provision.vault_credentials"
+                                                                  id="config_info.provision.vault_credential_id"
                                                                   inline={false}
                                                                   invalid={false}
                                                                   invalidText=""
                                                                   labelText="Vault Credential"
                                                                   light={false}
-                                                                  name="config_info.provision.vault_credentials"
+                                                                  name="config_info.provision.vault_credential_id"
                                                                   onBlur={[Function]}
                                                                   onChange={[Function]}
                                                                   onFocus={[Function]}
@@ -160466,7 +160466,7 @@ exports[`Ansible playbook edit catalog Form Component should render retirement p
                                                                     >
                                                                       <label
                                                                         className="bx--label"
-                                                                        htmlFor="config_info.provision.vault_credentials"
+                                                                        htmlFor="config_info.provision.vault_credential_id"
                                                                       >
                                                                         Vault Credential
                                                                       </label>
@@ -160476,8 +160476,8 @@ exports[`Ansible playbook edit catalog Form Component should render retirement p
                                                                       >
                                                                         <select
                                                                           className="bx--select-input"
-                                                                          id="config_info.provision.vault_credentials"
-                                                                          name="config_info.provision.vault_credentials"
+                                                                          id="config_info.provision.vault_credential_id"
+                                                                          name="config_info.provision.vault_credential_id"
                                                                           onBlur={[Function]}
                                                                           onChange={[Function]}
                                                                           onFocus={[Function]}
@@ -172337,11 +172337,11 @@ exports[`Ansible playbook edit catalog Form Component should render retirement p
                                               "when": "config_info.retirement.repository_id",
                                             }
                                           }
-                                          id="config_info.retirement.vault_credentials"
+                                          id="config_info.retirement.vault_credential_id"
                                           includeEmpty={true}
-                                          key="config_info.retirement.vault_credentials"
+                                          key="config_info.retirement.vault_credential_id"
                                           label="Vault Credential"
-                                          name="config_info.retirement.vault_credentials"
+                                          name="config_info.retirement.vault_credential_id"
                                           options={Array []}
                                         >
                                           <FormConditionWrapper
@@ -172354,10 +172354,10 @@ exports[`Ansible playbook edit catalog Form Component should render retirement p
                                             field={
                                               Object {
                                                 "component": "select",
-                                                "id": "config_info.retirement.vault_credentials",
+                                                "id": "config_info.retirement.vault_credential_id",
                                                 "includeEmpty": true,
                                                 "label": "Vault Credential",
-                                                "name": "config_info.retirement.vault_credentials",
+                                                "name": "config_info.retirement.vault_credential_id",
                                                 "options": Array [],
                                               }
                                             }
@@ -172372,10 +172372,10 @@ exports[`Ansible playbook edit catalog Form Component should render retirement p
                                               field={
                                                 Object {
                                                   "component": "select",
-                                                  "id": "config_info.retirement.vault_credentials",
+                                                  "id": "config_info.retirement.vault_credential_id",
                                                   "includeEmpty": true,
                                                   "label": "Vault Credential",
-                                                  "name": "config_info.retirement.vault_credentials",
+                                                  "name": "config_info.retirement.vault_credential_id",
                                                   "options": Array [],
                                                 }
                                               }
@@ -172403,10 +172403,10 @@ exports[`Ansible playbook edit catalog Form Component should render retirement p
                                                   field={
                                                     Object {
                                                       "component": "select",
-                                                      "id": "config_info.retirement.vault_credentials",
+                                                      "id": "config_info.retirement.vault_credential_id",
                                                       "includeEmpty": true,
                                                       "label": "Vault Credential",
-                                                      "name": "config_info.retirement.vault_credentials",
+                                                      "name": "config_info.retirement.vault_credential_id",
                                                       "options": Array [],
                                                     }
                                                   }
@@ -172431,10 +172431,10 @@ exports[`Ansible playbook edit catalog Form Component should render retirement p
                                                     field={
                                                       Object {
                                                         "component": "select",
-                                                        "id": "config_info.retirement.vault_credentials",
+                                                        "id": "config_info.retirement.vault_credential_id",
                                                         "includeEmpty": true,
                                                         "label": "Vault Credential",
-                                                        "name": "config_info.retirement.vault_credentials",
+                                                        "name": "config_info.retirement.vault_credential_id",
                                                         "options": Array [],
                                                       }
                                                     }
@@ -172458,10 +172458,10 @@ exports[`Ansible playbook edit catalog Form Component should render retirement p
                                                       field={
                                                         Object {
                                                           "component": "select",
-                                                          "id": "config_info.retirement.vault_credentials",
+                                                          "id": "config_info.retirement.vault_credential_id",
                                                           "includeEmpty": true,
                                                           "label": "Vault Credential",
-                                                          "name": "config_info.retirement.vault_credentials",
+                                                          "name": "config_info.retirement.vault_credential_id",
                                                           "options": Array [],
                                                         }
                                                       }
@@ -172480,19 +172480,19 @@ exports[`Ansible playbook edit catalog Form Component should render retirement p
                                                       >
                                                         <SelectWithOnChange
                                                           component="select"
-                                                          id="config_info.retirement.vault_credentials"
+                                                          id="config_info.retirement.vault_credential_id"
                                                           includeEmpty={true}
                                                           label="Vault Credential"
-                                                          name="config_info.retirement.vault_credentials"
+                                                          name="config_info.retirement.vault_credential_id"
                                                           options={Array []}
                                                           placeholder="<Choose>"
                                                         >
                                                           <Select
                                                             component="select"
-                                                            id="config_info.retirement.vault_credentials"
+                                                            id="config_info.retirement.vault_credential_id"
                                                             label="Vault Credential"
                                                             loadingMessage="Loading..."
-                                                            name="config_info.retirement.vault_credentials"
+                                                            name="config_info.retirement.vault_credential_id"
                                                             options={
                                                               Array [
                                                                 Object {
@@ -172505,12 +172505,12 @@ exports[`Ansible playbook edit catalog Form Component should render retirement p
                                                           >
                                                             <Select
                                                               SelectComponent={[Function]}
-                                                              id="config_info.retirement.vault_credentials"
+                                                              id="config_info.retirement.vault_credential_id"
                                                               invalidText=""
                                                               labelText="Vault Credential"
                                                               loadOptionsChangeCounter={1}
                                                               loadingMessage="Loading..."
-                                                              name="config_info.retirement.vault_credentials"
+                                                              name="config_info.retirement.vault_credential_id"
                                                               onBlur={[Function]}
                                                               onChange={[Function]}
                                                               onFocus={[Function]}
@@ -172530,13 +172530,13 @@ exports[`Ansible playbook edit catalog Form Component should render retirement p
                                                                 className=""
                                                                 closeMenuOnSelect={true}
                                                                 hideSelectedOptions={false}
-                                                                id="config_info.retirement.vault_credentials"
+                                                                id="config_info.retirement.vault_credential_id"
                                                                 invalidText=""
                                                                 isClearable={false}
                                                                 isFetching={false}
                                                                 isSearchable={false}
                                                                 labelText="Vault Credential"
-                                                                name="config_info.retirement.vault_credentials"
+                                                                name="config_info.retirement.vault_credential_id"
                                                                 noOptionsMessage={[Function]}
                                                                 onBlur={[Function]}
                                                                 onChange={[Function]}
@@ -172557,13 +172557,13 @@ exports[`Ansible playbook edit catalog Form Component should render retirement p
                                                                   className=""
                                                                   disabled={false}
                                                                   helperText=""
-                                                                  id="config_info.retirement.vault_credentials"
+                                                                  id="config_info.retirement.vault_credential_id"
                                                                   inline={false}
                                                                   invalid={false}
                                                                   invalidText=""
                                                                   labelText="Vault Credential"
                                                                   light={false}
-                                                                  name="config_info.retirement.vault_credentials"
+                                                                  name="config_info.retirement.vault_credential_id"
                                                                   onBlur={[Function]}
                                                                   onChange={[Function]}
                                                                   onFocus={[Function]}
@@ -172577,7 +172577,7 @@ exports[`Ansible playbook edit catalog Form Component should render retirement p
                                                                     >
                                                                       <label
                                                                         className="bx--label"
-                                                                        htmlFor="config_info.retirement.vault_credentials"
+                                                                        htmlFor="config_info.retirement.vault_credential_id"
                                                                       >
                                                                         Vault Credential
                                                                       </label>
@@ -172587,8 +172587,8 @@ exports[`Ansible playbook edit catalog Form Component should render retirement p
                                                                       >
                                                                         <select
                                                                           className="bx--select-input"
-                                                                          id="config_info.retirement.vault_credentials"
-                                                                          name="config_info.retirement.vault_credentials"
+                                                                          id="config_info.retirement.vault_credential_id"
+                                                                          name="config_info.retirement.vault_credential_id"
                                                                           onBlur={[Function]}
                                                                           onChange={[Function]}
                                                                           onFocus={[Function]}
@@ -176853,10 +176853,10 @@ exports[`Ansible playbook edit catalog Form Component should render retirement p
                                               "isNotEmpty": true,
                                               "when": "config_info.provision.repository_id",
                                             },
-                                            "id": "config_info.provision.vault_credentials",
+                                            "id": "config_info.provision.vault_credential_id",
                                             "includeEmpty": true,
                                             "label": "Vault Credential",
-                                            "name": "config_info.provision.vault_credentials",
+                                            "name": "config_info.provision.vault_credential_id",
                                             "options": Array [],
                                           },
                                           Object {
@@ -177580,10 +177580,10 @@ exports[`Ansible playbook edit catalog Form Component should render retirement p
                                               "isNotEmpty": true,
                                               "when": "config_info.retirement.repository_id",
                                             },
-                                            "id": "config_info.retirement.vault_credentials",
+                                            "id": "config_info.retirement.vault_credential_id",
                                             "includeEmpty": true,
                                             "label": "Vault Credential",
-                                            "name": "config_info.retirement.vault_credentials",
+                                            "name": "config_info.retirement.vault_credential_id",
                                             "options": Array [],
                                           },
                                           Object {
@@ -178060,7 +178060,7 @@ exports[`Ansible playbook edit catalog Form Component should render retirement p
                                   "config_info.provision.playbook_id": false,
                                   "config_info.provision.repository_id": false,
                                   "config_info.provision.specify_host_type": false,
-                                  "config_info.provision.vault_credentials": false,
+                                  "config_info.provision.vault_credential_id": false,
                                   "config_info.provision.verbosity": false,
                                   "config_info.retirement.become_method": false,
                                   "config_info.retirement.cloud_type": false,
@@ -178073,7 +178073,7 @@ exports[`Ansible playbook edit catalog Form Component should render retirement p
                                   "config_info.retirement.remove_resources": false,
                                   "config_info.retirement.repository_id": true,
                                   "config_info.retirement.specify_host_type": false,
-                                  "config_info.retirement.vault_credentials": false,
+                                  "config_info.retirement.vault_credential_id": false,
                                   "config_info.retirement.verbosity": false,
                                   "currency_id": false,
                                   "description": false,
@@ -178105,7 +178105,7 @@ exports[`Ansible playbook edit catalog Form Component should render retirement p
                                   "config_info.provision.playbook_id": false,
                                   "config_info.provision.repository_id": false,
                                   "config_info.provision.specify_host_type": false,
-                                  "config_info.provision.vault_credentials": false,
+                                  "config_info.provision.vault_credential_id": false,
                                   "config_info.provision.verbosity": false,
                                   "config_info.retirement.become_method": false,
                                   "config_info.retirement.cloud_type": false,
@@ -178118,7 +178118,7 @@ exports[`Ansible playbook edit catalog Form Component should render retirement p
                                   "config_info.retirement.remove_resources": false,
                                   "config_info.retirement.repository_id": false,
                                   "config_info.retirement.specify_host_type": false,
-                                  "config_info.retirement.vault_credentials": false,
+                                  "config_info.retirement.vault_credential_id": false,
                                   "config_info.retirement.verbosity": false,
                                   "currency_id": false,
                                   "description": false,
@@ -178276,7 +178276,7 @@ exports[`Ansible playbook edit catalog Form Component should render retirement p
                                   "config_info.provision.playbook_id": false,
                                   "config_info.provision.repository_id": false,
                                   "config_info.provision.specify_host_type": false,
-                                  "config_info.provision.vault_credentials": false,
+                                  "config_info.provision.vault_credential_id": false,
                                   "config_info.provision.verbosity": false,
                                   "config_info.retirement.become_method": false,
                                   "config_info.retirement.cloud_type": false,
@@ -178289,7 +178289,7 @@ exports[`Ansible playbook edit catalog Form Component should render retirement p
                                   "config_info.retirement.remove_resources": false,
                                   "config_info.retirement.repository_id": false,
                                   "config_info.retirement.specify_host_type": false,
-                                  "config_info.retirement.vault_credentials": false,
+                                  "config_info.retirement.vault_credential_id": false,
                                   "config_info.retirement.verbosity": false,
                                   "currency_id": false,
                                   "description": false,
@@ -179362,10 +179362,10 @@ exports[`Ansible playbook edit catalog Form Component should render retirement p
                                               "isNotEmpty": true,
                                               "when": "config_info.provision.repository_id",
                                             },
-                                            "id": "config_info.provision.vault_credentials",
+                                            "id": "config_info.provision.vault_credential_id",
                                             "includeEmpty": true,
                                             "label": "Vault Credential",
-                                            "name": "config_info.provision.vault_credentials",
+                                            "name": "config_info.provision.vault_credential_id",
                                             "options": Array [],
                                           },
                                           Object {
@@ -180089,10 +180089,10 @@ exports[`Ansible playbook edit catalog Form Component should render retirement p
                                               "isNotEmpty": true,
                                               "when": "config_info.retirement.repository_id",
                                             },
-                                            "id": "config_info.retirement.vault_credentials",
+                                            "id": "config_info.retirement.vault_credential_id",
                                             "includeEmpty": true,
                                             "label": "Vault Credential",
-                                            "name": "config_info.retirement.vault_credentials",
+                                            "name": "config_info.retirement.vault_credential_id",
                                             "options": Array [],
                                           },
                                           Object {