eeb04ae436
* Add Partition to all our models * Add partitions into our serializers/fingerprinting * Make some amends to a few adapters ready for partitions * Amend blueprints to avoid linting error * Update all our repositories to include partitions, also Remove enabled/disable nspace repo and just use a nspace with conditionals * Ensure nspace and parition parameters always return '' no matter what * Ensure data-sink finds the model properly This will later be replaced by a @dataSink decorator but we are find kicking that can down the road a little more * Add all the new partition data layer * Add a way to set the title of the page from inside the route and make it accessibile via a route announcer * Make the Consul Route the default/basic one * Tweak nspace and partition abilities not to check the length * Thread partition through all the components that need it * Some ACL tweaks * Move the entire app to use partitions * Delete all the tests we no longer need * Update some Unit tests to use partition * Fix up KV title tests * Fix up a few more acceptance tests * Fixup and temporarily ignore some acceptance tests * Stop using ember-cli-page-objects fillable as it doesn't seem to work * Fix lint error * Remove old ACL related test * Add a tick after filling out forms * Fix token warning modal * Found some more places where we need a partition var * Fixup some more acceptance tests * Tokens still needs a repo service for CRUD * Remove acceptance tests we no longer need * Fixup and "FIXME ignore" a few tests * Remove an s * Disable blocking queries for KV to revert to previous release for now * Fixup adapter tests to follow async/function resolving interface * Fixup all the serializer integration tests * Fixup service/repo integration tests * Fixup deleting acceptance test * Fixup some ent tests * Make sure nspaces passes the dc through for when thats important * ...aaaand acceptance nspaces with the extra dc param
89 lines
2.2 KiB
JavaScript
89 lines
2.2 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 {
|
|
async requestForQuery(request, { dc, ns, partition, index, id, separator }) {
|
|
if (typeof id === 'undefined') {
|
|
throw new Error('You must specify an id');
|
|
}
|
|
const respond = await request`
|
|
GET /v1/kv/${keyToArray(id)}?${{ [API_KEYS_KEY]: null, dc, separator }}
|
|
|
|
${{
|
|
ns,
|
|
partition,
|
|
index,
|
|
}}
|
|
`;
|
|
await respond((headers, body) => delete headers['x-consul-index']);
|
|
return respond;
|
|
}
|
|
|
|
async 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}
|
|
`;
|
|
}
|
|
}
|