From d0f8da1f816d6379f35b52a680da4101ab1429ed Mon Sep 17 00:00:00 2001
From: dharini <dharini@hashicorp.com>
Date: Mon, 7 Feb 2022 21:27:38 -0800
Subject: [PATCH 1/3] add rest of the AWS and azure fields

---
 addons/core/translations/form/en-us.yaml      |  8 +++++++
 .../form/host-catalog/aws/index.hbs           | 20 +++++++++++++++++
 .../form/host-catalog/azure/index.hbs         | 22 +++++++++++++++++++
 3 files changed, 50 insertions(+)

diff --git a/addons/core/translations/form/en-us.yaml b/addons/core/translations/form/en-us.yaml
index 87beceb23..1f56d9d22 100644
--- a/addons/core/translations/form/en-us.yaml
+++ b/addons/core/translations/form/en-us.yaml
@@ -120,11 +120,19 @@ filter:
   help: A boolean expression defining a filter run against the provided information.
 tenant_id: 
   label: Tenant ID
+  help: The tenant (directory) ID for your Azure Active Directory application.
+  link-text: Learn more
 subscription_id:
   label: Subscription ID
+  help: The subscription ID for the subscription with read access.
+  link-text: Learn more
 access_key_id:
   label: Access Key ID
+  help: The access key ID found on the Security Credentials page in AWS.
+  link-text: Learn more
 secret_access_key:
   label: Secret Access Key
+  help: The subscription ID for the subscription with read access.
+  link-text: Learn more
 region: 
   label: Region
\ No newline at end of file
diff --git a/ui/admin/app/components/form/host-catalog/aws/index.hbs b/ui/admin/app/components/form/host-catalog/aws/index.hbs
index 77dfc8a52..cb453a2f4 100644
--- a/ui/admin/app/components/form/host-catalog/aws/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/aws/index.hbs
@@ -131,6 +131,26 @@
     readonly={{false}}
   />
 
+    <form.input
+    @name='access_key_id'
+    @type='access_key_id'
+    @helperText={{t 'form.access_key_id.help'}}
+    @linkText={{t 'form.access_key_id.link-text'}}
+    @value={{@model.access_key_id}}
+    @label={{t 'form.access_key_id.label'}}
+    @link='https://learn.hashicorp.com/tutorials/boundary/cloud-host-catalogs#set-up-cloud-hosts'
+    readonly={{false}}
+  />
+
+    <form.input
+    @name='secret_access_key'
+    @type='secret_access_key'
+    @value={{@model.secret_access_key}}
+    @label={{t 'form.secret_access_key.label'}}
+    @linkText={{t 'form.secret_access_key.link-text'}}
+    @link='https://learn.hashicorp.com/tutorials/boundary/cloud-host-catalogs#set-up-cloud-hosts'
+    readonly={{false}}
+  />
   {{#if (can 'save model' @model)}}
     <form.actions
       @disabled={{if @model.cannotSave @model.cannotSave}}
diff --git a/ui/admin/app/components/form/host-catalog/azure/index.hbs b/ui/admin/app/components/form/host-catalog/azure/index.hbs
index 286d87f93..ec4fa9e28 100644
--- a/ui/admin/app/components/form/host-catalog/azure/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/azure/index.hbs
@@ -126,6 +126,28 @@
     @type='tenant_id'
     @value={{@model.tenant_id}}
     @label={{t 'form.tenant_id.label'}}
+    @linkText={{t 'form.tenant_id.link-text'}}
+    @link='https://learn.hashicorp.com/tutorials/boundary/cloud-host-catalogs#set-up-cloud-hosts'
+    readonly={{false}}
+  />
+
+  <form.input
+    @name='subscription_id'
+    @type='subscription_id'
+    @value={{@model.subscription_id}}
+    @label={{t 'form.subscription_id.label'}}
+    @linkText={{t 'form.subscription_id.link-text'}}
+    @link='https://learn.hashicorp.com/tutorials/boundary/cloud-host-catalogs#set-up-cloud-hosts'
+    readonly={{false}}
+  />
+
+  <form.input
+    @name='client_id'
+    @type='client_id'
+    @value={{@model.client_id}}
+    @label={{t 'form.client_id.label'}}
+    {{!-- @linkText={{t 'form.subscription_id.link-text'}} --}}
+    @link='https://learn.hashicorp.com/tutorials/boundary/cloud-host-catalogs#set-up-cloud-hosts'
     readonly={{false}}
   />
 

From 2bcfb55db9df612798c869592f6fa79d7d8d8766 Mon Sep 17 00:00:00 2001
From: dharini <dharini@hashicorp.com>
Date: Mon, 7 Feb 2022 23:10:36 -0800
Subject: [PATCH 2/3] =?UTF-8?q?chore:=20=F0=9F=A4=96=20translations?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 addons/core/translations/form/en-us.yaml                  | 6 +++++-
 ui/admin/app/components/form/host-catalog/aws/index.hbs   | 5 +++--
 ui/admin/app/components/form/host-catalog/azure/index.hbs | 7 +++++--
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/addons/core/translations/form/en-us.yaml b/addons/core/translations/form/en-us.yaml
index 1f56d9d22..227029c9b 100644
--- a/addons/core/translations/form/en-us.yaml
+++ b/addons/core/translations/form/en-us.yaml
@@ -135,4 +135,8 @@ secret_access_key:
   help: The subscription ID for the subscription with read access.
   link-text: Learn more
 region: 
-  label: Region
\ No newline at end of file
+  label: Region
+provider_client_id: 
+  label: Client ID
+  link-text : Learn more
+  help: The client ID for the client you want Boundary to use.
\ No newline at end of file
diff --git a/ui/admin/app/components/form/host-catalog/aws/index.hbs b/ui/admin/app/components/form/host-catalog/aws/index.hbs
index 5523c7d8c..d0ab94807 100644
--- a/ui/admin/app/components/form/host-catalog/aws/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/aws/index.hbs
@@ -139,7 +139,7 @@
     readonly={{false}}
   />
 
-    <form.input
+  <form.input
     @name='access_key_id'
     @type='access_key_id'
     @helperText={{t 'form.access_key_id.help'}}
@@ -150,11 +150,12 @@
     readonly={{false}}
   />
 
-    <form.input
+  <form.input
     @name='secret_access_key'
     @type='secret_access_key'
     @value={{@model.secret_access_key}}
     @label={{t 'form.secret_access_key.label'}}
+    @helperText={{t 'form.secret_access_key.help'}}
     @linkText={{t 'form.secret_access_key.link-text'}}
     @link='https://learn.hashicorp.com/tutorials/boundary/cloud-host-catalogs#set-up-cloud-hosts'
     readonly={{false}}
diff --git a/ui/admin/app/components/form/host-catalog/azure/index.hbs b/ui/admin/app/components/form/host-catalog/azure/index.hbs
index 9f73fd824..38fc496fb 100644
--- a/ui/admin/app/components/form/host-catalog/azure/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/azure/index.hbs
@@ -141,6 +141,7 @@
     @type='tenant_id'
     @value={{@model.tenant_id}}
     @label={{t 'form.tenant_id.label'}}
+    @helperText={{t 'form.tenant_id.help'}}
     @linkText={{t 'form.tenant_id.link-text'}}
     @link='https://learn.hashicorp.com/tutorials/boundary/cloud-host-catalogs#set-up-cloud-hosts'
     readonly={{false}}
@@ -151,6 +152,7 @@
     @type='subscription_id'
     @value={{@model.subscription_id}}
     @label={{t 'form.subscription_id.label'}}
+    @helperText={{t 'form.subscription_id.help'}}
     @linkText={{t 'form.subscription_id.link-text'}}
     @link='https://learn.hashicorp.com/tutorials/boundary/cloud-host-catalogs#set-up-cloud-hosts'
     readonly={{false}}
@@ -160,8 +162,9 @@
     @name='client_id'
     @type='client_id'
     @value={{@model.client_id}}
-    @label={{t 'form.client_id.label'}}
-    {{!-- @linkText={{t 'form.subscription_id.link-text'}} --}}
+    @label={{t 'form.provider_client_id.label'}}
+    @helperText={{t 'form.provider_client_id.help'}}
+    @linkText={{t 'form.provider_client_id.link-text'}}
     @link='https://learn.hashicorp.com/tutorials/boundary/cloud-host-catalogs#set-up-cloud-hosts'
     readonly={{false}}
   />

From 1b70f9acfb6de933fcf6b7a98159ead8ccff833f Mon Sep 17 00:00:00 2001
From: dharini <dharini@hashicorp.com>
Date: Mon, 7 Feb 2022 23:37:40 -0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=F0=9F=90=9B=20field=20names?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/admin/app/components/form/host-catalog/aws/index.hbs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ui/admin/app/components/form/host-catalog/aws/index.hbs b/ui/admin/app/components/form/host-catalog/aws/index.hbs
index d0ab94807..0470f3515 100644
--- a/ui/admin/app/components/form/host-catalog/aws/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/aws/index.hbs
@@ -132,7 +132,7 @@
   {{/if}}
 
   <form.input
-    @name='Region'
+    @name='region'
     @type='region'
     @value={{@model.region}}
     @label={{t 'form.region.label'}}
@@ -142,10 +142,10 @@
   <form.input
     @name='access_key_id'
     @type='access_key_id'
-    @helperText={{t 'form.access_key_id.help'}}
-    @linkText={{t 'form.access_key_id.link-text'}}
     @value={{@model.access_key_id}}
     @label={{t 'form.access_key_id.label'}}
+    @helperText={{t 'form.access_key_id.help'}}
+    @linkText={{t 'form.access_key_id.link-text'}}
     @link='https://learn.hashicorp.com/tutorials/boundary/cloud-host-catalogs#set-up-cloud-hosts'
     readonly={{false}}
   />