pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #372 from dod-ccpo/workspace_users_project_permissions

Browse Source 
Workspace users project permissions
This commit is contained in:
montana-mil 2018-10-05 11:41:10 -04:00 committed by GitHub
commit d8d05daf8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
atst/domain/projects.py
View File

@ -5,6 +5,7 @@ from atst.domain.exceptions import NotFoundError
from atst.models.permissions import Permissions from atst.models.permissions import Permissions
from atst.models.project import Project from atst.models.project import Project
from atst.models.environment import Environment from atst.models.environment import Environment
from atst.models.environment_role import EnvironmentRole
class Projects(object): class Projects(object):

8
atst/domain/roles.py
View File

@ -117,11 +117,7 @@ WORKSPACE_ROLES = [
"name": "developer", "name": "developer",
"display_name": "Developer", "display_name": "Developer",
"description": "Views only the projects and environments they are granted access to. Can also view members associated with each environment.", "description": "Views only the projects and environments they are granted access to. Can also view members associated with each environment.",
"permissions": [ "permissions": [Permissions.VIEW_USAGE_REPORT, Permissions.VIEW_WORKSPACE],
Permissions.VIEW_USAGE_REPORT,
Permissions.VIEW_WORKSPACE,
Permissions.VIEW_APPLICATION_IN_WORKSPACE,
],
}, },
{ {
"name": "billing_auditor", "name": "billing_auditor",
@ -131,7 +127,6 @@ WORKSPACE_ROLES = [
Permissions.VIEW_USAGE_REPORT, Permissions.VIEW_USAGE_REPORT,
Permissions.VIEW_USAGE_DOLLARS, Permissions.VIEW_USAGE_DOLLARS,
Permissions.VIEW_WORKSPACE, Permissions.VIEW_WORKSPACE,
Permissions.VIEW_APPLICATION_IN_WORKSPACE,
], ],
}, },
{ {
@ -143,7 +138,6 @@ WORKSPACE_ROLES = [
Permissions.VIEW_ASSIGNED_CSP_ROLE_CONFIGURATIONS, Permissions.VIEW_ASSIGNED_CSP_ROLE_CONFIGURATIONS,
Permissions.VIEW_ATAT_PERMISSIONS, Permissions.VIEW_ATAT_PERMISSIONS,
Permissions.VIEW_WORKSPACE, Permissions.VIEW_WORKSPACE,
Permissions.VIEW_APPLICATION_IN_WORKSPACE,
], ],
}, },
] ]

7
tests/domain/test_workspaces.py
View File

@ -167,6 +167,13 @@ def test_scoped_workspace_only_returns_a_users_projects_and_environments(
"My project", "My project",
["dev", "staging", "prod"], ["dev", "staging", "prod"],
) )
Projects.create(
workspace_owner,
workspace,
"My Project 2",
"My project 2",
["dev", "staging", "prod"],
)
developer = UserFactory.from_atat_role("developer") developer = UserFactory.from_atat_role("developer")
dev_environment = Environments.add_member( dev_environment = Environments.add_member(
new_project.environments[0], developer, "developer" new_project.environments[0], developer, "developer"