5b7a48e273
* ui: Ensure we use nonEmptySet everywhere where we add Namespace We missed a coupld of places where we use the noEmptySet function, which will only perform the set if the specified property is non-empty. Currently we aren't certain there is a place in OSS where a Namespace can make its way down via the API and endup being PUT/POSTed back out again when saved. If this did ever happen we would assume it would be the default namespace, but we add an extra check here to ensure we never PUT/POST the Namespace property if Namespaces are disabled. * ui: Add step/assertion for assert if a property is NOT set in the body * ui: Improve updated/create acc testing for policy/token/roles: Including making sure a Namespace property is never sent through if you are running without namespace support
83 lines
2.2 KiB
JavaScript
83 lines
2.2 KiB
JavaScript
import Adapter from './application';
|
|
|
|
import { SLUG_KEY } from 'consul-ui/models/role';
|
|
import { FOREIGN_KEY as DATACENTER_KEY } from 'consul-ui/models/dc';
|
|
import { NSPACE_KEY } from 'consul-ui/models/nspace';
|
|
|
|
import { env } from 'consul-ui/env';
|
|
import nonEmptySet from 'consul-ui/utils/non-empty-set';
|
|
|
|
let Namespace;
|
|
if (env('CONSUL_NSPACES_ENABLED')) {
|
|
Namespace = nonEmptySet('Namespace');
|
|
} else {
|
|
Namespace = () => ({});
|
|
}
|
|
// TODO: Update to use this.formatDatacenter()
|
|
export default Adapter.extend({
|
|
requestForQuery: function(request, { dc, ns, index, id }) {
|
|
return request`
|
|
GET /v1/acl/roles?${{ dc }}
|
|
|
|
${{
|
|
...this.formatNspace(ns),
|
|
index,
|
|
}}
|
|
`;
|
|
},
|
|
requestForQueryRecord: function(request, { dc, ns, index, id }) {
|
|
if (typeof id === 'undefined') {
|
|
throw new Error('You must specify an id');
|
|
}
|
|
return request`
|
|
GET /v1/acl/role/${id}?${{ dc }}
|
|
|
|
${{
|
|
...this.formatNspace(ns),
|
|
index,
|
|
}}
|
|
`;
|
|
},
|
|
requestForCreateRecord: function(request, serialized, data) {
|
|
const params = {
|
|
...this.formatDatacenter(data[DATACENTER_KEY]),
|
|
};
|
|
return request`
|
|
PUT /v1/acl/role?${params}
|
|
|
|
${{
|
|
Name: serialized.Name,
|
|
Description: serialized.Description,
|
|
Policies: serialized.Policies,
|
|
ServiceIdentities: serialized.ServiceIdentities,
|
|
...Namespace(serialized.Namespace),
|
|
}}
|
|
`;
|
|
},
|
|
requestForUpdateRecord: function(request, serialized, data) {
|
|
const params = {
|
|
...this.formatDatacenter(data[DATACENTER_KEY]),
|
|
};
|
|
return request`
|
|
PUT /v1/acl/role/${data[SLUG_KEY]}?${params}
|
|
|
|
${{
|
|
Name: serialized.Name,
|
|
Description: serialized.Description,
|
|
Policies: serialized.Policies,
|
|
ServiceIdentities: serialized.ServiceIdentities,
|
|
...Namespace(serialized.Namespace),
|
|
}}
|
|
`;
|
|
},
|
|
requestForDeleteRecord: function(request, serialized, data) {
|
|
const params = {
|
|
...this.formatDatacenter(data[DATACENTER_KEY]),
|
|
...this.formatNspace(data[NSPACE_KEY]),
|
|
};
|
|
return request`
|
|
DELETE /v1/acl/role/${data[SLUG_KEY]}?${params}
|
|
`;
|
|
},
|
|
});
|