2018-08-29 09:00:15 +00:00
|
|
|
import { moduleFor, test } from 'ember-qunit';
|
|
|
|
import repo from 'consul-ui/tests/helpers/repo';
|
ui: Adds Partitions to the HTTP layer (#10447)
This PR mainly adds partition to our HTTP adapter. Additionally and perhaps most importantly, we've also taken the opportunity to move our 'conditional namespaces' deeper into the app.
The reason for doing this was, we like that namespaces should be thought of as required instead of conditional, 'special' things and would like the same thinking to be applied to partitions.
Now, instead of using code throughout the app throughout the adapters to add/remove namespaces or partitions depending on whether they are enabled or not. As a UI engineer you just pretend that namespaces and partitions are always enabled, and we remove them for you deeper in the app, out of the way of you forgetting to treat these properties as a special case.
Notes:
Added a PartitionAbility while we were there (not used as yet)
Started to remove the CONSTANT variables we had just for property names. I prefer that our adapters are as readable and straightforwards as possible, it just looks like HTTP.
We'll probably remove our formatDatacenter method we use also at some point, it was mainly too make it look the same as our previous formatNspace, but now we don't have that, it instead now looks different!
We enable parsing of partition in the UIs URL, but this is feature flagged so still does nothing just yet.
All of the test changes were related to the fact that we were treating client.url as a function rather than a method, and now that we reference this in client.url (etc) it needs binding to client.
2021-09-15 17:09:55 +00:00
|
|
|
import { env } from '../../../../env';
|
|
|
|
|
2018-08-29 09:00:15 +00:00
|
|
|
const NAME = 'kv';
|
2018-10-26 16:36:15 +00:00
|
|
|
moduleFor(`service:repository/${NAME}`, `Integration | Service | ${NAME}`, {
|
2018-08-29 09:00:15 +00:00
|
|
|
// Specify the other units that are required for this test.
|
2018-10-26 16:36:15 +00:00
|
|
|
integration: true,
|
2018-08-29 09:00:15 +00:00
|
|
|
});
|
|
|
|
const dc = 'dc-1';
|
|
|
|
const id = 'key-name';
|
2019-12-17 18:47:37 +00:00
|
|
|
const undefinedNspace = 'default';
|
2021-09-15 18:50:11 +00:00
|
|
|
const undefinedPartition = 'default';
|
|
|
|
const partition = 'default';
|
2019-12-17 18:47:37 +00:00
|
|
|
[undefinedNspace, 'team-1', undefined].forEach(nspace => {
|
|
|
|
test(`findAllBySlug returns the correct data for list endpoint when nspace is ${nspace}`, function(assert) {
|
|
|
|
return repo(
|
|
|
|
'Kv',
|
|
|
|
'findAllBySlug',
|
|
|
|
this.subject(),
|
|
|
|
function retrieveTest(stub) {
|
|
|
|
return stub(
|
2021-09-15 18:50:11 +00:00
|
|
|
`/v1/kv/${id}?keys&dc=${dc}${typeof nspace !== 'undefined' ? `&ns=${nspace}` : ``}${
|
|
|
|
typeof partition !== 'undefined' ? `&partition=${partition}` : ``
|
|
|
|
}`,
|
2019-12-17 18:47:37 +00:00
|
|
|
{
|
|
|
|
CONSUL_KV_COUNT: '1',
|
|
|
|
}
|
|
|
|
);
|
|
|
|
},
|
|
|
|
function performTest(service) {
|
2021-09-15 18:50:11 +00:00
|
|
|
return service.findAllBySlug({
|
|
|
|
id,
|
|
|
|
dc,
|
|
|
|
ns: nspace || undefinedNspace,
|
|
|
|
partition: partition || undefinedPartition,
|
|
|
|
});
|
2019-12-17 18:47:37 +00:00
|
|
|
},
|
|
|
|
function performAssertion(actual, expected) {
|
ui: Adds Partitions to the HTTP layer (#10447)
This PR mainly adds partition to our HTTP adapter. Additionally and perhaps most importantly, we've also taken the opportunity to move our 'conditional namespaces' deeper into the app.
The reason for doing this was, we like that namespaces should be thought of as required instead of conditional, 'special' things and would like the same thinking to be applied to partitions.
Now, instead of using code throughout the app throughout the adapters to add/remove namespaces or partitions depending on whether they are enabled or not. As a UI engineer you just pretend that namespaces and partitions are always enabled, and we remove them for you deeper in the app, out of the way of you forgetting to treat these properties as a special case.
Notes:
Added a PartitionAbility while we were there (not used as yet)
Started to remove the CONSTANT variables we had just for property names. I prefer that our adapters are as readable and straightforwards as possible, it just looks like HTTP.
We'll probably remove our formatDatacenter method we use also at some point, it was mainly too make it look the same as our previous formatNspace, but now we don't have that, it instead now looks different!
We enable parsing of partition in the UIs URL, but this is feature flagged so still does nothing just yet.
All of the test changes were related to the fact that we were treating client.url as a function rather than a method, and now that we reference this in client.url (etc) it needs binding to client.
2021-09-15 17:09:55 +00:00
|
|
|
const expectedNspace = env('CONSUL_NSPACES_ENABLED')
|
|
|
|
? nspace || undefinedNspace
|
|
|
|
: 'default';
|
2021-09-15 18:50:11 +00:00
|
|
|
const expectedPartition = env('CONSUL_PARTITIONS_ENABLED')
|
|
|
|
? partition || undefinedPartition
|
|
|
|
: 'default';
|
2019-12-17 18:47:37 +00:00
|
|
|
assert.deepEqual(
|
|
|
|
actual,
|
|
|
|
expected(function(payload) {
|
|
|
|
return payload.map(item => {
|
|
|
|
return {
|
|
|
|
Datacenter: dc,
|
ui: Adds Partitions to the HTTP layer (#10447)
This PR mainly adds partition to our HTTP adapter. Additionally and perhaps most importantly, we've also taken the opportunity to move our 'conditional namespaces' deeper into the app.
The reason for doing this was, we like that namespaces should be thought of as required instead of conditional, 'special' things and would like the same thinking to be applied to partitions.
Now, instead of using code throughout the app throughout the adapters to add/remove namespaces or partitions depending on whether they are enabled or not. As a UI engineer you just pretend that namespaces and partitions are always enabled, and we remove them for you deeper in the app, out of the way of you forgetting to treat these properties as a special case.
Notes:
Added a PartitionAbility while we were there (not used as yet)
Started to remove the CONSTANT variables we had just for property names. I prefer that our adapters are as readable and straightforwards as possible, it just looks like HTTP.
We'll probably remove our formatDatacenter method we use also at some point, it was mainly too make it look the same as our previous formatNspace, but now we don't have that, it instead now looks different!
We enable parsing of partition in the UIs URL, but this is feature flagged so still does nothing just yet.
All of the test changes were related to the fact that we were treating client.url as a function rather than a method, and now that we reference this in client.url (etc) it needs binding to client.
2021-09-15 17:09:55 +00:00
|
|
|
Namespace: expectedNspace,
|
2021-09-15 18:50:11 +00:00
|
|
|
Partition: expectedPartition,
|
|
|
|
uid: `["${expectedPartition}","${expectedNspace}","${dc}","${item}"]`,
|
2019-12-17 18:47:37 +00:00
|
|
|
Key: item,
|
|
|
|
};
|
|
|
|
});
|
|
|
|
})
|
|
|
|
);
|
|
|
|
}
|
|
|
|
);
|
|
|
|
});
|
|
|
|
test(`findBySlug returns the correct data for item endpoint when nspace is ${nspace}`, function(assert) {
|
|
|
|
return repo(
|
|
|
|
'Kv',
|
|
|
|
'findBySlug',
|
|
|
|
this.subject(),
|
|
|
|
function(stub) {
|
2021-09-15 18:50:11 +00:00
|
|
|
return stub(
|
|
|
|
`/v1/kv/${id}?dc=${dc}${typeof nspace !== 'undefined' ? `&ns=${nspace}` : ``}${
|
|
|
|
typeof partition !== 'undefined' ? `&partition=${partition}` : ``
|
|
|
|
}`
|
|
|
|
);
|
2019-12-17 18:47:37 +00:00
|
|
|
},
|
|
|
|
function(service) {
|
2021-09-15 18:50:11 +00:00
|
|
|
return service.findBySlug({
|
|
|
|
id,
|
|
|
|
dc,
|
|
|
|
ns: nspace || undefinedNspace,
|
|
|
|
partition: partition || undefinedPartition,
|
|
|
|
});
|
2019-12-17 18:47:37 +00:00
|
|
|
},
|
|
|
|
function(actual, expected) {
|
|
|
|
assert.deepEqual(
|
|
|
|
actual,
|
|
|
|
expected(function(payload) {
|
|
|
|
const item = payload[0];
|
|
|
|
return Object.assign({}, item, {
|
2018-08-29 09:00:15 +00:00
|
|
|
Datacenter: dc,
|
2019-12-17 18:47:37 +00:00
|
|
|
Namespace: item.Namespace || undefinedNspace,
|
2021-09-15 18:50:11 +00:00
|
|
|
Partition: item.Partition || undefinedPartition,
|
|
|
|
uid: `["${item.Partition || undefinedPartition}","${item.Namespace ||
|
|
|
|
undefinedNspace}","${dc}","${item.Key}"]`,
|
2019-12-17 18:47:37 +00:00
|
|
|
});
|
|
|
|
})
|
|
|
|
);
|
|
|
|
}
|
|
|
|
);
|
|
|
|
});
|
2018-08-29 09:00:15 +00:00
|
|
|
});
|