From 8edb19f97a5e41316783891b4f078ed30546966d Mon Sep 17 00:00:00 2001 From: John Cowen Date: Thu, 14 Apr 2022 17:13:13 +0100 Subject: [PATCH] ui: Adds support for AWS-IAM Auth Methods (#12786) * ui: Adds support for AWS-IAM Auth Methods * Changelog --- .changelog/12786.txt | 3 + .../components/consul/auth-method/index.scss | 6 ++ .../consul/auth-method/view/index.hbs | 60 +++++++++++++++++-- .../consul-ui/app/components/pill/index.scss | 4 ++ .../dc/acls/auth-methods/show/auth-method.hbs | 2 +- .../acls/auth-methods/show/binding-rules.hbs | 2 +- .../acls/auth-methods/show/nspace-rules.hbs | 8 +-- .../consul-ui/mock-api/v1/acl/auth-methods | 4 +- ui/packages/consul-ui/package.json | 1 + .../consul-ui/translations/common/en-us.yaml | 1 + ui/yarn.lock | 7 +++ 11 files changed, 84 insertions(+), 14 deletions(-) create mode 100644 .changelog/12786.txt diff --git a/.changelog/12786.txt b/.changelog/12786.txt new file mode 100644 index 000000000..ca772829e --- /dev/null +++ b/.changelog/12786.txt @@ -0,0 +1,3 @@ +```release-note:feature +ui: Added support for AWS IAM Auth Methods +``` diff --git a/ui/packages/consul-ui/app/components/consul/auth-method/index.scss b/ui/packages/consul-ui/app/components/consul/auth-method/index.scss index c1b862381..beff18a65 100644 --- a/ui/packages/consul-ui/app/components/consul/auth-method/index.scss +++ b/ui/packages/consul-ui/app/components/consul/auth-method/index.scss @@ -42,6 +42,12 @@ section dl { @extend %tabular-dl; } + section dt { + width: 30%; + } + section dd { + width: 70%; + } } // Binding List diff --git a/ui/packages/consul-ui/app/components/consul/auth-method/view/index.hbs b/ui/packages/consul-ui/app/components/consul/auth-method/view/index.hbs index 396aea1d7..e7f8f319c 100644 --- a/ui/packages/consul-ui/app/components/consul/auth-method/view/index.hbs +++ b/ui/packages/consul-ui/app/components/consul/auth-method/view/index.hbs @@ -37,16 +37,62 @@
Type
-
+
+ +
+ +{{#each (array "MaxTokenTTL" "TokenLocality" "DisplayName" "Description") as |value|}} + {{#if (get @item value)}} - {{#each (array "MaxTokenTTL" "TokenLocality" "DisplayName" "Description") as |value|}} - {{#if (get @item value)}}
{{t (concat "models.auth-method." value)}}
{{get @item value}}
- {{/if}} - {{/each}} - {{#if (eq @item.Type 'jwt')}} + {{/if}} +{{/each}} + + {{#if (eq @item.Type 'aws-iam')}} + +{{#let + @item.Config +as |config|}} + {{#each (array + "BoundIAMPrincipalARNs" + "EnableIAMEntityDetails" + "IAMEntityTags" + "IAMEndpoint" + "MaxRetries" + "STSEndpoint" + "STSRegion" + "AllowedSTSHeaderValues" + "ServerIDHeaderValue" + ) as |value|}} + {{#if (get config value)}} + +
{{t (concat "models.auth-method." value)}}
+
+{{#let + (get config value) +as |item|}} + {{#if (array-is-array item)}} +
    + {{#each item as |jtem|}} +
  • + {{jtem}} +
    • + {{/each}} +
+ {{else}} + {{item}} + {{/if}} +{{/let}} +
+ + {{/if}} + {{/each}} + +{{/let}} + + {{else if (eq @item.Type 'jwt')}} {{#if @item.Config.JWKSURL}}
{{t 'models.auth-method.Config.JWKSURL'}}
@@ -164,6 +210,7 @@
+ {{#if (not (eq @item.Type 'aws-iam'))}}
@@ -250,4 +297,5 @@ {{/if}}
{{/if}} +{{/if}} \ No newline at end of file diff --git a/ui/packages/consul-ui/app/components/pill/index.scss b/ui/packages/consul-ui/app/components/pill/index.scss index d7da1f0a5..cbeabfff1 100644 --- a/ui/packages/consul-ui/app/components/pill/index.scss +++ b/ui/packages/consul-ui/app/components/pill/index.scss @@ -32,3 +32,7 @@ span.policy-service-identity::before { %pill.kubernetes::before { @extend %with-logo-kubernetes-color-icon, %as-pseudo; } +%pill.aws-iam::before { + --icon-name: icon-aws-color; + content: ''; +} diff --git a/ui/packages/consul-ui/app/templates/dc/acls/auth-methods/show/auth-method.hbs b/ui/packages/consul-ui/app/templates/dc/acls/auth-methods/show/auth-method.hbs index 248122f06..cc28d28f6 100644 --- a/ui/packages/consul-ui/app/templates/dc/acls/auth-methods/show/auth-method.hbs +++ b/ui/packages/consul-ui/app/templates/dc/acls/auth-methods/show/auth-method.hbs @@ -1,5 +1,5 @@
diff --git a/ui/packages/consul-ui/app/templates/dc/acls/auth-methods/show/binding-rules.hbs b/ui/packages/consul-ui/app/templates/dc/acls/auth-methods/show/binding-rules.hbs index f12f996a0..f1e09e636 100644 --- a/ui/packages/consul-ui/app/templates/dc/acls/auth-methods/show/binding-rules.hbs +++ b/ui/packages/consul-ui/app/templates/dc/acls/auth-methods/show/binding-rules.hbs @@ -1,5 +1,5 @@ {{#let route.model.item @@ -14,13 +14,13 @@ as |item|}}

- {{t 'routes.dc.acls.auth-methods.show.nspace-rules.index.empty.header'}} + {{compute (fn route.t 'empty.header')}}

- {{t 'routes.dc.acls.auth-methods.show.nspace-rules.index.empty.body' + {{compute (fn route.t 'empty.body' (hash htmlSafe=true - }} + ))}}
  • diff --git a/ui/packages/consul-ui/mock-api/v1/acl/auth-methods b/ui/packages/consul-ui/mock-api/v1/acl/auth-methods index 69f26fe56..b1a3c3d46 100644 --- a/ui/packages/consul-ui/mock-api/v1/acl/auth-methods +++ b/ui/packages/consul-ui/mock-api/v1/acl/auth-methods @@ -21,9 +21,9 @@ ${typeof location.search.partition !== 'undefined' ? ` "Partition": "${location.search.partition}", ` : ``} ${env('CONSUL_NSPACES_ENABLE', false) ? ` - "Type": "${fake.helpers.randomize(['kubernetes', 'jwt', 'oidc'])}", + "Type": "${fake.helpers.randomize(['kubernetes', 'jwt', 'oidc', 'aws-iam'])}", ` : ` - "Type": "${fake.helpers.randomize(['kubernetes', 'jwt'])}", + "Type": "${fake.helpers.randomize(['kubernetes', 'jwt', 'aws-iam'])}", `} "Description": "${fake.lorem.sentence()}", ${i%2 ? ` diff --git a/ui/packages/consul-ui/package.json b/ui/packages/consul-ui/package.json index 9f0ebe782..bd61e6a91 100644 --- a/ui/packages/consul-ui/package.json +++ b/ui/packages/consul-ui/package.json @@ -90,6 +90,7 @@ "d3-shape": "^2.0.0", "dayjs": "^1.9.3", "deepmerge": "^4.2.2", + "ember-array-fns": "^1.4.0", "ember-assign-helper": "^0.3.0", "ember-auto-import": "^1.5.3", "ember-can": "^4.1.0", diff --git a/ui/packages/consul-ui/translations/common/en-us.yaml b/ui/packages/consul-ui/translations/common/en-us.yaml index 5365996ab..70a1e229d 100644 --- a/ui/packages/consul-ui/translations/common/en-us.yaml +++ b/ui/packages/consul-ui/translations/common/en-us.yaml @@ -5,6 +5,7 @@ brand: nomad: Nomad vault: Vault aws: AWS + aws-iam: AWS IAM kubernetes: Kubernetes jwt: JWT oidc: OIDC diff --git a/ui/yarn.lock b/ui/yarn.lock index 1211ace9d..bf5329450 100644 --- a/ui/yarn.lock +++ b/ui/yarn.lock @@ -6277,6 +6277,13 @@ elliptic@^6.5.3: minimalistic-assert "^1.0.1" minimalistic-crypto-utils "^1.0.1" +ember-array-fns@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/ember-array-fns/-/ember-array-fns-1.4.0.tgz#92188edecb91c0b69c78e411f1b3339dfe0006a5" + integrity sha512-dKQ2wvuh+rVYhGsbR8pk8j9TX/Kqwf3sRehtJ+HqEi3VavH/WPPvsY2sH5nczYEtQwgkV1NAzgSzLr1iYj4uXQ== + dependencies: + ember-cli-babel "^7.7.3" + ember-assign-helper@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/ember-assign-helper/-/ember-assign-helper-0.3.0.tgz#7a023dd165ef56b28f77f70fd20e88261380aca7"