From ea23bac1fb7258074aad2a090ff5c1633fbfafd5 Mon Sep 17 00:00:00 2001
From: wenincode <tyler.wendlandt@hashicorp.com>
Date: Thu, 24 Nov 2022 15:06:01 -0700
Subject: [PATCH] ui: Add ServerExternalAddresses field to token generation

---
 .../peer/form/generate/fieldsets/index.hbs    | 21 +++++++++++++++++++
 .../peer/form/generate/fieldsets/index.js     | 15 +++++++++++++
 .../consul/peer/form/generate/index.hbs       |  3 ++-
 ui/packages/consul-ui/app/models/peer.js      |  2 ++
 .../consul-ui/app/services/repository/peer.js |  8 +++++--
 .../consul-ui/translations/common/en-us.yaml  |  4 ++++
 6 files changed, 50 insertions(+), 3 deletions(-)
 create mode 100644 ui/packages/consul-peerings/app/components/consul/peer/form/generate/fieldsets/index.js

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
index f6fd4fcbc0..3c1a72ff24 100644
--- 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
@@ -36,5 +36,26 @@
       </fieldset>
 
     {{/let}}
+
+    {{#let
+      (hash
+        help=(t 'common.validations.server-external-addresses.help')
+      )
+    as |ServerExternalAddresses|}}
+      <fieldset>
+        <TextInput
+          @label="Server address(es)"
+          @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}}
   </StateMachine>
 </div>
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
new file mode 100644
index 0000000000..ea90d94060
--- /dev/null
+++ 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
index 0e4e63a658..2d9c160262 100644
--- 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
@@ -44,12 +44,13 @@
 
       <fsm.State @matches={{'loading'}}>
         <DataSource
-          @src={{uri '/${partition}/${nspace}/${dc}/peering/token-for/${name}'
+          @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
diff --git a/ui/packages/consul-ui/app/models/peer.js b/ui/packages/consul-ui/app/models/peer.js
index 6695253d8f..0e03544b95 100644
--- 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
index c39accbb51..63f65e38ad 100644
--- a/ui/packages/consul-ui/app/services/repository/peer.js
+++ b/ui/packages/consul-ui/app/services/repository/peer.js
@@ -44,8 +44,11 @@ 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
@@ -53,6 +56,7 @@ export default class PeerService extends RepositoryService {
       ${{
         PeerName: name,
         Partition: partition || undefined,
+        ServerExternalAddresses,
       }}
     `
     )((headers, body, cache) => body);
diff --git a/ui/packages/consul-ui/translations/common/en-us.yaml b/ui/packages/consul-ui/translations/common/en-us.yaml
index 8fce904302..04ce5ae95d 100644
--- a/ui/packages/consul-ui/translations/common/en-us.yaml
+++ b/ui/packages/consul-ui/translations/common/en-us.yaml
@@ -81,4 +81,8 @@ validations:
     error: "{name} must be a valid DNS hostname."
   immutable:
     help: Once created, this cannot be changed.
+  server-external-addresses:
+    help: |
+      Enter a fallback server address for this peer to be used in the event of failed automatic updates. This field is required for HCP-managed clusters.
+    test: "^$|^[a-zA-Z0-9]([a-zA-Z0-9-]'{0,62}'[a-zA-Z0-9])?$"