status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

ui: Check for `intention` ACL resources, not `intentions` ACL resources (#11880) 

* ui: Check for `intention` ACL resources, not `intentions` ACL resources

* ui: Flip the test assertion to see the create button temporarily
This commit is contained in:
John Cowen 2021-12-21 06:43:14 +00:00 committed by GitHub
parent ba70fe5e55
commit 72cddf4f49
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/packages/consul-ui/app/services/repository/permission.js
View File

@ -155,10 +155,10 @@ export default class PermissionService extends RepositoryService {
// This temporary measure should be removed again once https://github.com/hashicorp/consul/issues/11098 // This temporary measure should be removed again once https://github.com/hashicorp/consul/issues/11098
// has been resolved // has been resolved
this.permissions.forEach(item => { this.permissions.forEach(item => {
if(['key', 'node', 'service', 'intentions', 'session'].includes(item.Resource)) { if (['key', 'node', 'service', 'intention', 'session'].includes(item.Resource)) {
item.Allow = true; item.Allow = true;
} }
}) });
/**/ /**/
return this.permissions; return this.permissions;
} }

7
ui/packages/consul-ui/tests/acceptance/dc/intentions/index.feature
View File

@ -23,7 +23,12 @@ Feature: dc / intentions / index
dc: dc-1 dc: dc-1
--- ---
Then the url should be /dc-1/intentions Then the url should be /dc-1/intentions
And I don't see create And I see create
# We currently hardcode intention write to true until the API does what we need
# Once we can use this as we need we'll be able to un-hardcode And this test
# will fail again, at which point we can remove the above assertion and
# uncomment the below one
# And I don't see create
Scenario: Viewing intentions in the listing live updates Scenario: Viewing intentions in the listing live updates
Given 1 datacenter model with the value "dc-1" Given 1 datacenter model with the value "dc-1"
Given 3 intention models Given 3 intention models