From 52dafcb672c609b4d0ad72c7e4a3c287320b6f8e Mon Sep 17 00:00:00 2001 From: dharini Date: Mon, 14 Feb 2022 19:21:39 -0800 Subject: [PATCH 1/9] =?UTF-8?q?fix:=20=F0=9F=90=9B=20add=20client=20secret?= =?UTF-8?q?=20value=20field?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addons/core/translations/form/en-us.yaml | 6 +++++- .../app/components/form/host-catalog/azure/index.hbs | 10 ++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/addons/core/translations/form/en-us.yaml b/addons/core/translations/form/en-us.yaml index a13b995f2..322544be7 100644 --- a/addons/core/translations/form/en-us.yaml +++ b/addons/core/translations/form/en-us.yaml @@ -144,10 +144,14 @@ provider: label: Client ID help: The client ID for the client you want Boundary to use. link-text : Learn more + secret: + label: Client secret value + help: The client secret value 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 + link-text: Learn more about using filters for Azure resources. 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 dc94e510d..9d8109f86 100644 --- a/ui/admin/app/components/form/host-catalog/azure/index.hbs +++ b/ui/admin/app/components/form/host-catalog/azure/index.hbs @@ -161,6 +161,16 @@ readonly={{false}} /> + + {{#if (can 'save model' @model)}} Date: Tue, 15 Feb 2022 12:23:17 -0800 Subject: [PATCH 2/9] =?UTF-8?q?chore:=20=F0=9F=A4=96=20refactor=20translat?= =?UTF-8?q?ions?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addons/core/translations/en-us.yaml | 9 ++++++ addons/core/translations/form/en-us.yaml | 26 ++------------- .../form/host-catalog/aws/index.hbs | 18 ++++------- .../form/host-catalog/azure/index.hbs | 32 ++++++++----------- .../form/host-catalog/static/index.hbs | 8 ++--- .../components/form/host-set/aws/index.hbs | 8 ++--- .../components/form/host-set/azure/index.hbs | 10 +++--- .../app/components/form/host/aws/index.hbs | 2 +- .../app/components/form/host/azure/index.hbs | 2 +- 9 files changed, 46 insertions(+), 69 deletions(-) diff --git a/addons/core/translations/en-us.yaml b/addons/core/translations/en-us.yaml index 73a720d62..1da3accf0 100644 --- a/addons/core/translations/en-us.yaml +++ b/addons/core/translations/en-us.yaml @@ -30,12 +30,21 @@ titles: label: Label value: Value no-results: No Results + learn-more: Learn more + choose-a-provider: Choose a provider + provider: Provider + filter: Filter + secret: Client secret value descriptions: empty-set: There are no items to display yet. You may be able to add items or try back later. origin-initialization: To get started, please enter your origin URL create-but-not-list: You do not have permission to list {resource}, but you can create new instances. neither-list-nor-create: You do not have permission to list or create {resource}. no-results: We found no matching records. + choose-a-provider: 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. + provider: This is the provider for this host catalog. The format of the host set filters are specific to each provider. + filter: Create a filter to select resources using values such as tag name or tag value. Filter format is specific to each provider + secret: The client secret value for the client you want Boundary to use questions: delete-confirm: Are you sure you want to delete this resource? remove-confirm: Are you sure you want to remove this association? diff --git a/addons/core/translations/form/en-us.yaml b/addons/core/translations/form/en-us.yaml index 322544be7..8aef87403 100644 --- a/addons/core/translations/form/en-us.yaml +++ b/addons/core/translations/form/en-us.yaml @@ -121,37 +121,17 @@ filter: 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 -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 - secret: - label: Client secret value - help: The client secret value 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. +azure_client_id: + label: Client ID + help: The client ID for the client you want Boundary to use. 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 36ebed43a..7a15bee5a 100644 --- a/ui/admin/app/components/form/host-catalog/aws/index.hbs +++ b/ui/admin/app/components/form/host-catalog/aws/index.hbs @@ -74,14 +74,12 @@ - <:title>{{t 'form.provider.label'}} + <:title>{{t 'titles.provider'}} - <:title>{{t 'form.provider.choose_a_provider.label'}} - <:description>{{t - 'form.provider.choose_a_provider.description' - }} + <:title>{{t 'titles.choose-a-provider'}} + <:description>{{t 'descriptions.choose-a-provider'}} <:body> {{else}} - <:title>{{t 'form.provider.label'}} - <:description>{{t 'form.provider.description'}} + <:title>{{t 'titles.provider'}} + <:description>{{t 'descriptions.provider'}} <:body> @@ -152,8 +149,7 @@ @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' + @linkText={{t 'titles.learn-more'}} readonly={{false}} /> {{#if (can 'save model' @model)}} 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 9d8109f86..007a83426 100644 --- a/ui/admin/app/components/form/host-catalog/azure/index.hbs +++ b/ui/admin/app/components/form/host-catalog/azure/index.hbs @@ -74,13 +74,11 @@ - <:title>{{t 'form.provider.label'}} + <:title>{{t 'titles.provider'}} - <:title>{{t 'form.provider.choose_a_provider.label'}} - <:description>{{t - 'form.provider.choose_a_provider.description' - }} + <:title>{{t 'titles.choose-a-provider'}} + <:description>{{t 'descriptions.choose-a-provider'}} <:body> - <:title>{{t 'form.provider.label'}} - <:description>{{t 'form.provider.description'}} + <:title>{{t 'titles.provider'}} + <:description>{{t 'descriptions.provider'}} <:body> @@ -145,8 +142,7 @@ @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' + @linkText={{t 'titles.learn-more'}} readonly={{false}} /> @@ -154,20 +150,18 @@ @name='client_id' @type='client_id' @value={{@model.client_id}} - @label={{t 'form.provider.client.label'}} - @helperText={{t 'form.provider.client.help'}} - @linkText={{t 'form.provider.client.link-text'}} - @link='https://learn.hashicorp.com/tutorials/boundary/cloud-host-catalogs#set-up-cloud-hosts' + @label={{t 'form.azure_client_id.label'}} + @helperText={{t 'form.azure_client_id.help'}} + @linkText={{t 'titles.learn-more'}} readonly={{false}} /> 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 f0d4c01d5..c16344732 100644 --- a/ui/admin/app/components/form/host-catalog/static/index.hbs +++ b/ui/admin/app/components/form/host-catalog/static/index.hbs @@ -75,14 +75,12 @@ {{#if @model.isPlugin}} - <:title>{{t 'form.provider.label'}} + <:title>{{t 'titles.provider'}} - <:title>{{t 'form.provider.choose_a_provider.label'}} - <:description>{{t - 'form.provider.choose_a_provider.description' - }} + <:title>{{t 'titles.choose-a-provider'}} + <:description>{{t 'descriptions.choose-a-provider'}} <:body> - <:title>{{t 'form.provider.label'}} - <:description>{{t 'form.provider.description'}} + <:title>{{t 'titles.provider'}} + <:description>{{t 'descriptions.provider'}} <:body> - <:title>{{t 'form.provider.filter.label'}} - <:description>{{t 'form.provider.filter.help'}} + <:title>{{t 'titles.filter'}} + <:description>{{t 'descriptions.filter'}} <:body> {{#if @model.errors.filters}} 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 6dff36ff0..048b7b042 100644 --- a/ui/admin/app/components/form/host-set/azure/index.hbs +++ b/ui/admin/app/components/form/host-set/azure/index.hbs @@ -54,8 +54,8 @@ /> - <:title>{{t 'form.provider.label'}} - <:description>{{t 'form.provider.description'}} + <:title>{{t 'titles.provider'}} + <:description>{{t 'descriptions.provider'}} <:body> - <:title>{{t 'form.provider.label'}} + <:title>{{t 'titles.provider'}} <:body> - <:title>{{t 'form.provider.label'}} + <:title>{{t 'titles.provider'}} <:body> Date: Tue, 15 Feb 2022 12:55:40 -0800 Subject: [PATCH 3/9] =?UTF-8?q?fix:=20=F0=9F=90=9B=20move=20translations?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addons/core/translations/actions/en-us.yaml | 1 + addons/core/translations/en-us.yaml | 5 ----- addons/core/translations/form/en-us.yaml | 6 ++++++ .../app/components/form/host-catalog/aws/index.hbs | 4 ++-- .../app/components/form/host-catalog/azure/index.hbs | 12 ++++++------ ui/admin/app/components/form/host-set/aws/index.hbs | 4 ++-- .../app/components/form/host-set/azure/index.hbs | 4 ++-- 7 files changed, 19 insertions(+), 17 deletions(-) diff --git a/addons/core/translations/actions/en-us.yaml b/addons/core/translations/actions/en-us.yaml index 118c5f601..9c97d54af 100644 --- a/addons/core/translations/actions/en-us.yaml +++ b/addons/core/translations/actions/en-us.yaml @@ -36,3 +36,4 @@ toggle-secret: Toggle secret visibility minimize: Minimize fullscreen: Fullscreen clear-all-filters: Clear all filters +learn-more: Learn more \ No newline at end of file diff --git a/addons/core/translations/en-us.yaml b/addons/core/translations/en-us.yaml index 1da3accf0..6dc0f659b 100644 --- a/addons/core/translations/en-us.yaml +++ b/addons/core/translations/en-us.yaml @@ -30,11 +30,8 @@ titles: label: Label value: Value no-results: No Results - learn-more: Learn more choose-a-provider: Choose a provider provider: Provider - filter: Filter - secret: Client secret value descriptions: empty-set: There are no items to display yet. You may be able to add items or try back later. origin-initialization: To get started, please enter your origin URL @@ -43,8 +40,6 @@ descriptions: no-results: We found no matching records. choose-a-provider: 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. provider: This is the provider for this host catalog. The format of the host set filters are specific to each provider. - filter: Create a filter to select resources using values such as tag name or tag value. Filter format is specific to each provider - secret: The client secret value for the client you want Boundary to use questions: delete-confirm: Are you sure you want to delete this resource? remove-confirm: Are you sure you want to remove this association? diff --git a/addons/core/translations/form/en-us.yaml b/addons/core/translations/form/en-us.yaml index 8aef87403..db37a97b1 100644 --- a/addons/core/translations/form/en-us.yaml +++ b/addons/core/translations/form/en-us.yaml @@ -135,3 +135,9 @@ region: azure_client_id: label: Client ID help: The client ID for the client you want Boundary to use. +secret: + label: Client secret value + help: The client secret value for the client you want Boundary to use +host_set_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 \ 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 7a15bee5a..1cd589af5 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 @@ @value={{@model.access_key_id}} @label={{t 'form.access_key_id.label'}} @helperText={{t 'form.access_key_id.help'}} - @linkText={{t 'titles.learn-more'}} + @linkText={{t 'actions.learn-more'}} readonly={{false}} /> @@ -149,7 +149,7 @@ @value={{@model.secret_access_key}} @label={{t 'form.secret_access_key.label'}} @helperText={{t 'form.secret_access_key.help'}} - @linkText={{t 'titles.learn-more'}} + @linkText={{t 'actions.learn-more'}} readonly={{false}} /> {{#if (can 'save model' @model)}} 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 007a83426..18d612db0 100644 --- a/ui/admin/app/components/form/host-catalog/azure/index.hbs +++ b/ui/admin/app/components/form/host-catalog/azure/index.hbs @@ -132,7 +132,7 @@ @value={{@model.tenant_id}} @label={{t 'form.tenant_id.label'}} @helperText={{t 'form.tenant_id.help'}} - @linkText={{t 'titles.learn-more'}} + @linkText={{t 'actions.learn-more'}} readonly={{false}} /> @@ -142,7 +142,7 @@ @value={{@model.subscription_id}} @label={{t 'form.subscription_id.label'}} @helperText={{t 'form.subscription_id.help'}} - @linkText={{t 'titles.learn-more'}} + @linkText={{t 'actions.learn-more'}} readonly={{false}} /> @@ -152,16 +152,16 @@ @value={{@model.client_id}} @label={{t 'form.azure_client_id.label'}} @helperText={{t 'form.azure_client_id.help'}} - @linkText={{t 'titles.learn-more'}} + @linkText={{t 'actions.learn-more'}} readonly={{false}} /> 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 9d00ff2a4..5f0d0e078 100644 --- a/ui/admin/app/components/form/host-set/aws/index.hbs +++ b/ui/admin/app/components/form/host-set/aws/index.hbs @@ -76,8 +76,8 @@ {{! placeholder for filter, update me when the model is ready }} - <:title>{{t 'titles.filter'}} - <:description>{{t 'descriptions.filter'}} + <:title>{{t 'form.host_set_filter.label'}} + <:description>{{t 'form.host_set_filter.help'}} <:body> {{#if @model.errors.filters}} 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 048b7b042..da22bf67f 100644 --- a/ui/admin/app/components/form/host-set/azure/index.hbs +++ b/ui/admin/app/components/form/host-set/azure/index.hbs @@ -79,8 +79,8 @@ @name='filter' @type='filter' @value={{@model.filter}} - @label={{t 'titles.filter'}} - @helperText={{t 'descriptions.filter'}} + @label={{t 'form.host_set_filter.label'}} + @helperText={{t 'form.host_set_filter.help'}} @linkText={{t 'form. tiltes.learn-more'}} @error={{@model.errors.description}} disabled={{@model.isSaving}} From 6d6e8757e9d399c3d889d965151f8fc0f68330a4 Mon Sep 17 00:00:00 2001 From: dharini Date: Tue, 15 Feb 2022 13:17:17 -0800 Subject: [PATCH 4/9] updates --- addons/core/translations/form/en-us.yaml | 8 +------- addons/core/translations/resources/en-us.yaml | 6 ++++++ ui/admin/app/components/form/host-catalog/azure/index.hbs | 4 ++-- ui/admin/app/components/form/host-set/aws/index.hbs | 5 ++--- ui/admin/app/components/form/host-set/azure/index.hbs | 5 ++--- 5 files changed, 13 insertions(+), 15 deletions(-) diff --git a/addons/core/translations/form/en-us.yaml b/addons/core/translations/form/en-us.yaml index db37a97b1..f433f247b 100644 --- a/addons/core/translations/form/en-us.yaml +++ b/addons/core/translations/form/en-us.yaml @@ -132,12 +132,6 @@ secret_access_key: help: The subscription ID for the subscription with read access. region: label: Region -azure_client_id: - label: Client ID - help: The client ID for the client you want Boundary to use. secret: label: Client secret value - help: The client secret value for the client you want Boundary to use -host_set_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 \ No newline at end of file + help: The client secret value for the client you want Boundary to use \ No newline at end of file diff --git a/addons/core/translations/resources/en-us.yaml b/addons/core/translations/resources/en-us.yaml index 5b5b02e45..3098c2f12 100644 --- a/addons/core/translations/resources/en-us.yaml +++ b/addons/core/translations/resources/en-us.yaml @@ -93,6 +93,9 @@ host-catalog: aws: AWS azure: Azure dynamic: Dynamic + azure_client_id: + label: Client ID + help: The client ID for the client you want Boundary to use. host-set: title: Host Set title_plural: Host Sets @@ -103,6 +106,9 @@ host-set: delete: Delete Host Set create-and-add-host: Create and Add Host add-hosts: Add Existing Host + 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 messages: welcome: title: Welcome to Host Sets 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 361cd090c..51281f299 100644 --- a/ui/admin/app/components/form/host-catalog/azure/index.hbs +++ b/ui/admin/app/components/form/host-catalog/azure/index.hbs @@ -150,8 +150,8 @@ @name='client_id' @type='client_id' @value={{@model.client_id}} - @label={{t 'form.azure_client_id.label'}} - @helperText={{t 'form.azure_client_id.help'}} + @label={{t 'resources.host-catalog.azure_client_id.label'}} + @helperText={{t 'resources.host-catalog.azure_client_id.help'}} @linkText={{t 'actions.learn-more'}} readonly={{false}} /> 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 616bf3e3c..aceead976 100644 --- a/ui/admin/app/components/form/host-set/aws/index.hbs +++ b/ui/admin/app/components/form/host-set/aws/index.hbs @@ -74,10 +74,9 @@ - {{! placeholder for filter, update me when the model is ready }} - <:title>{{t 'form.host_set_filter.label'}} - <:description>{{t 'form.host_set_filter.help'}} + <:title>{{t 'resources.host-set.filter.label'}} + <:description>{{t 'resources.host-set.filter.help'}} <:body> {{#if @model.errors.filters}} 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 046c14c2f..d306b00f6 100644 --- a/ui/admin/app/components/form/host-set/azure/index.hbs +++ b/ui/admin/app/components/form/host-set/azure/index.hbs @@ -74,13 +74,12 @@ - {{! placeholder for filter, update me when the model is ready }} Date: Tue, 15 Feb 2022 18:23:25 -0500 Subject: [PATCH 5/9] chore: move form fields --- addons/core/translations/resources/en-us.yaml | 16 +++++++++------- .../components/form/host-catalog/azure/index.hbs | 4 ++-- .../app/components/form/host-set/aws/index.hbs | 4 ++-- .../app/components/form/host-set/azure/index.hbs | 4 ++-- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/addons/core/translations/resources/en-us.yaml b/addons/core/translations/resources/en-us.yaml index 3098c2f12..1341dcc76 100644 --- a/addons/core/translations/resources/en-us.yaml +++ b/addons/core/translations/resources/en-us.yaml @@ -84,7 +84,7 @@ host-catalog: title: Welcome to Host Catalogs actions: delete: Delete Host Catalog - help: + help: static: Provide a list of hosts and host sets with static addresses dynamic: Automate discovery of target hosts and services on Azure or AWS types: @@ -93,9 +93,10 @@ host-catalog: aws: AWS azure: Azure dynamic: Dynamic - azure_client_id: - label: Client ID - help: The client ID for the client you want Boundary to use. + form: + azure_client_id: + label: Client ID + help: The client ID for the client you want Boundary to use. host-set: title: Host Set title_plural: Host Sets @@ -106,9 +107,10 @@ host-set: delete: Delete Host Set create-and-add-host: Create and Add Host add-hosts: Add Existing Host - 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 + form: + 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 messages: welcome: title: Welcome to Host Sets 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 a822b0c84..d19cb2dd3 100644 --- a/ui/admin/app/components/form/host-catalog/azure/index.hbs +++ b/ui/admin/app/components/form/host-catalog/azure/index.hbs @@ -148,8 +148,8 @@ @name='client_id' @type='client_id' @value={{@model.client_id}} - @label={{t 'resources.host-catalog.azure_client_id.label'}} - @helperText={{t 'resources.host-catalog.azure_client_id.help'}} + @label={{t 'resources.host-catalog.form.azure_client_id.label'}} + @helperText={{t 'resources.host-catalog.form.azure_client_id.help'}} @linkText={{t 'actions.learn-more'}} readonly={{false}} /> 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 aceead976..3af6ce47f 100644 --- a/ui/admin/app/components/form/host-set/aws/index.hbs +++ b/ui/admin/app/components/form/host-set/aws/index.hbs @@ -75,8 +75,8 @@ - <:title>{{t 'resources.host-set.filter.label'}} - <:description>{{t 'resources.host-set.filter.help'}} + <:title>{{t 'resources.host-set.form.filter.label'}} + <:description>{{t 'resources.host-set.form.filter.help'}} <:body> {{#if @model.errors.filters}} 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 d306b00f6..686cb70d4 100644 --- a/ui/admin/app/components/form/host-set/azure/index.hbs +++ b/ui/admin/app/components/form/host-set/azure/index.hbs @@ -78,8 +78,8 @@ @name='filter' @type='filter' @value={{@model.filter}} - @label={{t 'resources.host-set.filter.label'}} - @helperText={{t 'resources.host-set.filter.help'}} + @label={{t 'resources.host-set.form.filter.label'}} + @helperText={{t 'resources.host-set.form.filter.help'}} @linkText={{t 'form. tiltes.learn-more'}} @error={{@model.errors.description}} disabled={{@model.isSaving}} From 1f4b577dcb451199e2df329b3ff8e4d95313dc60 Mon Sep 17 00:00:00 2001 From: dharini Date: Tue, 15 Feb 2022 18:55:42 -0800 Subject: [PATCH 6/9] conflict --- addons/core/translations/form/en-us.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/addons/core/translations/form/en-us.yaml b/addons/core/translations/form/en-us.yaml index f185acb71..e93ad3774 100644 --- a/addons/core/translations/form/en-us.yaml +++ b/addons/core/translations/form/en-us.yaml @@ -135,3 +135,5 @@ region: secret: label: Client secret value help: The client secret value for the client you want Boundary to use +disable_credential_rotation: + label: Disable credential rotation \ No newline at end of file From 8c2ff4d2e9e42f5c631c88f25edd690c2906bb62 Mon Sep 17 00:00:00 2001 From: dharini Date: Tue, 15 Feb 2022 16:53:27 -0800 Subject: [PATCH 7/9] =?UTF-8?q?chore:=20=F0=9F=A4=96=20add=20doc=20link?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/admin/config/environment.js | 1 + 1 file changed, 1 insertion(+) diff --git a/ui/admin/config/environment.js b/ui/admin/config/environment.js index f5d8c53b9..e72d72854 100644 --- a/ui/admin/config/environment.js +++ b/ui/admin/config/environment.js @@ -53,6 +53,7 @@ module.exports = function (environment) { 'group.add-members': '/groups/add-members', 'host-catalog': '/host-catalogs', 'host-catalog.new': '/host-catalogs/new', + 'host-catalog.set-up-cloud-hosts': 'host-catalog.set-up-cloud-hosts', 'host-set': '/host-sets', 'host-set.new': '/host-sets/new', 'host-set.add-hosts': '/host-sets/add-hosts', From 8b338f028858b716f09d0ea6be0feaee6dc5f751 Mon Sep 17 00:00:00 2001 From: dharini Date: Tue, 15 Feb 2022 18:51:58 -0800 Subject: [PATCH 8/9] =?UTF-8?q?chore:=20=F0=9F=A4=96=20add=20doc=20links?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/admin/app/components/form/host-catalog/azure/index.hbs | 4 ++++ ui/admin/app/components/form/host-catalog/index.hbs | 1 + ui/admin/app/components/form/host-catalog/static/index.hbs | 1 - ui/admin/app/templates/scopes/scope/host-catalogs/new.hbs | 1 + ui/admin/config/environment.js | 2 +- 5 files changed, 7 insertions(+), 2 deletions(-) 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 d19cb2dd3..d816e36a9 100644 --- a/ui/admin/app/components/form/host-catalog/azure/index.hbs +++ b/ui/admin/app/components/form/host-catalog/azure/index.hbs @@ -131,6 +131,7 @@ @label={{t 'form.tenant_id.label'}} @helperText={{t 'form.tenant_id.help'}} @linkText={{t 'actions.learn-more'}} + @link={{doc-url @doc}} readonly={{false}} /> @@ -141,6 +142,7 @@ @label={{t 'form.subscription_id.label'}} @helperText={{t 'form.subscription_id.help'}} @linkText={{t 'actions.learn-more'}} + @link={{doc-url @doc}} readonly={{false}} /> @@ -151,6 +153,7 @@ @label={{t 'resources.host-catalog.form.azure_client_id.label'}} @helperText={{t 'resources.host-catalog.form.azure_client_id.help'}} @linkText={{t 'actions.learn-more'}} + @link={{doc-url @doc}} readonly={{false}} /> @@ -160,6 +163,7 @@ @label={{t 'form.secret.label'}} @helperText={{t 'form.secret.help'}} @linkText={{t 'actions.learn-more'}} + @link={{doc-url @doc}} readonly={{false}} /> diff --git a/ui/admin/app/components/form/host-catalog/index.hbs b/ui/admin/app/components/form/host-catalog/index.hbs index 90cebebc9..2af0d78a5 100644 --- a/ui/admin/app/components/form/host-catalog/index.hbs +++ b/ui/admin/app/components/form/host-catalog/index.hbs @@ -4,4 +4,5 @@ submit=@submit cancel=@cancel changeType=@changeType + doc=@doc }} \ No newline at end of file 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 560b9c118..58bfe36da 100644 --- a/ui/admin/app/components/form/host-catalog/static/index.hbs +++ b/ui/admin/app/components/form/host-catalog/static/index.hbs @@ -81,7 +81,6 @@ <:title>{{t 'titles.choose-a-provider'}} <:description>{{t 'descriptions.choose-a-provider'}} - <:body> diff --git a/ui/admin/config/environment.js b/ui/admin/config/environment.js index e72d72854..cd6e3a020 100644 --- a/ui/admin/config/environment.js +++ b/ui/admin/config/environment.js @@ -53,7 +53,7 @@ module.exports = function (environment) { 'group.add-members': '/groups/add-members', 'host-catalog': '/host-catalogs', 'host-catalog.new': '/host-catalogs/new', - 'host-catalog.set-up-cloud-hosts': 'host-catalog.set-up-cloud-hosts', + 'host-catalog.set-up-cloud-hosts': '/host-catalog-set-up-cloud-hosts', 'host-set': '/host-sets', 'host-set.new': '/host-sets/new', 'host-set.add-hosts': '/host-sets/add-hosts', From 6de0c07549036836224cf4c38f3ce36eae1e006f Mon Sep 17 00:00:00 2001 From: dharini Date: Wed, 16 Feb 2022 08:51:07 -0800 Subject: [PATCH 9/9] fix key --- ui/admin/app/templates/scopes/scope/host-catalogs/new.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/new.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/new.hbs index 4f2dc09d9..682fc6026 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/new.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/new.hbs @@ -19,7 +19,7 @@ @submit={{route-action 'save' @model}} @cancel={{route-action 'cancel' @model}} @changeType={{route-action 'changeType'}} - @doc='host-catalog-set-up-cloud-hosts' + @doc='host-catalog.set-up-cloud-hosts' />