dc89b8d340
Nodes themselves are not namespaced, so we'd originally assumed we did not need to pass through the ns query parameter when listing or viewing nodes. As it turns out the API endpoints we use to list and view nodes (and related things) return things that are namespaced, therefore any API requests for nodes do require a the ns query parameter to be passed through to the request. This PR adds the necessary ns query param to all things Node, apart from the querying for the leader which only returns node related information. Additionally here we decided to show 0 Services text in the node listing if there are nodes with no service instances within the namespace you are viewing, as this is clearer than showing nothing at all. We also cleaned up/standardized the text we use to in the empty state for service instances.
59 lines
2.3 KiB
JavaScript
59 lines
2.3 KiB
JavaScript
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 | node', function(hooks) {
|
|
setupTest(hooks);
|
|
const dc = 'dc-1';
|
|
const id = 'node-name';
|
|
const undefinedNspace = 'default';
|
|
[undefinedNspace, 'team-1', undefined].forEach(nspace => {
|
|
test(`requestForQuery returns the correct url when nspace is ${nspace}`, function(assert) {
|
|
const adapter = this.owner.lookup('adapter:node');
|
|
const client = this.owner.lookup('service:client/http');
|
|
const expected = `GET /v1/internal/ui/nodes?dc=${dc}${
|
|
shouldHaveNspace(nspace) ? `&ns=${nspace}` : ``
|
|
}`;
|
|
const actual = adapter.requestForQuery(client.requestParams.bind(client), {
|
|
dc: dc,
|
|
ns: nspace,
|
|
});
|
|
assert.equal(`${actual.method} ${actual.url}`, expected);
|
|
});
|
|
test(`requestForQueryRecord returns the correct url when the nspace is ${nspace}`, function(assert) {
|
|
const adapter = this.owner.lookup('adapter:node');
|
|
const client = this.owner.lookup('service:client/http');
|
|
const expected = `GET /v1/internal/ui/node/${id}?dc=${dc}${
|
|
shouldHaveNspace(nspace) ? `&ns=${nspace}` : ``
|
|
}`;
|
|
const actual = adapter.requestForQueryRecord(client.requestParams.bind(client), {
|
|
dc: dc,
|
|
id: id,
|
|
ns: nspace,
|
|
});
|
|
assert.equal(`${actual.method} ${actual.url}`, expected);
|
|
});
|
|
});
|
|
// the following don't require nspacing
|
|
test("requestForQueryRecord throws if you don't specify an id", function(assert) {
|
|
const adapter = this.owner.lookup('adapter:node');
|
|
const client = this.owner.lookup('service:client/http');
|
|
assert.throws(function() {
|
|
adapter.requestForQueryRecord(client.url, {
|
|
dc: dc,
|
|
});
|
|
});
|
|
});
|
|
test('requestForQueryLeader returns the correct url', function(assert) {
|
|
const adapter = this.owner.lookup('adapter:node');
|
|
const client = this.owner.lookup('service:client/http');
|
|
const expected = `GET /v1/status/leader?dc=${dc}`;
|
|
const actual = adapter.requestForQueryLeader(client.requestParams.bind(client), {
|
|
dc: dc,
|
|
});
|
|
assert.equal(`${actual.method} ${actual.url}`, expected);
|
|
});
|
|
});
|