- {{#if (gt proxy.Proxy.Upstreams.length 0)}}
+ {{#if (gt proxy.Service.Proxy.Upstreams.length 0)}}
{{/if}}
- {{#if (gt proxy.Proxy.Expose.Paths.length 0)}}
+ {{#if (gt proxy.Service.Proxy.Expose.Paths.length 0)}}
Exposed paths
The following list shows individual HTTP paths exposed through Envoy for external services like Prometheus. Read more about this in our documentation.
-
+
{{/if}}
{{#if (or (gt proxy.ServiceChecks.length 0) (gt proxy.NodeChecks.length 0))}}
diff --git a/ui-v2/app/templates/dc/services/show.hbs b/ui-v2/app/templates/dc/services/show.hbs
index 0519602f62..f74e043bf8 100644
--- a/ui-v2/app/templates/dc/services/show.hbs
+++ b/ui-v2/app/templates/dc/services/show.hbs
@@ -1,9 +1,9 @@
-{{title item.Service.Service}}
-
+
+{{title item.Service.Service}}
{{partial 'dc/services/notifications'}}
diff --git a/ui-v2/app/templates/dc/services/show/instances.hbs b/ui-v2/app/templates/dc/services/show/instances.hbs
index 5c5a4ca79b..b919a1cd82 100644
--- a/ui-v2/app/templates/dc/services/show/instances.hbs
+++ b/ui-v2/app/templates/dc/services/show/instances.hbs
@@ -9,7 +9,7 @@
{{/if}}
-
+
diff --git a/ui-v2/app/templates/dc/services/show/tags.hbs b/ui-v2/app/templates/dc/services/show/tags.hbs
index 7184728017..016fe25b34 100644
--- a/ui-v2/app/templates/dc/services/show/tags.hbs
+++ b/ui-v2/app/templates/dc/services/show/tags.hbs
@@ -1,8 +1,9 @@
diff --git a/ui-v2/app/utils/create-fingerprinter.js b/ui-v2/app/utils/create-fingerprinter.js
index 69d2da8a00..9b3843257b 100644
--- a/ui-v2/app/utils/create-fingerprinter.js
+++ b/ui-v2/app/utils/create-fingerprinter.js
@@ -1,3 +1,4 @@
+import { get } from '@ember/object';
export default function(foreignKey, nspaceKey, hash = JSON.stringify) {
return function(primaryKey, slugKey, foreignKeyValue) {
if (foreignKeyValue == null || foreignKeyValue.length < 1) {
@@ -6,12 +7,12 @@ export default function(foreignKey, nspaceKey, hash = JSON.stringify) {
return function(item) {
const slugKeys = slugKey.split(',');
const slugValues = slugKeys.map(function(slugKey) {
- if (item[slugKey] == null || item[slugKey].length < 1) {
+ if (get(item, slugKey) == null || get(item, slugKey).length < 1) {
throw new Error('Unable to create fingerprint, missing slug');
}
- return item[slugKey];
+ return get(item, slugKey);
});
- const nspaceValue = item[nspaceKey] || 'default';
+ const nspaceValue = get(item, nspaceKey) || 'default';
return {
...item,
...{
diff --git a/ui-v2/tests/integration/adapters/service-instance-test.js b/ui-v2/tests/integration/adapters/service-instance-test.js
new file mode 100644
index 0000000000..ab9b0ca44b
--- /dev/null
+++ b/ui-v2/tests/integration/adapters/service-instance-test.js
@@ -0,0 +1,36 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+import { env } from '../../../env';
+const shouldHaveNspace = function(nspace) {
+ return typeof nspace !== 'undefined' && env('CONSUL_NSPACES_ENABLED');
+};
+module('Integration | Adapter | service-instance', function(hooks) {
+ setupTest(hooks);
+ const dc = 'dc-1';
+ const id = 'service-name';
+ const undefinedNspace = 'default';
+ [undefinedNspace, 'team-1', undefined].forEach(nspace => {
+ test(`requestForQueryRecord returns the correct url/method when nspace is ${nspace}`, function(assert) {
+ const adapter = this.owner.lookup('adapter:service-instance');
+ const client = this.owner.lookup('service:client/http');
+ const expected = `GET /v1/health/service/${id}?dc=${dc}${
+ shouldHaveNspace(nspace) ? `&ns=${nspace}` : ``
+ }`;
+ let actual = adapter.requestForQueryRecord(client.requestParams.bind(client), {
+ dc: dc,
+ id: id,
+ ns: nspace,
+ });
+ assert.equal(`${actual.method} ${actual.url}`, expected);
+ });
+ });
+ test("requestForQueryRecord throws if you don't specify an id", function(assert) {
+ const adapter = this.owner.lookup('adapter:service-instance');
+ const client = this.owner.lookup('service:client/http');
+ assert.throws(function() {
+ adapter.requestForQueryRecord(client.url, {
+ dc: dc,
+ });
+ });
+ });
+});
diff --git a/ui-v2/tests/integration/serializers/service-instance-test.js b/ui-v2/tests/integration/serializers/service-instance-test.js
new file mode 100644
index 0000000000..e53b6ce3f9
--- /dev/null
+++ b/ui-v2/tests/integration/serializers/service-instance-test.js
@@ -0,0 +1,54 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+import { get } from 'consul-ui/tests/helpers/api';
+import {
+ HEADERS_SYMBOL as META,
+ HEADERS_DATACENTER as DC,
+ HEADERS_NAMESPACE as NSPACE,
+} from 'consul-ui/utils/http/consul';
+module('Integration | Serializer | service-instance', function(hooks) {
+ setupTest(hooks);
+ const dc = 'dc-1';
+ const undefinedNspace = 'default';
+ [undefinedNspace, 'team-1', undefined].forEach(nspace => {
+ test(`respondForQueryRecord returns the correct data for item endpoint when nspace is ${nspace}`, function(assert) {
+ const serializer = this.owner.lookup('serializer:service-instance');
+ const id = 'service-name';
+ const node = 'node-0';
+ const request = {
+ url: `/v1/health/service/${id}?dc=${dc}${
+ typeof nspace !== 'undefined' ? `&ns=${nspace}` : ``
+ }`,
+ };
+ return get(request.url).then(function(payload) {
+ payload[0].Node.Node = node;
+ payload[0].Service.ID = id;
+ const expected = {
+ ...payload[0],
+ Datacenter: dc,
+ [META]: {
+ [DC.toLowerCase()]: dc,
+ [NSPACE.toLowerCase()]: payload[0].Service.Namespace || undefinedNspace,
+ },
+ Namespace: payload[0].Service.Namespace || undefinedNspace,
+ uid: `["${payload[0].Service.Namespace || undefinedNspace}","${dc}","${node}","${id}"]`,
+ };
+ const actual = serializer.respondForQueryRecord(
+ function(cb) {
+ const headers = {};
+ const body = payload;
+ return cb(headers, body);
+ },
+ {
+ dc: dc,
+ ns: nspace,
+ id: id,
+ node: node,
+ serviceId: id,
+ }
+ );
+ assert.deepEqual(actual, expected);
+ });
+ });
+ });
+});
diff --git a/ui-v2/tests/integration/serializers/service-test.js b/ui-v2/tests/integration/serializers/service-test.js
index 636f644714..c46dbb6754 100644
--- a/ui-v2/tests/integration/serializers/service-test.js
+++ b/ui-v2/tests/integration/serializers/service-test.js
@@ -1,11 +1,6 @@
import { module, test } from 'qunit';
import { setupTest } from 'ember-qunit';
import { get } from 'consul-ui/tests/helpers/api';
-import {
- HEADERS_SYMBOL as META,
- HEADERS_DATACENTER as DC,
- HEADERS_NAMESPACE as NSPACE,
-} from 'consul-ui/utils/http/consul';
module('Integration | Serializer | service', function(hooks) {
setupTest(hooks);
const dc = 'dc-1';
@@ -73,40 +68,5 @@ module('Integration | Serializer | service', function(hooks) {
assert.deepEqual(actual, expected);
});
});
- test(`respondForQueryRecord returns the correct data for item endpoint when nspace is ${nspace}`, function(assert) {
- const serializer = this.owner.lookup('serializer:service');
- const id = 'service-name';
- const request = {
- url: `/v1/health/service/${id}?dc=${dc}${
- typeof nspace !== 'undefined' ? `&ns=${nspace}` : ``
- }`,
- };
- return get(request.url).then(function(payload) {
- const expected = {
- Datacenter: dc,
- [META]: {
- [DC.toLowerCase()]: dc,
- [NSPACE.toLowerCase()]: payload[0].Service.Namespace || undefinedNspace,
- },
- Namespace: payload[0].Service.Namespace || undefinedNspace,
- uid: `["${payload[0].Service.Namespace || undefinedNspace}","${dc}","${id}"]`,
- Name: id,
- Nodes: payload,
- };
- const actual = serializer.respondForQueryRecord(
- function(cb) {
- const headers = {};
- const body = payload;
- return cb(headers, body);
- },
- {
- dc: dc,
- ns: nspace,
- id: id,
- }
- );
- assert.deepEqual(actual, expected);
- });
- });
});
});
diff --git a/ui-v2/tests/integration/services/repository/service-test.js b/ui-v2/tests/integration/services/repository/service-test.js
index a3c87edbea..677d05eec6 100644
--- a/ui-v2/tests/integration/services/repository/service-test.js
+++ b/ui-v2/tests/integration/services/repository/service-test.js
@@ -7,89 +7,9 @@ moduleFor(`service:repository/${NAME}`, `Integration | Service | ${NAME}`, {
integration: true,
});
const dc = 'dc-1';
-const id = 'token-name';
const now = new Date().getTime();
const undefinedNspace = 'default';
[undefinedNspace, 'team-1', undefined].forEach(nspace => {
- test(`findInstanceBySlug calls findBySlug with the correct arguments when nspace is ${nspace}`, function(assert) {
- assert.expect(4);
- const id = 'id';
- const slug = 'slug';
- const node = 'node-name';
-
- const datacenter = 'dc-1';
- const conf = {
- cursor: 1,
- };
- const service = this.subject();
- service.findBySlug = function(slug, dc, nspace, configuration) {
- assert.equal(
- arguments.length,
- 4,
- 'Expected to be called with the correct number of arguments'
- );
- assert.equal(dc, datacenter);
- assert.deepEqual(configuration, conf);
- return Promise.resolve({ Nodes: [] });
- };
- // This will throw an error as we don't resolve any services that match what was requested
- // so a 404 is the correct error response
- return service.findInstanceBySlug(id, slug, node, datacenter, nspace, conf).catch(function(e) {
- assert.equal(e.errors[0].status, '404');
- });
- });
-
- test(`findBySlug returns the correct data for item endpoint when the nspace is ${nspace}`, function(assert) {
- return repo(
- 'Service',
- 'findBySlug',
- this.subject(),
- function(stub) {
- return stub(
- `/v1/health/service/${id}?dc=${dc}${
- typeof nspace !== 'undefined' ? `&ns=${nspace}` : ``
- }`,
- {
- CONSUL_NODE_COUNT: 1,
- }
- );
- },
- function(service) {
- return service.findBySlug(id, dc, nspace || undefinedNspace);
- },
- function(actual, expected) {
- assert.deepEqual(
- actual,
- expected(function(payload) {
- // TODO: So this tree is all 'wrong', it's not having any major impact
- // this this tree needs revisting to something that makes more sense
- payload = Object.assign(
- {},
- { Nodes: payload },
- {
- Datacenter: dc,
- Namespace: payload[0].Service.Namespace || undefinedNspace,
- uid: `["${payload[0].Service.Namespace || undefinedNspace}","${dc}","${id}"]`,
- }
- );
- const nodes = payload.Nodes;
- const service = payload.Nodes[0];
- service.Nodes = nodes;
- service.Tags = [...new Set(payload.Nodes[0].Service.Tags)];
- service.Namespace = payload.Namespace;
- service.meta = {
- cacheControl: undefined,
- cursor: undefined,
- dc: dc,
- nspace: payload.Namespace,
- };
-
- return service;
- })
- );
- }
- );
- });
test(`findGatewayBySlug returns the correct data for list endpoint when nspace is ${nspace}`, function(assert) {
get(this.subject(), 'store').serializerFor(NAME).timestamp = function() {
return now;
diff --git a/ui-v2/tests/unit/adapters/service-instance-test.js b/ui-v2/tests/unit/adapters/service-instance-test.js
new file mode 100644
index 0000000000..d2f3eff5c8
--- /dev/null
+++ b/ui-v2/tests/unit/adapters/service-instance-test.js
@@ -0,0 +1,12 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Adapter | service-instance', function(hooks) {
+ setupTest(hooks);
+
+ // Replace this with your real tests.
+ test('it exists', function(assert) {
+ let adapter = this.owner.lookup('adapter:service-instance');
+ assert.ok(adapter);
+ });
+});
diff --git a/ui-v2/tests/unit/models/service-instance-test.js b/ui-v2/tests/unit/models/service-instance-test.js
new file mode 100644
index 0000000000..b18d0ee706
--- /dev/null
+++ b/ui-v2/tests/unit/models/service-instance-test.js
@@ -0,0 +1,13 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Model | service-instance', function(hooks) {
+ setupTest(hooks);
+
+ // Replace this with your real tests.
+ test('it exists', function(assert) {
+ let store = this.owner.lookup('service:store');
+ let model = store.createRecord('service-instance', {});
+ assert.ok(model);
+ });
+});
diff --git a/ui-v2/tests/unit/serializers/service-instance-test.js b/ui-v2/tests/unit/serializers/service-instance-test.js
new file mode 100644
index 0000000000..9402e194f3
--- /dev/null
+++ b/ui-v2/tests/unit/serializers/service-instance-test.js
@@ -0,0 +1,23 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Serializer | service-instance', function(hooks) {
+ setupTest(hooks);
+
+ // Replace this with your real tests.
+ test('it exists', function(assert) {
+ let store = this.owner.lookup('service:store');
+ let serializer = store.serializerFor('service-instance');
+
+ assert.ok(serializer);
+ });
+
+ test('it serializes records', function(assert) {
+ let store = this.owner.lookup('service:store');
+ let record = store.createRecord('service-instance', {});
+
+ let serializedRecord = record.serialize();
+
+ assert.ok(serializedRecord);
+ });
+});
diff --git a/ui-v2/tests/unit/services/repository/service-instance-test.js b/ui-v2/tests/unit/services/repository/service-instance-test.js
new file mode 100644
index 0000000000..5ddd6789cd
--- /dev/null
+++ b/ui-v2/tests/unit/services/repository/service-instance-test.js
@@ -0,0 +1,12 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Repository | service-instance', function(hooks) {
+ setupTest(hooks);
+
+ // Replace this with your real tests.
+ test('it exists', function(assert) {
+ const repo = this.owner.lookup('service:repository/service-instance');
+ assert.ok(repo);
+ });
+});