From a62a6542e0a61831d33f9e3d2a9e066ab9127b76 Mon Sep 17 00:00:00 2001
From: Phil Renaud <phil.renaud@hashicorp.com>
Date: Mon, 12 Sep 2022 10:00:30 -0400
Subject: [PATCH] [ui] Service Discovery: provide a quick link to the Consul UI
 if available (#14537)

* Test for aggregate service health and consul agg service health

* If a consul UI link is present, show a nice little link

* Also add to job services page

* Reallocate consul url in mock
---
 .../components/allocation-service-sidebar.hbs | 27 ++++---
 .../components/allocation-service-sidebar.js  |  5 ++
 ui/app/components/job-service-row.js          |  5 ++
 .../templates/components/job-service-row.hbs  |  8 +-
 .../allocation-service-sidebar-test.js        | 78 +++++++++++++++++++
 5 files changed, 113 insertions(+), 10 deletions(-)

diff --git a/ui/app/components/allocation-service-sidebar.hbs b/ui/app/components/allocation-service-sidebar.hbs
index 73a55606518a..b4af0fd2fcf4 100644
--- a/ui/app/components/allocation-service-sidebar.hbs
+++ b/ui/app/components/allocation-service-sidebar.hbs
@@ -10,15 +10,17 @@
 		<header class="detail-header">
 			<h1 class="title">
 				{{@service.name}}
-				<span class="aggregate-status">
-					{{#if (eq this.aggregateStatus 'Unhealthy')}}
-						<FlightIcon @name="x-square-fill" @color="#c84034" />
-						Unhealthy
-					{{else}}
-						<FlightIcon @name="check-square-fill" @color="#25ba81" />
-						Healthy
-					{{/if}}
-				</span>
+				{{#if (not-eq @service.provider "consul")}}
+					<span class="aggregate-status">
+						{{#if (eq this.aggregateStatus 'Unhealthy')}}
+							<FlightIcon @name="x-square-fill" @color="#c84034" />
+							Unhealthy
+						{{else}}
+							<FlightIcon @name="check-square-fill" @color="#25ba81" />
+							Healthy
+						{{/if}}
+					</span>
+				{{/if}}
 			</h1>
 			<button
 				data-test-close-service-sidebar
@@ -126,5 +128,12 @@
 				</t.body>
 			</ListTable>
 		{{/if}}
+		{{#if (and (eq @service.provider "consul") this.consulRedirectLink)}}
+		<div data-test-consul-link-notice class="notification is-info">
+			<p>
+				Nomad cannot read health check information from Consul services, but you can <a href={{this.consulRedirectLink}} target="_blank" rel="noopener noreferrer">view this information in your Consul UI</a>.
+			</p>
+		</div>
+		{{/if}}
 	{{/if}}
 </div>
diff --git a/ui/app/components/allocation-service-sidebar.js b/ui/app/components/allocation-service-sidebar.js
index eae004e8342d..bab46f0ed645 100644
--- a/ui/app/components/allocation-service-sidebar.js
+++ b/ui/app/components/allocation-service-sidebar.js
@@ -3,6 +3,7 @@ import { inject as service } from '@ember/service';
 
 export default class AllocationServiceSidebarComponent extends Component {
   @service store;
+  @service system;
 
   get isSideBarOpen() {
     return !!this.args.service;
@@ -37,6 +38,10 @@ export default class AllocationServiceSidebarComponent extends Component {
       : 'Healthy';
   }
 
+  get consulRedirectLink() {
+    return this.system.agent.get('config')?.UI?.Consul?.BaseUIURL;
+  }
+
   get checks() {
     if (!this.args.service || !this.args.allocation) return [];
     let allocID = this.args.allocation.id;
diff --git a/ui/app/components/job-service-row.js b/ui/app/components/job-service-row.js
index 945864c4be72..6fce24a5c69c 100644
--- a/ui/app/components/job-service-row.js
+++ b/ui/app/components/job-service-row.js
@@ -4,6 +4,7 @@ import { inject as service } from '@ember/service';
 
 export default class JobServiceRowComponent extends Component {
   @service router;
+  @service system;
 
   @action
   gotoService(service) {
@@ -14,4 +15,8 @@ export default class JobServiceRowComponent extends Component {
       });
     }
   }
+
+  get consulRedirectLink() {
+    return this.system.agent.get('config')?.UI?.Consul?.BaseUIURL;
+  }
 }
diff --git a/ui/app/templates/components/job-service-row.hbs b/ui/app/templates/components/job-service-row.hbs
index b70a35b54d05..8b9403d8266a 100644
--- a/ui/app/templates/components/job-service-row.hbs
+++ b/ui/app/templates/components/job-service-row.hbs
@@ -18,7 +18,13 @@
 			<LinkTo class="is-primary" @route="jobs.job.services.service" @model={{@service}} @query={{hash level=@service.level}}>{{@service.name}}</LinkTo>
 		{{else}}
 			<FlightIcon @name="consul-color" />
-			{{@service.name}}
+			{{#if (and (eq @service.provider "consul") this.consulRedirectLink)}}
+				<a class="is-primary" href={{this.consulRedirectLink}} target="_blank" rel="noopener noreferrer">
+					{{@service.name}}
+				</a>
+			{{else}}
+				{{@service.name}}
+			{{/if}}
 		{{/if}}
   </td>
 	<td>
diff --git a/ui/tests/integration/components/allocation-service-sidebar-test.js b/ui/tests/integration/components/allocation-service-sidebar-test.js
index 142e2b81ae00..c970bde2d15f 100644
--- a/ui/tests/integration/components/allocation-service-sidebar-test.js
+++ b/ui/tests/integration/components/allocation-service-sidebar-test.js
@@ -3,11 +3,28 @@ import { setupRenderingTest } from 'ember-qunit';
 import { click, render } from '@ember/test-helpers';
 import { hbs } from 'ember-cli-htmlbars';
 import { componentA11yAudit } from 'nomad-ui/tests/helpers/a11y-audit';
+import Service from '@ember/service';
+import EmberObject from '@ember/object';
 
 module(
   'Integration | Component | allocation-service-sidebar',
   function (hooks) {
     setupRenderingTest(hooks);
+    hooks.beforeEach(function () {
+      const mockSystem = Service.extend({
+        agent: EmberObject.create({
+          config: {
+            UI: {
+              Consul: {
+                BaseUIURL: '',
+              },
+            },
+          },
+        }),
+      });
+      this.owner.register('service:system', mockSystem);
+      this.system = this.owner.lookup('service:system');
+    });
 
     test('it supports basic open/close states', async function (assert) {
       assert.expect(7);
@@ -34,5 +51,66 @@ module(
       assert.dom(this.element).hasText('');
       assert.dom('.sidebar').doesNotHaveClass('open');
     });
+
+    test('it correctly aggregates service health', async function (assert) {
+      const healthyService = {
+        name: 'Funky Service',
+        provider: 'nomad',
+        healthChecks: [
+          { Check: 'one', Status: 'success', Alloc: 'myAlloc' },
+          { Check: 'two', Status: 'success', Alloc: 'myAlloc' },
+        ],
+      };
+      const unhealthyService = {
+        name: 'Funky Service',
+        provider: 'nomad',
+        healthChecks: [
+          { Check: 'one', Status: 'failure', Alloc: 'myAlloc' },
+          { Check: 'two', Status: 'success', Alloc: 'myAlloc' },
+        ],
+      };
+
+      this.set('closeSidebar', () => this.set('service', null));
+      this.set('allocation', { id: 'myAlloc' });
+      this.set('service', healthyService);
+      await render(
+        hbs`<AllocationServiceSidebar @service={{this.service}} @allocation={{this.allocation}} @fns={{hash closeSidebar=this.closeSidebar}} />`
+      );
+      assert.dom('h1 .aggregate-status').includesText('Healthy');
+      assert
+        .dom('table.health-checks tbody tr')
+        .exists({ count: 2 }, 'has two rows');
+
+      this.set('service', unhealthyService);
+      await render(
+        hbs`<AllocationServiceSidebar @service={{this.service}} @allocation={{this.allocation}} @fns={{hash closeSidebar=this.closeSidebar}} />`
+      );
+      assert.dom('h1 .aggregate-status').includesText('Unhealthy');
+    });
+
+    test('it handles Consul services with reduced functionality', async function (assert) {
+      const consulService = {
+        name: 'Consul Service',
+        provider: 'consul',
+        healthChecks: [],
+      };
+
+      this.set('closeSidebar', () => this.set('service', null));
+      this.set('service', consulService);
+      await render(
+        hbs`<AllocationServiceSidebar @service={{this.service}} @fns={{hash closeSidebar=this.closeSidebar}} />`
+      );
+      assert.dom('h1 .aggregate-status').doesNotExist();
+      assert.dom('table.health-checks').doesNotExist();
+      assert.dom('[data-test-consul-link-notice]').doesNotExist();
+
+      this.system.agent.config.UI.Consul.BaseUIURL = 'http://localhost:8500';
+
+      await render(
+        hbs`<AllocationServiceSidebar @service={{this.service}} @fns={{hash closeSidebar=this.closeSidebar}} />`
+      );
+
+      assert.dom('[data-test-consul-link-notice]').exists();
+    });
   }
 );