USEFULL
/
drone
mirror of https://github.com/harness/drone.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chore: [CODE-3294]: Return 'id' for principal,user,service-account,service, and user group (#3501)

try-new-ui
Johannes Batzill 2025-03-03 18:13:49 +00:00 committed by Harness
parent bb82438965
commit 1d73543050
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
types/principal.go
View File

@ -25,7 +25,7 @@ const AnonymousPrincipalUID = "anonymous"
// Principal represents the identity of an acting entity (User, ServiceAccount, Service).
type Principal struct {
// TODO: int64 ID doesn't match DB
ID int64 `db:"principal_id" json:"-"`
ID int64 `db:"principal_id" json:"id"`
UID string `db:"principal_uid" json:"uid"`
Email string `db:"principal_email" json:"email"`
Type enum.PrincipalType `db:"principal_type" json:"type"`

2
types/service.go
View File

@ -21,7 +21,7 @@ type (
// Service is a principal representing a different internal service that runs alongside gitness.
Service struct {
// Fields from Principal
ID int64 `db:"principal_id" json:"-"`
ID int64 `db:"principal_id" json:"id"`
UID string `db:"principal_uid" json:"uid"`
Email string `db:"principal_email" json:"email"`
DisplayName string `db:"principal_display_name" json:"display_name"`

2
types/service_account.go
View File

@ -21,7 +21,7 @@ type (
// ServiceAccount is a principal representing a service account.
ServiceAccount struct {
// Fields from Principal (without admin, as it's never an admin)
ID int64 `db:"principal_id" json:"-"`
ID int64 `db:"principal_id" json:"id"`
UID string `db:"principal_uid" json:"uid"`
Email string `db:"principal_email" json:"email"`
DisplayName string `db:"principal_display_name" json:"display_name"`

2
types/user.go
View File

@ -23,7 +23,7 @@ type (
// User is a principal representing an end user.
User struct {
// Fields from Principal
ID int64 `db:"principal_id" json:"-"`
ID int64 `db:"principal_id" json:"id"`
UID string `db:"principal_uid" json:"uid"`
Email string `db:"principal_email" json:"email"`
DisplayName string `db:"principal_display_name" json:"display_name"`

2
types/usergroup.go
View File

@ -16,7 +16,7 @@
package types
type UserGroup struct {
ID int64 `json:"-"`
ID int64 `json:"id"`
Identifier string `json:"identifier"`
Name string `json:"name"`
Description string `json:"description"`