From d12c38e885f7c51f77b8084a7a524431214a90dc Mon Sep 17 00:00:00 2001 From: cameronperera Date: Mon, 28 Feb 2022 15:16:39 -0600 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20ICU-3529=20add=20rot?= =?UTF-8?q?ating=20credentials=20warning=20for=20azure?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add "Boundary does not yet support rotating credentials" warning message for Azure provider ✅ Closes: ICU-3529 --- addons/core/translations/resources/en-us.yaml | 4 ++++ ui/admin/app/components/form/host-catalog/aws/index.hbs | 4 +++- ui/admin/app/components/form/host-catalog/azure/index.hbs | 4 +++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/addons/core/translations/resources/en-us.yaml b/addons/core/translations/resources/en-us.yaml index 57de894d3..5f6dd17da 100644 --- a/addons/core/translations/resources/en-us.yaml +++ b/addons/core/translations/resources/en-us.yaml @@ -97,6 +97,10 @@ host-catalog: azure_client_id: label: Client ID help: The client ID for the client you want Boundary to use. + azure_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. Boundary does not yet support rotating credentials. + aws_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. host-set: title: Host Set title_plural: Host Sets 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 01cafbe7a..0bfd3a020 100644 --- a/ui/admin/app/components/form/host-catalog/aws/index.hbs +++ b/ui/admin/app/components/form/host-catalog/aws/index.hbs @@ -77,7 +77,9 @@ <:title>{{t 'titles.choose-a-provider'}} - <:description>{{t 'descriptions.choose-a-provider'}} + <:description> + {{t 'resources.host-catalog.form.aws_choose_a_provider.description'}} + <:body> <:title>{{t 'titles.choose-a-provider'}} - <:description>{{t 'descriptions.choose-a-provider'}} + <:description> + {{t 'resources.host-catalog.form.azure_choose_a_provider.description'}} + <:body> Date: Tue, 1 Mar 2022 11:47:40 -0600 Subject: [PATCH 2/2] =?UTF-8?q?refactor:=20=F0=9F=92=A1=20Update=20choose?= =?UTF-8?q?=20a=20provider=20translations?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update choose a provider translations to concat provider specific text when appropriate ✅ Closes: ICU-3529 --- addons/core/translations/en-us.yaml | 1 + addons/core/translations/resources/en-us.yaml | 4 ---- ui/admin/app/components/form/host-catalog/aws/index.hbs | 4 +--- ui/admin/app/components/form/host-catalog/azure/index.hbs | 6 +++++- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/addons/core/translations/en-us.yaml b/addons/core/translations/en-us.yaml index afe5d18f2..9e2143ca3 100644 --- a/addons/core/translations/en-us.yaml +++ b/addons/core/translations/en-us.yaml @@ -40,6 +40,7 @@ descriptions: 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. + choose-a-provider-azure: Boundary does not yet support rotating credentials. provider: This is the provider for this host catalog. The format of the host set filters are specific to each provider. questions: delete-confirm: Are you sure you want to delete this resource? diff --git a/addons/core/translations/resources/en-us.yaml b/addons/core/translations/resources/en-us.yaml index 5f6dd17da..57de894d3 100644 --- a/addons/core/translations/resources/en-us.yaml +++ b/addons/core/translations/resources/en-us.yaml @@ -97,10 +97,6 @@ host-catalog: azure_client_id: label: Client ID help: The client ID for the client you want Boundary to use. - azure_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. Boundary does not yet support rotating credentials. - aws_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. host-set: title: Host Set title_plural: Host Sets 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 0bfd3a020..01cafbe7a 100644 --- a/ui/admin/app/components/form/host-catalog/aws/index.hbs +++ b/ui/admin/app/components/form/host-catalog/aws/index.hbs @@ -77,9 +77,7 @@ <:title>{{t 'titles.choose-a-provider'}} - <:description> - {{t 'resources.host-catalog.form.aws_choose_a_provider.description'}} - + <:description>{{t 'descriptions.choose-a-provider'}} <:body> <:title>{{t 'titles.choose-a-provider'}} <:description> - {{t 'resources.host-catalog.form.azure_choose_a_provider.description'}} + {{concat + (t 'descriptions.choose-a-provider') + ' ' + (t 'descriptions.choose-a-provider-azure') + }} <:body>