Backport of ui: Add ServerExternalAddresses to peer token create form…

… into release/1.14.x (#15620) * backport of commit ea23bac * backport of commit a4d1535 * backport of commit f782c16 * backport of commit 198eb09 * backport of commit 38c0e32 * backport of commit b388266 Co-authored-by: wenincode <tyler.wendlandt@hashicorp.com>
hashicorp · Nov 30, 2022 · 13836d5 · 13836d5
1 parent 18dffc5
commit 13836d5
Show file tree

Hide file tree

Showing 10 changed files with 161 additions and 130 deletions.
diff --git a/.changelog/15555.txt b/.changelog/15555.txt
@@ -0,0 +1,3 @@
+```release-note:feature
+ui: Add field for fallback server addresses to peer token generation form 
+```
diff --git a/ui/packages/consul-peerings/app/components/consul/peer/form/generate/fieldsets/index.hbs b/ui/packages/consul-peerings/app/components/consul/peer/form/generate/fieldsets/index.hbs
@@ -1,38 +1,54 @@
-<div
-  class={{class-map
-    'consul-peer-form-generate-fieldsets'
-  }}
-  ...attributes
->
+<div class={{class-map "consul-peer-form-generate-fieldsets"}} ...attributes>
   <StateMachine
-    @src={{require '/machines/validate.xstate' from="/components/consul/peer/form/generate/fieldsets"}}
-  as |fsm|>
+    @src={{require
+      "/machines/validate.xstate"
+      from="/components/consul/peer/form/generate/fieldsets"
+    }}
+    as |fsm|
+  >
     {{#let
       (hash
         help=(concat
-          (t 'common.validations.dns-hostname.help')
-          (t 'common.validations.immutable.help')
+          (t "common.validations.dns-hostname.help")
+          (t "common.validations.immutable.help")
         )
         Name=(array
           (hash
-            test=(t 'common.validations.dns-hostname.test')
-            error=(t 'common.validations.dns-hostname.error' name="Name")
+            test=(t "common.validations.dns-hostname.test")
+            error=(t "common.validations.dns-hostname.error" name="Name")
           )
         )
       )
-    as |Name|}}
+      as |Name|
+    }}
       <fieldset>
         <TextInput
-          @label="Name of peer"
+          @label={{t "components.consul.peer.generate.name"}}
           @name="Name"
           @item={{@item}}
           @validations={{Name}}
           @chart={{fsm}}
-          @oninput={{pick 'target.value' (set @item 'Name')}}
+          @oninput={{pick "target.value" (set @item "Name")}}
         />
-        {{yield (hash
-          valid=(not (state-matches fsm.state 'error'))
-        )}}
+        {{yield (hash valid=(not (state-matches fsm.state "error")))}}
+      </fieldset>
+
+    {{/let}}
+
+    {{#let
+      (hash help=(t "common.validations.server-external-addresses.help"))
+      as |ServerExternalAddresses|
+    }}
+      <fieldset>
+        <TextInput
+          @label={{t "components.consul.peer.generate.addresses"}}
+          @name="ServerExternalAddresses"
+          @item={{@item}}
+          @chart={{fsm}}
+          @validations={{ServerExternalAddresses}}
+          @oninput={{pick "target.value" this.onInput}}
+        />
+        {{yield (hash valid=(not (state-matches fsm.state "error")))}}
       </fieldset>
 
     {{/let}}

diff --git a/ui/packages/consul-peerings/app/components/consul/peer/form/generate/fieldsets/index.js b/ui/packages/consul-peerings/app/components/consul/peer/form/generate/fieldsets/index.js
@@ -0,0 +1,15 @@
+import Component from '@glimmer/component';
+import { action } from '@ember/object';
+
+export default class PeerGenerateFieldSets extends Component {
+  @action
+  onInput(addresses) {
+    if (addresses) {
+      addresses = addresses.split(',').map(address => address.trim());
+    } else {
+      addresses = [];
+    }
+
+    this.args.item.ServerExternalAddresses = addresses;
+  } 
+}
diff --git a/ui/packages/consul-peerings/app/components/consul/peer/form/generate/index.hbs b/ui/packages/consul-peerings/app/components/consul/peer/form/generate/index.hbs
@@ -1,88 +1,81 @@
-<div
-  class={{class-map
-    'consul-peer-form-generate'
-  }}
-  ...attributes
->
+<div class={{class-map "consul-peer-form-generate"}} ...attributes>
   <StateMachine
-    @src={{require './chart.xstate' from="/components/consul/peer/form/generate"}}
-    @initial={{if @regenerate 'loading' 'idle'}}
-  as |fsm|>
+    @src={{require
+      "./chart.xstate"
+      from="/components/consul/peer/form/generate"
+    }}
+    @initial={{if @regenerate "loading" "idle"}}
+    as |fsm|
+  >
 
-  {{#let
-    (unique-id)
-  as |id reset|}}
-    <form
-      {{on 'submit' (fn fsm.dispatch 'LOAD')}}
-      id={{id}}
-    >
+    {{#let (unique-id) as |id reset|}}
+      <form {{on "submit" (fn fsm.dispatch "LOAD")}} id={{id}}>
 
-      <fsm.State @matches={{array 'idle' 'error'}}>
-        <fsm.State @matches={{'error'}}>
-          <Notice
-            @type="error"
-            role="alert"
-          as |notice|>
-            <notice.Body>
-              <p>
-                <strong>Error</strong><br />
-                {{fsm.state.context.error.message}}
-              </p>
-            </notice.Body>
-          </Notice>
-        </fsm.State>
-        {{yield (hash
-          Fieldsets=(component "consul/peer/form/generate/fieldsets"
-            item=@item
-          )
-          Actions=(component "consul/peer/form/generate/actions"
-            item=@item
-            id=id
-          )
-        )}}
-      </fsm.State>
-
-      <fsm.State @matches={{'loading'}}>
-        <DataSource
-          @src={{uri '/${partition}/${nspace}/${dc}/peering/token-for/${name}'
+        <fsm.State @matches={{array "idle" "error"}}>
+          <fsm.State @matches={{"error"}}>
+            <Notice @type="error" role="alert" as |notice|>
+              <notice.Body>
+                <p>
+                  <strong>Error</strong><br />
+                  {{fsm.state.context.error.message}}
+                </p>
+              </notice.Body>
+            </Notice>
+          </fsm.State>
+          {{yield
             (hash
-              partition=@item.Partition
-              nspace=''
-              dc=@item.Datacenter
-              name=@item.Name
+              Fieldsets=(component
+                "consul/peer/form/generate/fieldsets" item=@item
+              )
+              Actions=(component
+                "consul/peer/form/generate/actions" item=@item id=id
+              )
             )
           }}
-          @onchange={{queue
-            @onchange
-            (pick 'data' (fn fsm.dispatch 'SUCCESS'))
-          }}
-          @onerror={{queue
-            (fn fsm.dispatch 'ERROR')
-          }}
-        />
-      </fsm.State>
+        </fsm.State>
 
-      <fsm.State @matches={{'success'}}>
-        {{yield (hash
-          Fieldsets=(component "consul/peer/form/token/fieldsets"
-            item=@item
-            token=fsm.state.context.PeeringToken
-            regenerate=@regenerate
-            onclick=(queue
-              (set @item 'Name' '')
-              (fn fsm.dispatch 'RESET')
+        <fsm.State @matches={{"loading"}}>
+          <DataSource
+            @src={{uri
+              "/${partition}/${nspace}/${dc}/peering/token-for/${name}/${externalAddresses}"
+              (hash
+                partition=@item.Partition
+                nspace=""
+                dc=@item.Datacenter
+                name=@item.Name
+                externalAddresses=@item.ServerExternalAddresses
+              )
+            }}
+            @onchange={{queue
+              @onchange
+              (pick "data" (fn fsm.dispatch "SUCCESS"))
+            }}
+            @onerror={{queue (fn fsm.dispatch "ERROR")}}
+          />
+        </fsm.State>
+
+        <fsm.State @matches={{"success"}}>
+          {{yield
+            (hash
+              Fieldsets=(component
+                "consul/peer/form/token/fieldsets"
+                item=@item
+                token=fsm.state.context.PeeringToken
+                regenerate=@regenerate
+                onclick=(queue (set @item "Name" "") (fn fsm.dispatch "RESET"))
+              )
+              Actions=(component
+                "consul/peer/form/token/actions"
+                token=fsm.state.context.PeeringToken
+                item=@item
+                id=id
+              )
             )
-          )
-          Actions=(component "consul/peer/form/token/actions"
-            token=fsm.state.context.PeeringToken
-            item=@item
-            id=id
-          )
-        )}}
-      </fsm.State>
+          }}
+        </fsm.State>
 
-    </form>
-  {{/let}}
+      </form>
+    {{/let}}
 
   </StateMachine>
 </div>
diff --git a/ui/packages/consul-peerings/app/components/consul/peer/form/index.hbs b/ui/packages/consul-peerings/app/components/consul/peer/form/index.hbs
@@ -1,63 +1,50 @@
-<div
-  class={{class-map
-    'consul-peer-form'
-  }}
-  ...attributes
->
+<div class={{class-map "consul-peer-form"}} ...attributes>
   <StateMachine
-    @src={{require './chart.xstate' from='/components/consul/peer/form'}}
-  as |fsm|>
+    @src={{require "./chart.xstate" from="/components/consul/peer/form"}}
+    as |fsm|
+  >
 
     <TabNav
       @items={{array
         (hash
-          label='Generate token'
-          selected=(state-matches fsm.state 'generate')
+          label=(t "components.consul.peer.form.generate-label")
+          selected=(state-matches fsm.state "generate")
           state="GENERATE"
         )
         (hash
-          label='Establish peering'
-          selected=(state-matches fsm.state 'initiate')
+          label=(t "components.consul.peer.form.establish-label")
+          selected=(state-matches fsm.state "initiate")
           state="INITIATE"
         )
       }}
-      @onTabClicked={{pick 'state' fsm.dispatch}}
+      @onTabClicked={{pick "state" fsm.dispatch}}
     />
 
-    <fsm.State @matches={{array 'generate'}}>
+    <fsm.State @matches={{array "generate"}}>
 
       <DataSource
-        @src={{uri '/${partition}/${nspace}/${dc}/peer-generate/'
-          @params
+        @src={{uri "/${partition}/${nspace}/${dc}/peer-generate/" @params}}
+        as |source|
+      >
+        {{yield
+          (hash Form=(component "consul/peer/form/generate" item=source.data))
         }}
-      as |source|>
-          {{yield (hash
-            Form=(component 'consul/peer/form/generate'
-              item=source.data
-            )
-          )
-          }}
       </DataSource>
 
     </fsm.State>
 
     <fsm.State @matches="initiate">
 
       <DataSource
-        @src={{uri '/${partition}/${nspace}/${dc}/peer-initiate/'
-          @params
+        @src={{uri "/${partition}/${nspace}/${dc}/peer-initiate/" @params}}
+        as |source|
+      >
+        {{yield
+          (hash Form=(component "consul/peer/form/initiate" item=source.data))
         }}
-      as |source|>
-          {{yield (hash
-              Form=(component 'consul/peer/form/initiate'
-                item=source.data
-              )
-            )
-          }}
       </DataSource>
 
     </fsm.State>
 
-
   </StateMachine>
 </div>
diff --git a/ui/packages/consul-ui/app/models/peer.js b/ui/packages/consul-ui/app/models/peer.js
@@ -17,6 +17,8 @@ export default class Peer extends Model {
   @attr('string') Name;
   @attr('string') State;
   @attr('string') ID;
+  @attr('string') ServerExternalAddresses;
+  @nullValue([]) @attr() ServerExternalAddresses;
 
   // only the side that establishes will hold this property
   @attr('string') PeerID;

diff --git a/ui/packages/consul-ui/app/services/repository/peer.js b/ui/packages/consul-ui/app/services/repository/peer.js
@@ -44,15 +44,19 @@ export default class PeerService extends RepositoryService {
     });
   }
 
-  @dataSource('/:partition/:ns/:dc/peering/token-for/:name')
-  async fetchToken({ dc, ns, partition, name }, configuration, request) {
+  @dataSource('/:partition/:ns/:dc/peering/token-for/:name/:externalAddresses')
+  async fetchToken({ dc, ns, partition, name, externalAddresses }, configuration, request) {
+    const ServerExternalAddresses =
+      externalAddresses?.length > 0 ? externalAddresses.split(',') : [];
+
     return (
       await request`
       POST /v1/peering/token
 
       ${{
         PeerName: name,
         Partition: partition || undefined,
+        ServerExternalAddresses,
       }}
     `
     )((headers, body, cache) => body);

diff --git a/ui/packages/consul-ui/tests/acceptance/dc/peers/create.feature b/ui/packages/consul-ui/tests/acceptance/dc/peers/create.feature
@@ -22,6 +22,7 @@ Feature: dc / peers / create: Peer Create Token
     ---
       body:
         PeerName: new-peer
+        ServerExternalAddresses: []
     ---
     Then I see the text "an-encoded-token" in ".consul-peer-form-generate code"
     When I click ".consul-peer-form-generate button[type=reset]"
@@ -33,11 +34,13 @@ Feature: dc / peers / create: Peer Create Token
     Then I fill in with yaml
     ---
       Name: another-new-peer
+      ServerExternalAddresses: "1.1.1.1:123,1.2.3.4:3202"
     ---
     When I click ".peer-create-modal .modal-dialog-footer button"
     Then a POST request was made to "/v1/peering/token" from yaml
     ---
       body:
         PeerName: another-new-peer
+        ServerExternalAddresses: ["1.1.1.1:123","1.2.3.4:3202"]
     ---
     Then I see the text "another-encoded-token" in ".consul-peer-form-generate code"
diff --git a/ui/packages/consul-ui/translations/common/en-us.yaml b/ui/packages/consul-ui/translations/common/en-us.yaml
@@ -81,4 +81,6 @@ validations:
     error: "{name} must be a valid DNS hostname."
   immutable:
     help: Once created, this cannot be changed.
-
+  server-external-addresses:
+    help: |
+      Enter a comma separated list of this peer's fallback server address(es) to be used in the event of failed automatic updates. This field is required for HCP-managed clusters.