Merge branch 'add-aws-azure-attrs' into feat-typed-host

addons/core/translations/form/en-us.yaml

@@ -120,11 +120,23 @@ 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
+  label: Region
+provider_client_id: 
+  label: Client ID
+  link-text : Learn more
+  help: The client ID for the client you want Boundary to use.

ui/admin/app/components/form/host-catalog/aws/index.hbs

@@ -132,13 +132,34 @@
   {{/if}}
 
   <form.input
-    @name='Region'
+    @name='region'
     @type='region'
     @value={{@model.region}}
     @label={{t 'form.region.label'}}
     readonly={{false}}
   />
 
+  <form.input
+    @name='access_key_id'
+    @type='access_key_id'
+    @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}}
+  />
+
+  <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}}
+  />
   {{#if (can 'save model' @model)}}
     <form.actions
       @disabled={{if @model.cannotSave @model.cannotSave}}

ui/admin/app/components/form/host-catalog/azure/index.hbs

@@ -141,6 +141,31 @@
     @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}}
+  />
+
+  <form.input
+    @name='subscription_id'
+    @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}}
+  />
+
+  <form.input
+    @name='client_id'
+    @type='client_id'
+    @value={{@model.client_id}}
+    @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}}
   />