mirror of
https://github.com/harness/drone.git
synced 2025-05-04 19:20:41 +08:00
3ba0f75c8d
This change adds the following:
- Space UID + Custom harness validation (accountId for top level space, harness identifier for child spaces)
- Repo UID + Custom harness validation (harness identifier)
- Store Unique casing of space / repo path and add Path.ValueUnique (with Unique index) to allow for application layer controlling the case sensitivity (case insensitive standalone vs partially case sensitive harness)
- Token UID (unique index over ownertype + ownerID + tokenUID)
- Add DisplayName for principals (replaces Name to avoid confustion)
- Store Unique casing of principal UID and add Principal.ValueUnique (with unique index) to allow for application layer, per principal type control of case sensitivity (required in embedded mode)
- Generate serviceAccount UID (+Email) Randomly (sa-{space|repo}-{ID}-{random}) - Allows to have a unique UID across all principals while reducing likelyhood of overlaps with users + avoid overlap across spaces / repos.
- Sync casing of space names (accountId orgId projectId) when creating spaces on the fly (to ensure case sensitivity of - harness code) or use the existing space to update casing.
- Update serviceaccount client to match updated NG Manager API
- in embedded mode create spaces for harness resources owning the service account
75 lines
2.3 KiB
Go
75 lines
2.3 KiB
Go
// Copyright 2022 Harness Inc. All rights reserved.
|
|
// Use of this source code is governed by the Polyform Free Trial License
|
|
// that can be found in the LICENSE.md file for this repository.
|
|
|
|
// Package types defines common data structures.
|
|
package types
|
|
|
|
import "github.com/harness/gitness/types/enum"
|
|
|
|
type (
|
|
// Represents the identity of an acting entity (User, ServiceAccount, Service).
|
|
Principal struct {
|
|
// TODO: int64 ID doesn't match DB
|
|
ID int64 `db:"principal_id" json:"-"`
|
|
UID string `db:"principal_uid" json:"uid"`
|
|
Email string `db:"principal_email" json:"email"`
|
|
Type enum.PrincipalType `db:"principal_type" json:"type"`
|
|
DisplayName string `db:"principal_displayName" json:"displayName"`
|
|
Admin bool `db:"principal_admin" json:"admin"`
|
|
|
|
// Should be part of principal or not?
|
|
Blocked bool `db:"principal_blocked" json:"blocked"`
|
|
Salt string `db:"principal_salt" json:"-"`
|
|
|
|
// Other info
|
|
Created int64 `db:"principal_created" json:"created"`
|
|
Updated int64 `db:"principal_updated" json:"updated"`
|
|
}
|
|
)
|
|
|
|
func PrincipalFromUser(user *User) *Principal {
|
|
return &Principal{
|
|
ID: user.ID,
|
|
UID: user.UID,
|
|
Email: user.Email,
|
|
Type: enum.PrincipalTypeUser,
|
|
DisplayName: user.DisplayName,
|
|
Admin: user.Admin,
|
|
Blocked: user.Blocked,
|
|
Salt: user.Salt,
|
|
Created: user.Created,
|
|
Updated: user.Updated,
|
|
}
|
|
}
|
|
|
|
func PrincipalFromServiceAccount(sa *ServiceAccount) *Principal {
|
|
return &Principal{
|
|
ID: sa.ID,
|
|
UID: sa.UID,
|
|
Email: sa.Email,
|
|
Type: enum.PrincipalTypeServiceAccount,
|
|
DisplayName: sa.DisplayName,
|
|
Admin: false,
|
|
Blocked: sa.Blocked,
|
|
Salt: sa.Salt,
|
|
Created: sa.Created,
|
|
Updated: sa.Updated,
|
|
}
|
|
}
|
|
|
|
func PrincipalFromService(s *Service) *Principal {
|
|
return &Principal{
|
|
ID: s.ID,
|
|
UID: s.UID,
|
|
Email: s.Email,
|
|
Type: enum.PrincipalTypeService,
|
|
DisplayName: s.DisplayName,
|
|
Admin: s.Admin,
|
|
Blocked: s.Blocked,
|
|
Salt: s.Salt,
|
|
Created: s.Created,
|
|
Updated: s.Updated,
|
|
}
|
|
}
|