diff --git a/addons/core/translations/form/en-us.yaml b/addons/core/translations/form/en-us.yaml
index 489145681..a13b995f2 100644
--- a/addons/core/translations/form/en-us.yaml
+++ b/addons/core/translations/form/en-us.yaml
@@ -136,11 +136,18 @@ secret_access_key:
link-text: Learn more
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.
-provider_filter:
- label: Filter
- help: Create a filter to select resources using values such as tag name or tag value. Filter format is specific to each provider.
- link-text: Learn more about using filters for Azure resources.
\ No newline at end of file
+provider:
+ label: Provider Details
+ description: This is the provider for this host catalog. The format of the host set filters are specific to each provider.
+ help:
+ client:
+ label: Client ID
+ help: The client ID for the client you want Boundary to use.
+ link-text : Learn more
+ choose_a_provider:
+ label: Choose a provider
+ description: There are several built-in plugins for the most common providers. You can choose from on of the included plugins or use a custom plugin.
+ filter:
+ label: Filter
+ help: Create a filter to select resources using values such as tag name or tag value. Filter format is specific to each provider.
+ link-text: Learn more about using filters for Azure resources.
\ 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 0470f3515..36ebed43a 100644
--- a/ui/admin/app/components/form/host-catalog/aws/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/aws/index.hbs
@@ -74,15 +74,13 @@
- <:title>{{t 'resources.host-catalog.form.provider.label'}}
+ <:title>{{t 'form.provider.label'}}
- <:title>{{t
- 'resources.host-catalog.form.provider.choose_a_provider.label'
- }}
+ <:title>{{t 'form.provider.choose_a_provider.label'}}
<:description>{{t
- 'resources.host-catalog.form.provider.choose_a_provider.description'
+ 'form.provider.choose_a_provider.description'
}}
<:body>
@@ -109,10 +107,8 @@
{{else}}
- <:title>{{t 'resources.host-catalog.form.provider.label'}}
- <:description>{{t
- 'resources.host-catalog.form.provider.description'
- }}
+ <:title>{{t 'form.provider.label'}}
+ <:description>{{t 'form.provider.description'}}
<:body>
{{#if @model.isNew}}
- {{!-- {{t
- 'resources.host-catalog.form.provider.label'
- }} --}}
-
<:title>{{t 'form.type.label'}}
<:body>
@@ -78,14 +74,12 @@
- <:title>{{t 'resources.host-catalog.form.provider.label'}}
+ <:title>{{t 'form.provider.label'}}
- <:title>{{t
- 'resources.host-catalog.form.provider.choose_a_provider.label'
- }}
+ <:title>{{t 'form.provider.choose_a_provider.label'}}
<:description>{{t
- 'resources.host-catalog.form.provider.choose_a_provider.description'
+ 'form.provider.choose_a_provider.description'
}}
<:body>
@@ -113,10 +107,8 @@
{{else}}
- <:title>{{t 'resources.host-catalog.form.provider.label'}}
- <:description>{{t
- 'resources.host-catalog.form.provider.description'
- }}
+ <:title>{{t 'form.provider.label'}}
+ <:description>{{t 'form.provider.description'}}
<:body>
diff --git a/ui/admin/app/components/form/host-catalog/static/index.hbs b/ui/admin/app/components/form/host-catalog/static/index.hbs
index bc0ac2421..f0d4c01d5 100644
--- a/ui/admin/app/components/form/host-catalog/static/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/static/index.hbs
@@ -75,15 +75,13 @@
{{#if @model.isPlugin}}
- <:title>{{t 'resources.host-catalog.form.provider.label'}}
+ <:title>{{t 'form.provider.label'}}
- <:title>{{t
- 'resources.host-catalog.form.provider.choose_a_provider.label'
- }}
+ <:title>{{t 'form.provider.choose_a_provider.label'}}
<:description>{{t
- 'resources.host-catalog.form.provider.choose_a_provider.description'
+ 'form.provider.choose_a_provider.description'
}}
<:body>
diff --git a/ui/admin/app/components/form/host-set/aws/index.hbs b/ui/admin/app/components/form/host-set/aws/index.hbs
index d5cb69c13..f800e9d53 100644
--- a/ui/admin/app/components/form/host-set/aws/index.hbs
+++ b/ui/admin/app/components/form/host-set/aws/index.hbs
@@ -78,8 +78,8 @@
{{! placeholder for filter, update me when the model is ready }}
- <:title>{{t 'form.provider_filter.label'}}
- <:description>{{t 'form.provider_filter.help'}}
+ <:title>{{t 'form.provider.filter.label'}}
+ <:description>{{t 'form.provider.filter.help'}}
{{#if (can 'save model' @model)}}
diff --git a/ui/admin/app/components/form/host-set/azure/index.hbs b/ui/admin/app/components/form/host-set/azure/index.hbs
index 9679cc6c4..340860893 100644
--- a/ui/admin/app/components/form/host-set/azure/index.hbs
+++ b/ui/admin/app/components/form/host-set/azure/index.hbs
@@ -80,9 +80,9 @@