Skip to content

Commit d2fcd45

Browse files
Extend privileges and user statuses in the API and models
1 parent 7553129 commit d2fcd45

3 files changed

Lines changed: 43 additions & 21 deletions

File tree

api/core.openapi.yaml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -307,12 +307,22 @@ definitions:
307307
enum:
308308
- core:clusters:read
309309
- core:clusters:write
310+
- core:allocations:read
311+
- core:allocations:write
312+
- core:projects:read
313+
- core:projects:write
314+
- core:traces:read
310315
- core:privileges:grant
311316
- core:roles:manage
312317
type: string
313318
x-enum-varnames:
314319
- ClustersRead
315320
- ClustersWrite
321+
- AllocationsRead
322+
- AllocationsWrite
323+
- ProjectsRead
324+
- ProjectsWrite
325+
- TracesRead
316326
- PrivilegesGrant
317327
- RolesManage
318328
Project:
@@ -568,12 +578,14 @@ definitions:
568578
type: object
569579
UserStatus:
570580
enum:
581+
- PENDING
571582
- ACTIVE
572583
- INACTIVE
573584
- SUSPENDED
574585
- MERGED
575586
type: string
576587
x-enum-varnames:
588+
- UserPending
577589
- UserActive
578590
- UserInactive
579591
- UserSuspended
@@ -582,10 +594,12 @@ definitions:
582594
enum:
583595
- CLUSTER_LOCAL
584596
- VIRTUAL
597+
- SYSTEM
585598
type: string
586599
x-enum-varnames:
587600
- UserTypeClusterLocal
588601
- UserTypeVirtual
602+
- UserTypeSystem
589603
attachResourceRequest:
590604
properties:
591605
compute_allocation_resource_id:
@@ -2658,6 +2672,11 @@ paths:
26582672
enum:
26592673
- core:clusters:read
26602674
- core:clusters:write
2675+
- core:allocations:read
2676+
- core:allocations:write
2677+
- core:projects:read
2678+
- core:projects:write
2679+
- core:traces:read
26612680
- core:privileges:grant
26622681
- core:roles:manage
26632682
in: path
@@ -3156,6 +3175,11 @@ paths:
31563175
enum:
31573176
- core:clusters:read
31583177
- core:clusters:write
3178+
- core:allocations:read
3179+
- core:allocations:write
3180+
- core:projects:read
3181+
- core:projects:write
3182+
- core:traces:read
31593183
- core:privileges:grant
31603184
- core:roles:manage
31613185
in: path
@@ -3680,6 +3704,11 @@ paths:
36803704
enum:
36813705
- core:clusters:read
36823706
- core:clusters:write
3707+
- core:allocations:read
3708+
- core:allocations:write
3709+
- core:projects:read
3710+
- core:projects:write
3711+
- core:traces:read
36833712
- core:privileges:grant
36843713
- core:roles:manage
36853714
in: path

pkg/models/privilege.go

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,15 @@ import (
2727
type PrivilegeKey string
2828

2929
const (
30-
ClustersRead PrivilegeKey = "core:clusters:read"
31-
ClustersWrite PrivilegeKey = "core:clusters:write"
32-
PrivilegesGrant PrivilegeKey = "core:privileges:grant"
33-
RolesManage PrivilegeKey = "core:roles:manage"
30+
ClustersRead PrivilegeKey = "core:clusters:read"
31+
ClustersWrite PrivilegeKey = "core:clusters:write"
32+
AllocationsRead PrivilegeKey = "core:allocations:read"
33+
AllocationsWrite PrivilegeKey = "core:allocations:write"
34+
ProjectsRead PrivilegeKey = "core:projects:read"
35+
ProjectsWrite PrivilegeKey = "core:projects:write"
36+
TracesRead PrivilegeKey = "core:traces:read"
37+
PrivilegesGrant PrivilegeKey = "core:privileges:grant"
38+
RolesManage PrivilegeKey = "core:roles:manage"
3439
)
3540

3641
var (
@@ -42,6 +47,11 @@ func init() {
4247
Register(
4348
ClustersRead,
4449
ClustersWrite,
50+
AllocationsRead,
51+
AllocationsWrite,
52+
ProjectsRead,
53+
ProjectsWrite,
54+
TracesRead,
4555
PrivilegesGrant,
4656
RolesManage,
4757
)

pkg/service/mock.go

Lines changed: 0 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)