mirror of
https://github.com/status-im/consul.git
synced 2025-01-19 02:03:00 +00:00
fc14a412fd
* 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
70 lines
2.4 KiB
JavaScript
70 lines
2.4 KiB
JavaScript
import RepositoryService from 'consul-ui/services/repository';
|
|
import { inject as service } from '@ember/service';
|
|
import { set } from '@ember/object';
|
|
import { ACCESS_READ } from 'consul-ui/abilities/base';
|
|
import dataSource from 'consul-ui/decorators/data-source';
|
|
|
|
const modelName = 'service-instance';
|
|
export default class ServiceInstanceService extends RepositoryService {
|
|
@service('repository/proxy') proxyRepo;
|
|
getModelName() {
|
|
return modelName;
|
|
}
|
|
|
|
@dataSource('/:partition/:ns/:dc/service-instances/for-service/:id')
|
|
async findByService(params, configuration = {}) {
|
|
if (typeof configuration.cursor !== 'undefined') {
|
|
params.index = configuration.cursor;
|
|
params.uri = configuration.uri;
|
|
}
|
|
return this.authorizeBySlug(
|
|
async () => this.store.query(this.getModelName(), params),
|
|
ACCESS_READ,
|
|
params
|
|
);
|
|
}
|
|
|
|
@dataSource('/:partition/:ns/:dc/service-instance/:serviceId/:node/:id')
|
|
async findBySlug(params, configuration = {}) {
|
|
if (typeof configuration.cursor !== 'undefined') {
|
|
params.index = configuration.cursor;
|
|
params.uri = configuration.uri;
|
|
}
|
|
return this.authorizeBySlug(
|
|
async () => this.store.queryRecord(this.getModelName(), params),
|
|
ACCESS_READ,
|
|
params
|
|
);
|
|
}
|
|
|
|
@dataSource('/:partition/:ns/:dc/proxy-service-instance/:serviceId/:node/:id')
|
|
async findProxyBySlug(params, configuration = {}) {
|
|
const instance = await this.findBySlug(...arguments);
|
|
let proxy = this.store.peekRecord('proxy', instance.uid);
|
|
// Currently, we call the proxy endpoint before this endpoint
|
|
// therefore proxy is never undefined. If we ever call this endpoint
|
|
// first we'll need to do something like the following
|
|
// if(typeof proxy === 'undefined') {
|
|
// await proxyRepo.create({})
|
|
// }
|
|
|
|
// Copy over all the things to the ProxyServiceInstance
|
|
['Service', 'Node', 'meta'].forEach(prop => {
|
|
set(proxy, prop, instance[prop]);
|
|
});
|
|
['Checks'].forEach(prop => {
|
|
// completely wipe out any previous values so we don't accumulate things
|
|
// eternally
|
|
proxy.set(prop, []);
|
|
instance[prop].forEach(item => {
|
|
if (typeof item !== 'undefined') {
|
|
proxy[prop].addFragment(item.copy());
|
|
}
|
|
});
|
|
});
|
|
// delete the ServiceInstance record as we now have a ProxyServiceInstance
|
|
instance.unloadRecord();
|
|
return proxy;
|
|
}
|
|
}
|