From c7546af207e38f1223388f5c603f25476e64b368 Mon Sep 17 00:00:00 2001 From: Zhihe Li Date: Thu, 2 Mar 2023 10:25:37 -0500 Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20Fix=20vault=20worker=20fi?= =?UTF-8?q?lter=20description=20(#1651)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ✅ Closes: ICU-8192 --- addons/core/translations/form/en-us.yaml | 3 --- addons/core/translations/resources/en-us.yaml | 6 ++++++ .../form/credential-store/vault/index.hbs | 4 ++-- .../app/components/form/target/details/index.hbs | 14 ++++++++++---- 4 files changed, 18 insertions(+), 9 deletions(-) diff --git a/addons/core/translations/form/en-us.yaml b/addons/core/translations/form/en-us.yaml index 9c88d243d..3abfd6419 100644 --- a/addons/core/translations/form/en-us.yaml +++ b/addons/core/translations/form/en-us.yaml @@ -56,9 +56,6 @@ worker_address: help: URL and port for this worker. worker_type: help: Type of worker -worker_filter: - label: Worker Filter - help: Deprecated. Boolean expression to filter the workers that are allowed to satisfy this request. host_set: label: Host Set grant_scope: diff --git a/addons/core/translations/resources/en-us.yaml b/addons/core/translations/resources/en-us.yaml index f7788fc48..68932b448 100644 --- a/addons/core/translations/resources/en-us.yaml +++ b/addons/core/translations/resources/en-us.yaml @@ -321,6 +321,9 @@ target: target-address: label: Target Address help: Must be a valid IP address or DNS name. We recommend leaving this blank and using host catalogs and host sets instead if you want to use this target on multiple hosts. + worker_filter: + label: Worker Filter + help: Deprecated. Boolean expression to filter the workers that are allowed to satisfy this request. questions: delete-host-sources: title: Remove associated host sources? @@ -448,6 +451,9 @@ credential-store: help: A PEM-encoded private key matching the client certificate from Client Certificate. client_certificate_key_hmac: label: Client Certificate Key HMAC + worker_filter: + label: Worker Filter + help: A filter used to control which PKI workers can handle Vault requests, allowing the use of private Vault instances with Boundary. credential-library: title: Credential Library title_plural: Credential Libraries diff --git a/ui/admin/app/components/form/credential-store/vault/index.hbs b/ui/admin/app/components/form/credential-store/vault/index.hbs index a44e1402f..a71880c6b 100644 --- a/ui/admin/app/components/form/credential-store/vault/index.hbs +++ b/ui/admin/app/components/form/credential-store/vault/index.hbs @@ -110,9 +110,9 @@ @name='worker_filter' @type='text' @value={{@model.worker_filter}} - @label={{t 'form.worker_filter.label'}} + @label={{t 'resources.credential-store.form.worker_filter.label'}} @error={{@model.errors.worker_filter}} - @helperText={{t 'form.worker_filter.help'}} + @helperText={{t 'resources.credential-store.form.worker_filter.help'}} @linkText={{t 'actions.learn-more'}} @link={{doc-url 'worker-filters'}} disabled={{@model.isSaving}} diff --git a/ui/admin/app/components/form/target/details/index.hbs b/ui/admin/app/components/form/target/details/index.hbs index 7ff3914b4..5b7f672ff 100644 --- a/ui/admin/app/components/form/target/details/index.hbs +++ b/ui/admin/app/components/form/target/details/index.hbs @@ -207,8 +207,12 @@ {{on 'input' (set-from-event @model 'worker_filter')}} as |F| > - {{t 'form.worker_filter.label'}} - {{t 'form.worker_filter.help'}} + + {{t 'resources.target.form.worker_filter.label'}} + + + {{t 'resources.target.form.worker_filter.help'}} + {{#if form.isEditable}} @@ -283,8 +287,10 @@ {{on 'input' (set-from-event @model 'worker_filter')}} as |F| > - {{t 'form.worker_filter.label'}} - {{t 'form.worker_filter.help'}} + {{t 'resources.target.form.worker_filter.label'}} + + {{t 'resources.target.form.worker_filter.help'}} + {{#if @model.errors.worker_filter}} {{#each @model.errors.worker_filter as |error|}}