github
/
consul
mirror of https://github.com/hashicorp/consul
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ui: Replaces old request method with rpc. (#8298) 

`rpc` is used to define how to make a HTTP request/response messages.
This used to be called 'request' but the term is overused  and sounded
like only one leg of the message, so the naming was moved to `rpc` a
while ago, this cleans up the places where we still used the old term.
pull/8302/head
John Cowen 2020-07-13 14:23:15 +01:00 committed by GitHub
parent 54749686c9
commit 8b5bed1efc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui-v2/app/adapters/acl.js
View File

@ -54,7 +54,7 @@ export default Adapter.extend({
`; `;
}, },
clone: function(store, type, id, snapshot) { clone: function(store, type, id, snapshot) {
return this.request( return this.rpc(
function(adapter, request, serialized, unserialized) { function(adapter, request, serialized, unserialized) {
return adapter.requestForCloneRecord(request, serialized, unserialized); return adapter.requestForCloneRecord(request, serialized, unserialized);
}, },

5
ui-v2/app/adapters/application.js
View File

@ -16,9 +16,4 @@ export default Adapter.extend({
[DATACENTER_QUERY_PARAM]: dc, [DATACENTER_QUERY_PARAM]: dc,
}; };
}, },
// TODO: Deprecated, remove `request` usage from everywhere and replace with
// `HTTPAdapter.rpc`
request: function(req, resp, obj, modelName) {
return this.rpc(...arguments);
},
}); });

2
ui-v2/app/adapters/node.js
View File

@ -24,7 +24,7 @@ export default Adapter.extend({
`; `;
}, },
queryLeader: function(store, type, id, snapshot) { queryLeader: function(store, type, id, snapshot) {
return this.request( return this.rpc(
function(adapter, request, serialized, unserialized) { function(adapter, request, serialized, unserialized) {
return adapter.requestForQueryLeader(request, serialized, unserialized); return adapter.requestForQueryLeader(request, serialized, unserialized);
}, },

2
ui-v2/app/adapters/nspace.js
View File

@ -65,7 +65,7 @@ export default Adapter.extend({
`; `;
}, },
authorize: function(store, type, id, snapshot) { authorize: function(store, type, id, snapshot) {
return this.request( return this.rpc(
function(adapter, request, serialized, unserialized) { function(adapter, request, serialized, unserialized) {
return adapter.requestForAuthorize(request, serialized, unserialized); return adapter.requestForAuthorize(request, serialized, unserialized);
}, },

4
ui-v2/app/adapters/oidc-provider.js
View File

@ -70,7 +70,7 @@ export default Adapter.extend({
`; `;
}, },
authorize: function(store, type, id, snapshot) { authorize: function(store, type, id, snapshot) {
return this.request( return this.rpc(
function(adapter, request, serialized, unserialized) { function(adapter, request, serialized, unserialized) {
return adapter.requestForAuthorize(request, serialized, unserialized); return adapter.requestForAuthorize(request, serialized, unserialized);
}, },
@ -82,7 +82,7 @@ export default Adapter.extend({
); );
}, },
logout: function(store, type, id, snapshot) { logout: function(store, type, id, snapshot) {
return this.request( return this.rpc(
function(adapter, request, serialized, unserialized) { function(adapter, request, serialized, unserialized) {
return adapter.requestForLogout(request, serialized, unserialized); return adapter.requestForLogout(request, serialized, unserialized);
}, },

4
ui-v2/app/adapters/token.js
View File

@ -130,7 +130,7 @@ export default Adapter.extend({
// thing is its probably not the same shape as a 'Token', // thing is its probably not the same shape as a 'Token',
// plus we can't create Snapshots as they are private, see services/store.js // plus we can't create Snapshots as they are private, see services/store.js
self: function(store, type, id, unserialized) { self: function(store, type, id, unserialized) {
return this.request( return this.rpc(
function(adapter, request, serialized, data) { function(adapter, request, serialized, data) {
return adapter.requestForSelf(request, serialized, data); return adapter.requestForSelf(request, serialized, data);
}, },
@ -142,7 +142,7 @@ export default Adapter.extend({
); );
}, },
clone: function(store, type, id, snapshot) { clone: function(store, type, id, snapshot) {
return this.request( return this.rpc(
function(adapter, request, serialized, data) { function(adapter, request, serialized, data) {
return adapter.requestForCloneRecord(request, serialized, data); return adapter.requestForCloneRecord(request, serialized, data);
}, },