Skip to content

Commit 64fe640

Browse files
committed
feat(rbac): add missing service account roles
1 parent e203047 commit 64fe640

File tree

6 files changed

+27
-2
lines changed

6 files changed

+27
-2
lines changed

ee/rbac/assets/permissions.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,10 @@ permissions:
7070
description: "View the existing dashboards within the organization."
7171
- name: "organization.dashboards.manage"
7272
description: "Create new dashboard views."
73+
- name: "organization.service_accounts.view"
74+
description: "View service accounts within the organization."
75+
- name: "organization.service_accounts.manage"
76+
description: "Manage service accounts within the organization."
7377
project:
7478
- name: "project.view"
7579
description: "Access the project. This permission is needed to see any page within the project."

ee/rbac/assets/roles.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ roles:
3939
- "organization.custom_roles.view"
4040
- "organization.dashboards.view"
4141
- "organization.dashboards.manage"
42+
- "organization.service_accounts.view"
43+
- "organization.service_accounts.manage"
4244
- name: "Admin"
4345
description: "Admins can modify settings within the organization or any of its projects. However, they do not have access to billing information, and they cannot change general organization details, such as the organization name and URL."
4446
maps_to: "Admin"
@@ -77,6 +79,8 @@ roles:
7779
- "organization.dashboards.view"
7880
- "organization.dashboards.manage"
7981
- "project.delete"
82+
- "organization.service_accounts.view"
83+
- "organization.service_accounts.manage"
8084
- name: "Member"
8185
description: "Members can access the organization's homepage and the projects they are assigned to. However, they are not able to modify any settings."
8286
permissions:

front/test/support/stubs/permission_patrol.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ defmodule Support.Stubs.PermissionPatrol do
22
alias Support.Stubs.DB
33

44
@all_organization_permissions "organization.custom_roles.view,organization.custom_roles.manage,organization.okta.view,organization.okta.manage,organization.contact_support,organization.delete,organization.view,organization.secrets_policy_settings.manage,organization.secrets_policy_settings.view,organization.activity_monitor.view,organization.projects.create,organization.audit_logs.view,organization.audit_logs.manage,organization.people.view,organization.people.invite,organization.people.manage,organization.groups.view,organization.groups.manage,organization.custom_roles.manage,organization.self_hosted_agents.view,organization.self_hosted_agents.manage,organization.general_settings.view,organization.general_settings.manage,organization.secrets.view,organization.secrets.manage,organization.ip_allow_list.view,organization.ip_allow_list.manage,organization.notifications.view,organization.notifications.manage,organization.pre_flight_checks.view,organization.pre_flight_checks.manage,organization.plans_and_billing.view,organization.plans_and_billing.manage,organization.repo_to_role_mappers.manage,organization.dashboards.view,organization.dashboards.manage,organization.instance_git_integration.manage,organization.service_accounts.view,organization.service_accounts.manage"
5-
@all_project_permissions "project.view,project.delete,project.access.view,project.access.manage,project.debug,project.secrets.view,project.secrets.manage,project.notifications.view,project.notifications.manage,project.insights.view,project.insights.manage,project.artifacts.view,project.artifacts.delete,project.artifacts.view_settings,project.artifacts.modify_settings,project.scheduler.view,project.scheduler.manage,project.scheduler.run_manually,project.general_settings.view,project.general_settings.manage,project.repository_info.view,project.repository_info.manage,project.deployment_targets.view,project.deployment_targets.manage,project.pre_flight_checks.view,project.pre_flight_checks.manage,project.workflow.view,project.workflow.manage,project.job.view,project.job.rerun,project.job.stop,project.job.port_forwarding,project.job.attach,project.service_accounts.view,project.service_accounts.manage"
5+
@all_project_permissions "project.view,project.delete,project.access.view,project.access.manage,project.debug,project.secrets.view,project.secrets.manage,project.notifications.view,project.notifications.manage,project.insights.view,project.insights.manage,project.artifacts.view,project.artifacts.delete,project.artifacts.view_settings,project.artifacts.modify_settings,project.scheduler.view,project.scheduler.manage,project.scheduler.run_manually,project.general_settings.view,project.general_settings.manage,project.repository_info.view,project.repository_info.manage,project.deployment_targets.view,project.deployment_targets.manage,project.pre_flight_checks.view,project.pre_flight_checks.manage,project.workflow.view,project.workflow.manage,project.job.view,project.job.rerun,project.job.stop,project.job.port_forwarding,project.job.attach"
66

77
def init do
88
DB.add_table(:user_permissions_key_value_store, [:key, :value])

helm-chart/templates/configmaps/features.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,8 @@ data:
112112
enabled: true
113113
wf_editor_via_jobs:
114114
enabled: true
115+
service_accounts:
116+
enabled: true
115117
{{- else }}
116118
features.yml: |-
117119
activity_monitor:
@@ -216,4 +218,6 @@ data:
216218
enabled: true
217219
new_project_onboarding:
218220
enabled: true
221+
service_accounts:
222+
enabled: true
219223
{{- end }}

helm-chart/templates/configmaps/permissions.yaml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,10 @@ data:
5050
description: "Create new dashboard views."
5151
- name: "organization.instance_git_integration.manage"
5252
description: "Manage the instance Git integration settings."
53+
- name: "organization.service_accounts.view"
54+
description: "View service accounts within the organization."
55+
- name: "organization.service_accounts.manage"
56+
description: "Manage service accounts within the organization."
5357
project:
5458
- name: "project.view"
5559
description: "Access the project. This permission is needed to see any page within the project."
@@ -186,6 +190,10 @@ data:
186190
description: "Create new dashboard views."
187191
- name: "organization.instance_git_integration.manage"
188192
description: "Manage the instance Git integration settings."
193+
- name: "organization.service_accounts.view"
194+
description: "View service accounts within the organization."
195+
- name: "organization.service_accounts.manage"
196+
description: "Manage service accounts within the organization."
189197
project:
190198
- name: "project.view"
191199
description: "Access the project. This permission is needed to see any page within the project."
@@ -249,4 +257,5 @@ data:
249257
description: "Manually stop running jobs or workflows."
250258
- name: "project.job.attach"
251259
description: "SSH into the running job, or start a debug session."
252-
{{- end }}
260+
261+
{{- end }}

helm-chart/templates/configmaps/roles.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ data:
3333
- "organization.dashboards.view"
3434
- "organization.dashboards.manage"
3535
- "organization.instance_git_integration.manage"
36+
- "organization.service_accounts.view"
37+
- "organization.service_accounts.manage"
3638
- name: "Admin"
3739
description: "Admins can modify settings within the organization or any of its projects. However, they do not have access to billing information, and they cannot change general organization details, such as the organization name and URL."
3840
maps_to: "Admin"
@@ -57,6 +59,8 @@ data:
5759
- "organization.dashboards.view"
5860
- "organization.dashboards.manage"
5961
- "project.delete"
62+
- "organization.service_accounts.view"
63+
- "organization.service_accounts.manage"
6064
- name: "Member"
6165
description: "Members can access the organization's homepage and the projects they are assigned to. However, they are not able to modify any settings."
6266
permissions:

0 commit comments

Comments
 (0)