ui: Namespace Support #6639
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,22 @@ | ||
| import Adapter from './http'; | ||
| import { inject as service } from '@ember/service'; | ||
| import config from 'consul-ui/config/environment'; | ||
|
|
||
| export const DATACENTER_QUERY_PARAM = 'dc'; | ||
| export const NSPACE_QUERY_PARAM = 'ns'; | ||
| export default Adapter.extend({ | ||
| repo: service('settings'), | ||
| client: service('client/http'), | ||
| formatNspace: function(nspace) { | ||
| if (config.CONSUL_NSPACES_ENABLED) { | ||
| return nspace !== '' ? { [NSPACE_QUERY_PARAM]: nspace } : undefined; | ||
|
There was a problem hiding this comment. does this need to be url encoded? wasn't sure if There was a problem hiding this comment. Yeah There was a problem hiding this comment. This isn't strictly correct 😁 . Basically its not When writing the template literal any variables used in the URL itself is encoded. Then any body used in anything other that a GET request is sent as JSON encoded. A GET request with a body is a little special and follows the old ember-data adapter functionality, in that any body with a GET request gets moved to the GET params (as you can't send a body with a GET request). Under the hood ember-data relied on jQuery to do this and when we did our data layer refactor we tried to replicate this functionality completely, you can see it here with a comment on urlencoding https://github.com/hashicorp/consul/pull/5637/files#diff-d12a13b0f2b1e3556993c370c1ee3ddfR182. I've just double checked this and it does get url encoded, but we are also protected somewhat by the fact that namespaces can only have DNS compatible names, and therefore probably don't need url encoding anyhow |
||
| } | ||
| }, | ||
| formatDatacenter: function(dc) { | ||
| return { | ||
| [DATACENTER_QUERY_PARAM]: dc, | ||
| }; | ||
| }, | ||
| // TODO: kinda protected for the moment | ||
| // decide where this should go either read/write from http | ||
| // should somehow use this or vice versa | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| import Adapter from './application'; | ||
| import { SLUG_KEY } from 'consul-ui/models/nspace'; | ||
|
|
||
| // namespaces aren't categorized by datacenter, therefore no dc | ||
| export default Adapter.extend({ | ||
| requestForQuery: function(request, { index }) { | ||
| return request` | ||
| GET /v1/namespaces | ||
|
|
||
| ${{ index }} | ||
| `; | ||
| }, | ||
| requestForQueryRecord: function(request, { index, id }) { | ||
| if (typeof id === 'undefined') { | ||
| throw new Error('You must specify an name'); | ||
| } | ||
| return request` | ||
| GET /v1/namespace/${id} | ||
|
|
||
| ${{ index }} | ||
| `; | ||
| }, | ||
| requestForCreateRecord: function(request, serialized, data) { | ||
| return request` | ||
| PUT /v1/namespace/${data[SLUG_KEY]} | ||
|
|
||
| ${{ | ||
| Name: serialized.Name, | ||
| Description: serialized.Description, | ||
| ACLs: { | ||
| PolicyDefaults: serialized.ACLs.PolicyDefaults.map(item => ({ ID: item.ID })), | ||
| RoleDefaults: serialized.ACLs.RoleDefaults.map(item => ({ ID: item.ID })), | ||
| }, | ||
| }} | ||
| `; | ||
| }, | ||
| requestForUpdateRecord: function(request, serialized, data) { | ||
| return request` | ||
| PUT /v1/namespace/${data[SLUG_KEY]} | ||
|
|
||
| ${{ | ||
| Description: serialized.Description, | ||
| ACLs: { | ||
| PolicyDefaults: serialized.ACLs.PolicyDefaults.map(item => ({ ID: item.ID })), | ||
| RoleDefaults: serialized.ACLs.RoleDefaults.map(item => ({ ID: item.ID })), | ||
| }, | ||
| }} | ||
| `; | ||
| }, | ||
| requestForDeleteRecord: function(request, serialized, data) { | ||
| return request` | ||
| DELETE /v1/namespace/${data[SLUG_KEY]} | ||
| `; | ||
| }, | ||
| requestForAuthorize: function(request, { dc, ns, index }) { | ||
| return request` | ||
| POST /v1/internal/acl/authorize?${{ dc, ns, index }} | ||
|
|
||
| ${[ | ||
| { | ||
| Resource: 'operator', | ||
| Access: 'write', | ||
| }, | ||
| ]} | ||
| `; | ||
| }, | ||
| authorize: function(store, type, id, snapshot) { | ||
| return this.request( | ||
| function(adapter, request, serialized, unserialized) { | ||
| return adapter.requestForAuthorize(request, serialized, unserialized); | ||
| }, | ||
| function(serializer, respond, serialized, unserialized) { | ||
| // Completely skip the serializer here | ||
| return respond(function(headers, body) { | ||
| return body; | ||
| }); | ||
| }, | ||
| snapshot, | ||
| type.modelName | ||
| ); | ||
| }, | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,17 @@ | ||
| import Adapter from './application'; | ||
| // TODO: Update to use this.formatDatacenter() | ||
| export default Adapter.extend({ | ||
| requestForQuery: function(request, { dc, ns, index, id }) { | ||
| if (typeof id === 'undefined') { | ||
| throw new Error('You must specify an id'); | ||
| } | ||
| return request` | ||
| GET /v1/catalog/connect/${id}?${{ dc }} | ||
|
|
||
| ${{ | ||
| ...this.formatNspace(ns), | ||
| index, | ||
| }} | ||
| `; | ||
| }, | ||
| }); |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does the enterprise binary write this value?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It will do at somepoint yeah, I think for now we can just use our CONSUL_BINARY_TYPE setting that we already have - I think this specific NSPACE one is going to be added later. Potentially a PR coming after this one to temporarily use the CONSUL_BINARY_TYPE setting (which the binary writes already)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This has been PRed now, see #6921 (backend support) and #6933 (using these values properly)