a509655d0b
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.
87 lines
2.1 KiB
JavaScript
87 lines
2.1 KiB
JavaScript
import Adapter from './application';
|
|
import isFolder from 'consul-ui/utils/isFolder';
|
|
import keyToArray from 'consul-ui/utils/keyToArray';
|
|
import { SLUG_KEY } from 'consul-ui/models/kv';
|
|
|
|
// TODO: Update to use this.formatDatacenter()
|
|
const API_KEYS_KEY = 'keys';
|
|
|
|
export default class KvAdapter extends Adapter {
|
|
requestForQuery(request, { dc, ns, partition, index, id, separator }) {
|
|
if (typeof id === 'undefined') {
|
|
throw new Error('You must specify an id');
|
|
}
|
|
return request`
|
|
GET /v1/kv/${keyToArray(id)}?${{ [API_KEYS_KEY]: null, dc, separator }}
|
|
|
|
${{
|
|
ns,
|
|
partition,
|
|
index,
|
|
}}
|
|
`;
|
|
}
|
|
|
|
requestForQueryRecord(request, { dc, ns, partition, index, id }) {
|
|
if (typeof id === 'undefined') {
|
|
throw new Error('You must specify an id');
|
|
}
|
|
return request`
|
|
GET /v1/kv/${keyToArray(id)}?${{ dc }}
|
|
|
|
${{
|
|
ns,
|
|
partition,
|
|
index,
|
|
}}
|
|
`;
|
|
}
|
|
|
|
// TODO: Should we replace text/plain here with x-www-form-encoded? See
|
|
// https://github.com/hashicorp/consul/issues/3804
|
|
requestForCreateRecord(request, serialized, data) {
|
|
const params = {
|
|
dc: data.Datacenter,
|
|
ns: data.Namespace,
|
|
partition: data.Partition,
|
|
};
|
|
return request`
|
|
PUT /v1/kv/${keyToArray(data[SLUG_KEY])}?${params}
|
|
Content-Type: text/plain; charset=utf-8
|
|
|
|
${serialized}
|
|
`;
|
|
}
|
|
|
|
requestForUpdateRecord(request, serialized, data) {
|
|
const params = {
|
|
dc: data.Datacenter,
|
|
ns: data.Namespace,
|
|
partition: data.Partition,
|
|
flags: data.Flags,
|
|
};
|
|
return request`
|
|
PUT /v1/kv/${keyToArray(data[SLUG_KEY])}?${params}
|
|
Content-Type: text/plain; charset=utf-8
|
|
|
|
${serialized}
|
|
`;
|
|
}
|
|
|
|
requestForDeleteRecord(request, serialized, data) {
|
|
let recurse;
|
|
if (isFolder(data[SLUG_KEY])) {
|
|
recurse = null;
|
|
}
|
|
const params = {
|
|
dc: data.Datacenter,
|
|
ns: data.Namespace,
|
|
partition: data.Partition,
|
|
recurse,
|
|
};
|
|
return request`
|
|
DELETE /v1/kv/${keyToArray(data[SLUG_KEY])}?${params}
|
|
`;
|
|
}
|
|
}
|