From 78a0b0c625b42794b153f88046522cd004df27b3 Mon Sep 17 00:00:00 2001 From: Abin Simon Date: Thu, 24 Mar 2022 12:34:54 +0530 Subject: [PATCH 1/2] Rearrage some files to cleanup file structure --- internal/cluster/dao/cluster.go | 12 ++-- .../cluster/dao/clusteroperatorbootstrap.go | 8 +-- internal/cluster/dao/clustertoken.go | 8 +-- internal/cluster/dao/namespaces.go | 4 +- internal/cluster/dao/projectcluster.go | 6 +- internal/dao/bootstrap.go | 5 +- .../pg/entity_dao.go => dao/common.go} | 2 +- internal/dao/kubeconfig.go | 7 +-- .../provider/pg => dao}/lookup.go | 2 +- .../provider/kratos/kratos.go | 0 main.go | 2 +- pkg/service/apikey.go | 10 ++-- pkg/service/authz.go | 4 +- pkg/service/bootstrap.go | 5 +- pkg/service/cluster.go | 60 +++++++++---------- pkg/service/group.go | 51 ++++++++-------- pkg/service/idp.go | 28 ++++----- pkg/service/metro.go | 24 ++++---- pkg/service/oidc_provider.go | 24 ++++---- pkg/service/organization.go | 26 ++++---- pkg/service/partner.go | 16 ++--- pkg/service/project.go | 28 ++++----- pkg/service/role.go | 33 +++++----- pkg/service/rolepermission.go | 10 ++-- pkg/service/user.go | 43 +++++++------ 25 files changed, 206 insertions(+), 212 deletions(-) rename internal/{persistence/provider/pg/entity_dao.go => dao/common.go} (99%) rename internal/{persistence/provider/pg => dao}/lookup.go (99%) rename internal/{persistence => }/provider/kratos/kratos.go (100%) diff --git a/internal/cluster/dao/cluster.go b/internal/cluster/dao/cluster.go index f23c2ac..82b22bc 100644 --- a/internal/cluster/dao/cluster.go +++ b/internal/cluster/dao/cluster.go @@ -6,8 +6,8 @@ import ( "time" "github.com/RafaySystems/rcloud-base/internal/cluster/constants" + "github.com/RafaySystems/rcloud-base/internal/dao" "github.com/RafaySystems/rcloud-base/internal/models" - "github.com/RafaySystems/rcloud-base/internal/persistence/provider/pg" commonv3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" "github.com/google/uuid" "github.com/uptrace/bun" @@ -51,7 +51,7 @@ func CreateCluster(ctx context.Context, tx bun.IDB, cluster *models.Cluster) err func UpdateCluster(ctx context.Context, db bun.IDB, c *models.Cluster) error { - _, err := pg.Update(ctx, db, c.ID, c) + _, err := dao.Update(ctx, db, c.ID, c) if err != nil { return err } @@ -74,12 +74,12 @@ func UpdateClusterAnnotations(ctx context.Context, db bun.IDB, c *models.Cluster func GetCluster(ctx context.Context, db bun.IDB, cluster *models.Cluster) (*models.Cluster, error) { if cluster.ID != uuid.Nil { - _, err := pg.GetByID(ctx, db, cluster.ID, cluster) + _, err := dao.GetByID(ctx, db, cluster.ID, cluster) if err != nil { return nil, err } } else { - _, err := pg.GetByName(ctx, db, cluster.Name, cluster) + _, err := dao.GetByName(ctx, db, cluster.Name, cluster) if err != nil { return nil, err } @@ -103,7 +103,7 @@ func ListClusters(ctx context.Context, db bun.IDB, qo commonv3.QueryOptions) (cl oid := uuid.NullUUID{UUID: uuid.MustParse(qo.Organization), Valid: true} prid := uuid.NullUUID{UUID: uuid.MustParse(qo.Project), Valid: true} - err = pg.ListByProject(ctx, db, pid, oid, prid, &clusters) + err = dao.ListByProject(ctx, db, pid, oid, prid, &clusters) if err != nil { return nil, err } @@ -111,7 +111,7 @@ func ListClusters(ctx context.Context, db bun.IDB, qo commonv3.QueryOptions) (cl } func GetClusterForToken(ctx context.Context, db bun.IDB, token string) (cluster *models.Cluster, err error) { - entity, err := pg.GetX(ctx, db, "token", token, &models.Cluster{}) + entity, err := dao.GetX(ctx, db, "token", token, &models.Cluster{}) if err != nil { return nil, err } diff --git a/internal/cluster/dao/clusteroperatorbootstrap.go b/internal/cluster/dao/clusteroperatorbootstrap.go index 7df7641..4cf5c33 100644 --- a/internal/cluster/dao/clusteroperatorbootstrap.go +++ b/internal/cluster/dao/clusteroperatorbootstrap.go @@ -3,8 +3,8 @@ package dao import ( "context" + "github.com/RafaySystems/rcloud-base/internal/dao" "github.com/RafaySystems/rcloud-base/internal/models" - "github.com/RafaySystems/rcloud-base/internal/persistence/provider/pg" "github.com/RafaySystems/rcloud-base/pkg/log" "github.com/uptrace/bun" ) @@ -16,14 +16,14 @@ func CreateOperatorBootstrap(ctx context.Context, db bun.Tx, bootstrap *models.C var bstrap *models.ClusterOperatorBootstrap - entity, err := pg.GetX(ctx, db, "edge_id", bootstrap.ClusterId, &bstrap) + entity, err := dao.GetX(ctx, db, "edge_id", bootstrap.ClusterId, &bstrap) if err != nil { _log.Infow("CreateOperatorBootstrap: No existing bootstrap data detected", "edge", bootstrap.ClusterId) } else { _log.Infow("CreateOperatorBootstrap: Removing existing bootstrap data", "edge", bootstrap.ClusterId) bstrap = entity.(*models.ClusterOperatorBootstrap) - err = pg.DeleteX(ctx, db, "edge_id", bstrap.ClusterId, bstrap) + err = dao.DeleteX(ctx, db, "edge_id", bstrap.ClusterId, bstrap) if err != nil { _log.Errorw("Error while deleting bootstrap data", "Error", err) return err @@ -45,7 +45,7 @@ func CreateOperatorBootstrap(ctx context.Context, db bun.Tx, bootstrap *models.C func GetOperatorBootstrap(ctx context.Context, db bun.IDB, clusterid string) (*models.ClusterOperatorBootstrap, error) { var bootstrap models.ClusterOperatorBootstrap - entity, err := pg.GetX(ctx, db, "clusterid", clusterid, bootstrap) + entity, err := dao.GetX(ctx, db, "clusterid", clusterid, bootstrap) if err != nil { _log.Errorw("Error while fetching bootstrap data using tx ", "Error", err) return nil, err diff --git a/internal/cluster/dao/clustertoken.go b/internal/cluster/dao/clustertoken.go index 1f5a88e..2498dfc 100644 --- a/internal/cluster/dao/clustertoken.go +++ b/internal/cluster/dao/clustertoken.go @@ -4,8 +4,8 @@ import ( "context" "errors" + "github.com/RafaySystems/rcloud-base/internal/dao" "github.com/RafaySystems/rcloud-base/internal/models" - "github.com/RafaySystems/rcloud-base/internal/persistence/provider/pg" infrav3 "github.com/RafaySystems/rcloud-base/proto/types/infrapb/v3" "github.com/rs/xid" "github.com/uptrace/bun" @@ -21,21 +21,21 @@ var ( // CreateToken creates a token for given cluster name func CreateToken(ctx context.Context, db bun.IDB, token *models.ClusterToken) error { token.Name = xid.New().String() - _, err := pg.Create(ctx, db, token) + _, err := dao.Create(ctx, db, token) return err } // registerToken registers the cluster token func RegisterToken(ctx context.Context, db bun.IDB, token string) (*models.ClusterToken, error) { - entity, err := pg.GetX(ctx, db, "name", token, &models.ClusterToken{}) + entity, err := dao.GetX(ctx, db, "name", token, &models.ClusterToken{}) if err != nil { return nil, ErrInvalidToken } ct := entity.(*models.ClusterToken) ct.State = infrav3.ClusterTokenState_TokenUsed.String() - pg.Update(ctx, db, ct.ID, ct) + dao.Update(ctx, db, ct.ID, ct) if err != nil { return nil, ErrInvalidToken } diff --git a/internal/cluster/dao/namespaces.go b/internal/cluster/dao/namespaces.go index 77e987a..ab25167 100644 --- a/internal/cluster/dao/namespaces.go +++ b/internal/cluster/dao/namespaces.go @@ -4,8 +4,8 @@ import ( "context" "time" + "github.com/RafaySystems/rcloud-base/internal/dao" "github.com/RafaySystems/rcloud-base/internal/models" - "github.com/RafaySystems/rcloud-base/internal/persistence/provider/pg" commonv3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" infrav3 "github.com/RafaySystems/rcloud-base/proto/types/infrapb/v3" "github.com/RafaySystems/rcloud-base/proto/types/scheduler" @@ -32,7 +32,7 @@ func GetNamespace(ctx context.Context, db bun.IDB, clusterID uuid.UUID, name str func GetNamespaces(ctx context.Context, db bun.IDB, clusterID uuid.UUID) ([]models.ClusterNamespace, error) { var cns []models.ClusterNamespace - _, err := pg.GetX(ctx, db, "cluster_id", clusterID, &cns) + _, err := dao.GetX(ctx, db, "cluster_id", clusterID, &cns) return cns, err } diff --git a/internal/cluster/dao/projectcluster.go b/internal/cluster/dao/projectcluster.go index 8869093..c739bec 100644 --- a/internal/cluster/dao/projectcluster.go +++ b/internal/cluster/dao/projectcluster.go @@ -3,8 +3,8 @@ package dao import ( "context" + "github.com/RafaySystems/rcloud-base/internal/dao" "github.com/RafaySystems/rcloud-base/internal/models" - "github.com/RafaySystems/rcloud-base/internal/persistence/provider/pg" "github.com/RafaySystems/rcloud-base/pkg/query" commonv3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" "github.com/google/uuid" @@ -12,7 +12,7 @@ import ( ) func CreateProjectCluster(ctx context.Context, db bun.IDB, pc *models.ProjectCluster) error { - _, err := pg.Create(ctx, db, pc) + _, err := dao.Create(ctx, db, pc) if err != nil { return err } @@ -29,7 +29,7 @@ func GetProjectsForCluster(ctx context.Context, db bun.IDB, clusterID uuid.UUID) } func DeleteProjectsForCluster(ctx context.Context, db bun.IDB, clusterID uuid.UUID) error { - return pg.DeleteX(ctx, db, "cluster_id", clusterID, &models.ProjectCluster{}) + return dao.DeleteX(ctx, db, "cluster_id", clusterID, &models.ProjectCluster{}) } // Check if the project in scope is owner of the cluster diff --git a/internal/dao/bootstrap.go b/internal/dao/bootstrap.go index 3bcf48d..b25d537 100644 --- a/internal/dao/bootstrap.go +++ b/internal/dao/bootstrap.go @@ -7,7 +7,6 @@ import ( "time" "github.com/RafaySystems/rcloud-base/internal/models" - "github.com/RafaySystems/rcloud-base/internal/persistence/provider/pg" "github.com/RafaySystems/rcloud-base/internal/random" "github.com/RafaySystems/rcloud-base/pkg/query" commonv3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" @@ -124,7 +123,7 @@ func SelectBootstrapAgents(ctx context.Context, db bun.IDB, templateRef string, func CreateBootstrapAgent(ctx context.Context, db bun.IDB, ba *models.BootstrapAgent) error { ba.TokenState = sentry.BootstrapAgentState_NotRegistered.String() - _, err := pg.Create(ctx, db, ba) + _, err := Create(ctx, db, ba) return err } @@ -237,7 +236,7 @@ func GetBootstrapAgentForClusterID(ctx context.Context, db bun.IDB, clusterID st // updateBootstrapAgentDeleteAt builds query for deleting resource func UpdateBootstrapAgentDeleteAt(ctx context.Context, db bun.IDB, templateRef string) error { var toBeDeletedAgent *models.BootstrapAgent - _, err := pg.GetX(ctx, db, "template_ref", templateRef, &toBeDeletedAgent) + _, err := GetX(ctx, db, "template_ref", templateRef, &toBeDeletedAgent) if err != nil { return err } diff --git a/internal/persistence/provider/pg/entity_dao.go b/internal/dao/common.go similarity index 99% rename from internal/persistence/provider/pg/entity_dao.go rename to internal/dao/common.go index 34a4434..60f7fb4 100644 --- a/internal/persistence/provider/pg/entity_dao.go +++ b/internal/dao/common.go @@ -1,4 +1,4 @@ -package pg +package dao import ( "context" diff --git a/internal/dao/kubeconfig.go b/internal/dao/kubeconfig.go index d5b5da2..9d02303 100644 --- a/internal/dao/kubeconfig.go +++ b/internal/dao/kubeconfig.go @@ -5,7 +5,6 @@ import ( "time" "github.com/RafaySystems/rcloud-base/internal/models" - "github.com/RafaySystems/rcloud-base/internal/persistence/provider/pg" "github.com/RafaySystems/rcloud-base/proto/types/sentry" "github.com/google/uuid" "github.com/uptrace/bun" @@ -22,7 +21,7 @@ func GetKubeconfigRevocation(ctx context.Context, db bun.IDB, orgID, accountID u } func CreateKubeconfigRevocation(ctx context.Context, db bun.IDB, kr *models.KubeconfigRevocation) error { - _, err := pg.Create(ctx, db, kr) + _, err := Create(ctx, db, kr) return err } @@ -55,7 +54,7 @@ func CreateKubeconfigSetting(ctx context.Context, db bun.IDB, ks *models.Kubecon } else { ks.Scope = sentry.KubeconfigSettingUserScope } - _, err := pg.Create(ctx, db, ks) + _, err := Create(ctx, db, ks) return err } @@ -88,7 +87,7 @@ func GetkubectlClusterSettings(ctx context.Context, db bun.IDB, orgID uuid.UUID, } func CreatekubectlClusterSettings(ctx context.Context, db bun.IDB, kc *models.KubectlClusterSetting) error { - _, err := pg.Create(ctx, db, kc) + _, err := Create(ctx, db, kc) return err } diff --git a/internal/persistence/provider/pg/lookup.go b/internal/dao/lookup.go similarity index 99% rename from internal/persistence/provider/pg/lookup.go rename to internal/dao/lookup.go index d8a36a8..17d414a 100644 --- a/internal/persistence/provider/pg/lookup.go +++ b/internal/dao/lookup.go @@ -1,4 +1,4 @@ -package pg +package dao import ( "context" diff --git a/internal/persistence/provider/kratos/kratos.go b/internal/provider/kratos/kratos.go similarity index 100% rename from internal/persistence/provider/kratos/kratos.go rename to internal/provider/kratos/kratos.go diff --git a/main.go b/main.go index f00c1c8..7d47afd 100644 --- a/main.go +++ b/main.go @@ -13,7 +13,7 @@ import ( "time" "github.com/RafaySystems/rcloud-base/internal/fixtures" - providers "github.com/RafaySystems/rcloud-base/internal/persistence/provider/kratos" + providers "github.com/RafaySystems/rcloud-base/internal/provider/kratos" authv3 "github.com/RafaySystems/rcloud-base/pkg/auth/v3" "github.com/RafaySystems/rcloud-base/pkg/common" "github.com/RafaySystems/rcloud-base/pkg/enforcer" diff --git a/pkg/service/apikey.go b/pkg/service/apikey.go index 69ca4b7..0e17a67 100644 --- a/pkg/service/apikey.go +++ b/pkg/service/apikey.go @@ -5,8 +5,8 @@ import ( "database/sql" "time" + "github.com/RafaySystems/rcloud-base/internal/dao" "github.com/RafaySystems/rcloud-base/internal/models" - "github.com/RafaySystems/rcloud-base/internal/persistence/provider/pg" "github.com/RafaySystems/rcloud-base/pkg/crypto" rpcv3 "github.com/RafaySystems/rcloud-base/proto/rpc/user" "github.com/google/uuid" @@ -49,7 +49,7 @@ func (s *apiKeyService) Create(ctx context.Context, req *rpcv3.ApiKeyRequest) (* Secret: crypto.GenerateSha256Secret(), } - _, err := pg.Create(ctx, s.db, apikey) + _, err := dao.Create(ctx, s.db, apikey) if err != nil { return nil, err } @@ -66,7 +66,7 @@ func (s *apiKeyService) Delete(ctx context.Context, req *rpcv3.ApiKeyRequest) (* func (s *apiKeyService) List(ctx context.Context, req *rpcv3.ApiKeyRequest) (*rpcv3.ApiKeyResponseList, error) { var apikeys []models.ApiKey - resp, err := pg.GetByName(ctx, s.db, req.Username, &apikeys) + resp, err := dao.GetByName(ctx, s.db, req.Username, &apikeys) if err == sql.ErrNoRows { return nil, nil } @@ -90,7 +90,7 @@ func (s *apiKeyService) List(ctx context.Context, req *rpcv3.ApiKeyRequest) (*rp func (s *apiKeyService) Get(ctx context.Context, req *rpcv3.ApiKeyRequest) (*models.ApiKey, error) { var apikey models.ApiKey - _, err := pg.GetByName(ctx, s.db, req.Username, &apikey) + _, err := dao.GetByName(ctx, s.db, req.Username, &apikey) if err == sql.ErrNoRows { return nil, nil } @@ -99,7 +99,7 @@ func (s *apiKeyService) Get(ctx context.Context, req *rpcv3.ApiKeyRequest) (*mod func (s *apiKeyService) GetByKey(ctx context.Context, req *rpcv3.ApiKeyRequest) (*models.ApiKey, error) { var apikey models.ApiKey - _, err := pg.GetX(ctx, s.db, "key", req.Id, &apikey) + _, err := dao.GetX(ctx, s.db, "key", req.Id, &apikey) if err != nil { return nil, err } diff --git a/pkg/service/authz.go b/pkg/service/authz.go index 4ea6f28..f50f94b 100644 --- a/pkg/service/authz.go +++ b/pkg/service/authz.go @@ -4,8 +4,8 @@ import ( "context" "fmt" + "github.com/RafaySystems/rcloud-base/internal/dao" "github.com/RafaySystems/rcloud-base/internal/models" - "github.com/RafaySystems/rcloud-base/internal/persistence/provider/pg" authzpbv1 "github.com/RafaySystems/rcloud-base/proto/types/authz" "github.com/casbin/casbin/v2" "github.com/uptrace/bun" @@ -91,7 +91,7 @@ func processRpms(rpm models.ResourcePermission) []rpmUrlAction { func (s *authzService) cacheResourceRolePermissions(ctx context.Context) error { var items []models.ResourcePermission - entities, err := pg.ListAll(ctx, s.db, &items) + entities, err := dao.ListAll(ctx, s.db, &items) if err != nil { return err } diff --git a/pkg/service/bootstrap.go b/pkg/service/bootstrap.go index c5f8602..65ad164 100644 --- a/pkg/service/bootstrap.go +++ b/pkg/service/bootstrap.go @@ -9,7 +9,6 @@ import ( "github.com/RafaySystems/rcloud-base/internal/dao" "github.com/RafaySystems/rcloud-base/internal/models" - "github.com/RafaySystems/rcloud-base/internal/persistence/provider/pg" "github.com/RafaySystems/rcloud-base/pkg/converter" "github.com/RafaySystems/rcloud-base/pkg/query" "github.com/RafaySystems/rcloud-base/pkg/sentry/cryptoutil" @@ -63,7 +62,7 @@ func (s *bootstrapService) PatchBootstrapInfra(ctx context.Context, infra *sentr func (s *bootstrapService) GetBootstrapInfra(ctx context.Context, name string) (*sentry.BootstrapInfra, error) { var bi models.BootstrapInfra - _, err := pg.GetByName(ctx, s.db, name, &bi) + _, err := dao.GetByName(ctx, s.db, name, &bi) if err != nil { return nil, err } @@ -94,7 +93,7 @@ func (s *bootstrapService) PatchBootstrapAgentTemplate(ctx context.Context, temp func (s *bootstrapService) GetBootstrapAgentTemplate(ctx context.Context, agentType string) (*sentry.BootstrapAgentTemplate, error) { var template models.BootstrapAgentTemplate - _, err := pg.GetByName(ctx, s.db, agentType, &template) + _, err := dao.GetByName(ctx, s.db, agentType, &template) if err != nil { return nil, err } diff --git a/pkg/service/cluster.go b/pkg/service/cluster.go index 6cecaa8..d3c6f70 100644 --- a/pkg/service/cluster.go +++ b/pkg/service/cluster.go @@ -13,10 +13,10 @@ import ( clstrutil "github.com/RafaySystems/rcloud-base/internal/cluster" "github.com/RafaySystems/rcloud-base/internal/cluster/constants" - "github.com/RafaySystems/rcloud-base/internal/cluster/dao" + cdao "github.com/RafaySystems/rcloud-base/internal/cluster/dao" "github.com/RafaySystems/rcloud-base/internal/cluster/util" + "github.com/RafaySystems/rcloud-base/internal/dao" "github.com/RafaySystems/rcloud-base/internal/models" - "github.com/RafaySystems/rcloud-base/internal/persistence/provider/pg" "github.com/RafaySystems/rcloud-base/pkg/common" "github.com/RafaySystems/rcloud-base/pkg/event" "github.com/RafaySystems/rcloud-base/pkg/log" @@ -112,7 +112,7 @@ func (es *clusterService) Create(ctx context.Context, cluster *infrav3.Cluster) } var proj models.Project - _, err := pg.GetByName(ctx, es.db, cluster.Metadata.Project, &proj) + _, err := dao.GetByName(ctx, es.db, cluster.Metadata.Project, &proj) if err != nil { return &infrav3.Cluster{}, err } @@ -155,7 +155,7 @@ func (es *clusterService) Create(ctx context.Context, cluster *infrav3.Cluster) return cluster, fmt.Errorf(errormsg) } - clusterPresent, err := pg.GetByNamePartnerOrg(ctx, es.db, cluster.Metadata.Name, uuid.NullUUID{UUID: proj.PartnerId, Valid: true}, + clusterPresent, err := dao.GetByNamePartnerOrg(ctx, es.db, cluster.Metadata.Name, uuid.NullUUID{UUID: proj.PartnerId, Valid: true}, uuid.NullUUID{UUID: proj.OrganizationId, Valid: true}, &models.Cluster{}) if err != nil && err.Error() == "sql: no rows in result set" { _log.Infof("Skipping as first time cluster create ") @@ -166,7 +166,7 @@ func (es *clusterService) Create(ctx context.Context, cluster *infrav3.Cluster) metro := &models.Metro{} if cluster.Spec.Metro != nil && cluster.Spec.Metro.Name != "" { - if mdb, err := pg.GetByNamePartnerOrg(ctx, es.db, cluster.Spec.Metro.Name, uuid.NullUUID{UUID: proj.PartnerId, Valid: true}, uuid.NullUUID{UUID: uuid.Nil, Valid: false}, metro); err != nil { + if mdb, err := dao.GetByNamePartnerOrg(ctx, es.db, cluster.Spec.Metro.Name, uuid.NullUUID{UUID: proj.PartnerId, Valid: true}, uuid.NullUUID{UUID: uuid.Nil, Valid: false}, metro); err != nil { errormsg = "Invalid cluster location, provide a valid metro name" cluster.Status = &commonv3.Status{ ConditionType: "Create", @@ -240,7 +240,7 @@ func (es *clusterService) Create(ctx context.Context, cluster *infrav3.Cluster) return &infrav3.Cluster{}, err } - err = dao.CreateCluster(ctx, tx, edb) + err = cdao.CreateCluster(ctx, tx, edb) if err != nil { tx.Rollback() return &infrav3.Cluster{}, err @@ -254,7 +254,7 @@ func (es *clusterService) Create(ctx context.Context, cluster *infrav3.Cluster) ProjectID: edb.ProjectId, ClusterID: edb.ID, } - err = dao.CreateProjectCluster(ctx, tx, pc) + err = cdao.CreateProjectCluster(ctx, tx, pc) if err != nil { tx.Rollback() return &infrav3.Cluster{}, err @@ -278,7 +278,7 @@ func (es *clusterService) Create(ctx context.Context, cluster *infrav3.Cluster) YamlContent: operatorSpecEncoded, } - err = dao.CreateOperatorBootstrap(ctx, tx, &bootstrapData) + err = cdao.CreateOperatorBootstrap(ctx, tx, &bootstrapData) if err != nil { tx.Rollback() cluster.Status = &commonv3.Status{ @@ -323,14 +323,14 @@ func (s *clusterService) Select(ctx context.Context, cluster *infrav3.Cluster, i if err != nil { id = uuid.Nil } - c, err := dao.GetCluster(ctx, s.db, &models.Cluster{ID: id, Name: cluster.Metadata.Name}) + c, err := cdao.GetCluster(ctx, s.db, &models.Cluster{ID: id, Name: cluster.Metadata.Name}) if err != nil { return &infrav3.Cluster{}, err } var projects []models.ProjectCluster if isExtended { - projects, err = dao.GetProjectsForCluster(ctx, s.db, c.ID) + projects, err = cdao.GetProjectsForCluster(ctx, s.db, c.ID) if err != nil { return &infrav3.Cluster{}, err } @@ -338,7 +338,7 @@ func (s *clusterService) Select(ctx context.Context, cluster *infrav3.Cluster, i var metro *models.Metro if c.MetroId != uuid.Nil { - entity, err := pg.GetByID(ctx, s.db, c.MetroId, &models.Metro{}) + entity, err := dao.GetByID(ctx, s.db, c.MetroId, &models.Metro{}) if err != nil { _log.Errorf("failed to fetch metro details", err) } @@ -366,13 +366,13 @@ func (s *clusterService) Get(ctx context.Context, opts ...query.Option) (*infrav if err != nil { id = uuid.Nil } - c, err := dao.GetCluster(ctx, s.db, &models.Cluster{ID: id, Name: queryOptions.Name}) + c, err := cdao.GetCluster(ctx, s.db, &models.Cluster{ID: id, Name: queryOptions.Name}) if err != nil { return &infrav3.Cluster{}, err } var projects []models.ProjectCluster if queryOptions.Extended { - projects, err = dao.GetProjectsForCluster(ctx, s.db, c.ID) + projects, err = cdao.GetProjectsForCluster(ctx, s.db, c.ID) if err != nil { return &infrav3.Cluster{}, err } @@ -390,19 +390,19 @@ func (s *clusterService) Get(ctx context.Context, opts ...query.Option) (*infrav func (s *clusterService) prepareClusterResponse(ctx context.Context, clstr *infrav3.Cluster, c *models.Cluster, metro *models.Metro, projects []models.ProjectCluster, isExtended bool) *infrav3.Cluster { var part models.Partner - _, err := pg.GetNameById(ctx, s.db, c.PartnerId, &part) + _, err := dao.GetNameById(ctx, s.db, c.PartnerId, &part) if err != nil { _log.Infow("unable to fetch partner information, ", err.Error()) } var org models.Organization - _, err = pg.GetNameById(ctx, s.db, c.OrganizationId, &org) + _, err = dao.GetNameById(ctx, s.db, c.OrganizationId, &org) if err != nil { _log.Infow("unable to fetch organization information, ", err.Error()) } var proj models.Project - _, err = pg.GetNameById(ctx, s.db, c.ProjectId, &proj) + _, err = dao.GetNameById(ctx, s.db, c.ProjectId, &proj) if err != nil { _log.Infow("unable to fetch project information, ", err.Error()) } @@ -484,7 +484,7 @@ func (cs *clusterService) Update(ctx context.Context, cluster *infrav3.Cluster) return cluster, fmt.Errorf("invalid cluster data, name is missing") } - edb, err := pg.GetByName(ctx, cs.db, cluster.Metadata.Name, &models.Cluster{}) + edb, err := dao.GetByName(ctx, cs.db, cluster.Metadata.Name, &models.Cluster{}) if err != nil { return &infrav3.Cluster{}, fmt.Errorf(errormsg) } @@ -531,7 +531,7 @@ func (cs *clusterService) Update(ctx context.Context, cluster *infrav3.Cluster) if cluster.Spec.Metro != nil && cdb.MetroId.String() != cluster.Spec.Metro.Id { metro := &models.Metro{} if cluster.Spec.Metro.Name != "" { - if mdb, err := pg.GetByNamePartnerOrg(ctx, cs.db, cluster.Spec.Metro.Name, uuid.NullUUID{UUID: pid, Valid: true}, uuid.NullUUID{UUID: uuid.Nil, Valid: false}, metro); err != nil { + if mdb, err := dao.GetByNamePartnerOrg(ctx, cs.db, cluster.Spec.Metro.Name, uuid.NullUUID{UUID: pid, Valid: true}, uuid.NullUUID{UUID: uuid.Nil, Valid: false}, metro); err != nil { errormsg = "Invalid cluster location, provide a valid metro name" cluster.Status = &commonv3.Status{ ConditionType: "Update", @@ -566,7 +566,7 @@ func (cs *clusterService) Update(ctx context.Context, cluster *infrav3.Cluster) } } - err = dao.UpdateCluster(ctx, cs.db, cdb) + err = cdao.UpdateCluster(ctx, cs.db, cdb) if err != nil { return &infrav3.Cluster{}, err } @@ -643,11 +643,11 @@ func (cs *clusterService) deleteCluster(ctx context.Context, clusterId, projectI ID: uuid.MustParse(clusterId), ProjectId: uuid.MustParse(projectId), } - err := dao.DeleteProjectsForCluster(ctx, cs.db, uuid.MustParse(clusterId)) + err := cdao.DeleteProjectsForCluster(ctx, cs.db, uuid.MustParse(clusterId)) if err != nil { return errors.Wrapf(err, "could not delete projects for cluster %s", clusterId) } - return dao.DeleteCluster(ctx, cs.db, &c) + return cdao.DeleteCluster(ctx, cs.db, &c) } func (cs *clusterService) List(ctx context.Context, opts ...query.Option) (*infrav3.ClusterList, error) { @@ -658,12 +658,12 @@ func (cs *clusterService) List(ctx context.Context, opts ...query.Option) (*infr } var proj models.Project - _, err := pg.GetByName(ctx, cs.db, queryOptions.Project, &proj) + _, err := dao.GetByName(ctx, cs.db, queryOptions.Project, &proj) if err != nil { return nil, err } - cdb, err := dao.ListClusters(ctx, cs.db, commonv3.QueryOptions{ + cdb, err := cdao.ListClusters(ctx, cs.db, commonv3.QueryOptions{ Project: proj.ID.String(), Organization: proj.OrganizationId.String(), Partner: proj.PartnerId.String(), @@ -684,13 +684,13 @@ func (cs *clusterService) List(ctx context.Context, opts ...query.Option) (*infr var items []*infrav3.Cluster for _, clstr := range cdb { - projects, err := dao.GetProjectsForCluster(ctx, cs.db, clstr.ID) + projects, err := cdao.GetProjectsForCluster(ctx, cs.db, clstr.ID) if err != nil { return nil, err } metro := &models.Metro{} if clstr.MetroId != uuid.Nil { - entity, err := pg.GetByID(ctx, cs.db, clstr.MetroId, &models.Metro{}) + entity, err := dao.GetByID(ctx, cs.db, clstr.MetroId, &models.Metro{}) if err != nil { return nil, err } @@ -755,7 +755,7 @@ func (s *clusterService) UpdateClusterConditionStatus(ctx context.Context, curre func (s *clusterService) UpdateClusterAnnotations(ctx context.Context, cluster *infrav3.Cluster) error { if len(cluster.Metadata.Annotations) > 0 { annBytes, _ := json.Marshal(cluster.Metadata.Annotations) - return dao.UpdateClusterAnnotations(ctx, s.db, &models.Cluster{ + return cdao.UpdateClusterAnnotations(ctx, s.db, &models.Cluster{ ID: uuid.MustParse(cluster.Metadata.Id), Annotations: json.RawMessage(annBytes), }) @@ -801,11 +801,11 @@ func (s *clusterService) GetClusterProjects(ctx context.Context, cluster *infrav if err != nil { id = uuid.Nil } - c, err := dao.GetCluster(ctx, s.db, &models.Cluster{ID: id, Name: cluster.Metadata.Name}) + c, err := cdao.GetCluster(ctx, s.db, &models.Cluster{ID: id, Name: cluster.Metadata.Name}) if err != nil { return nil, err } - projects, err := dao.GetProjectsForCluster(ctx, s.db, c.ID) + projects, err := cdao.GetProjectsForCluster(ctx, s.db, c.ID) if err != nil { return nil, err } @@ -819,7 +819,7 @@ func (s *clusterService) UpdateStatus(ctx context.Context, current *infrav3.Clus opt(&queryOptions) } - isAllowed, err := dao.ValidateClusterAccess(ctx, s.db, queryOptions) + isAllowed, err := cdao.ValidateClusterAccess(ctx, s.db, queryOptions) if err != nil { return err } @@ -1087,7 +1087,7 @@ func (s *clusterService) notifyCluster(ctx context.Context, c *infrav3.Cluster) return } - err = dao.Notify(s.db, clusterNotifyChan, string(b)) + err = cdao.Notify(s.db, clusterNotifyChan, string(b)) if err != nil { _log.Infow("unable to send cluster notification", "error", err) return diff --git a/pkg/service/group.go b/pkg/service/group.go index c1a1da9..b942676 100644 --- a/pkg/service/group.go +++ b/pkg/service/group.go @@ -9,7 +9,6 @@ import ( "github.com/RafaySystems/rcloud-base/internal/dao" "github.com/RafaySystems/rcloud-base/internal/models" - "github.com/RafaySystems/rcloud-base/internal/persistence/provider/pg" authzv1 "github.com/RafaySystems/rcloud-base/proto/types/authz" v3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" userv3 "github.com/RafaySystems/rcloud-base/proto/types/userpb/v3" @@ -53,15 +52,15 @@ func NewGroupService(db *bun.DB, azc AuthzService) GroupService { func (s *groupService) deleteGroupRoleRelaitons(ctx context.Context, db bun.IDB, groupId uuid.UUID, group *userv3.Group) (*userv3.Group, error) { // delete previous entries // TODO: single delete command - err := pg.DeleteX(ctx, db, "group_id", groupId, &models.GroupRole{}) + err := dao.DeleteX(ctx, db, "group_id", groupId, &models.GroupRole{}) if err != nil { return &userv3.Group{}, err } - err = pg.DeleteX(ctx, db, "group_id", groupId, &models.ProjectGroupRole{}) + err = dao.DeleteX(ctx, db, "group_id", groupId, &models.ProjectGroupRole{}) if err != nil { return &userv3.Group{}, err } - err = pg.DeleteX(ctx, db, "group_id", groupId, &models.ProjectGroupNamespaceRole{}) + err = dao.DeleteX(ctx, db, "group_id", groupId, &models.ProjectGroupNamespaceRole{}) if err != nil { return &userv3.Group{}, err } @@ -84,7 +83,7 @@ func (s *groupService) createGroupRoleRelations(ctx context.Context, db bun.IDB, var ps []*authzv1.Policy for _, pnr := range projectNamespaceRoles { role := pnr.GetRole() - entity, err := pg.GetIdByName(ctx, db, role, &models.Role{}) + entity, err := dao.GetIdByName(ctx, db, role, &models.Role{}) if err != nil { return &userv3.Group{}, fmt.Errorf("unable to find role '%v'", role) } @@ -100,7 +99,7 @@ func (s *groupService) createGroupRoleRelations(ctx context.Context, db bun.IDB, namespaceId := pnr.GetNamespace() // TODO: lookup id from name switch { case namespaceId != 0: - projectId, err := pg.GetProjectId(ctx, db, project) + projectId, err := dao.GetProjectId(ctx, db, project) if err != nil { return &userv3.Group{}, fmt.Errorf("unable to find project '%v'", project) } @@ -124,7 +123,7 @@ func (s *groupService) createGroupRoleRelations(ctx context.Context, db bun.IDB, Obj: role, }) case project != "": - projectId, err := pg.GetProjectId(ctx, db, project) + projectId, err := dao.GetProjectId(ctx, db, project) if err != nil { return &userv3.Group{}, fmt.Errorf("unable to find project '%v'", project) } @@ -166,19 +165,19 @@ func (s *groupService) createGroupRoleRelations(ctx context.Context, db bun.IDB, } } if len(pgnrs) > 0 { - _, err := pg.Create(ctx, db, &pgnrs) + _, err := dao.Create(ctx, db, &pgnrs) if err != nil { return &userv3.Group{}, err } } if len(pgrs) > 0 { - _, err := pg.Create(ctx, db, &pgrs) + _, err := dao.Create(ctx, db, &pgrs) if err != nil { return &userv3.Group{}, err } } if len(grs) > 0 { - _, err := pg.Create(ctx, db, &grs) + _, err := dao.Create(ctx, db, &grs) if err != nil { return &userv3.Group{}, err } @@ -195,7 +194,7 @@ func (s *groupService) createGroupRoleRelations(ctx context.Context, db bun.IDB, } func (s *groupService) deleteGroupAccountRelations(ctx context.Context, db bun.IDB, groupId uuid.UUID, group *userv3.Group) (*userv3.Group, error) { - err := pg.DeleteX(ctx, db, "group_id", groupId, &models.GroupAccount{}) + err := dao.DeleteX(ctx, db, "group_id", groupId, &models.GroupAccount{}) if err != nil { return &userv3.Group{}, fmt.Errorf("unable to delete user; %v", err) } @@ -214,7 +213,7 @@ func (s *groupService) createGroupAccountRelations(ctx context.Context, db bun.I var ugs []*authzv1.UserGroup for _, account := range unique(group.GetSpec().GetUsers()) { // FIXME: do combined lookup - entity, err := pg.GetIdByTraits(ctx, db, account, &models.KratosIdentities{}) + entity, err := dao.GetIdByTraits(ctx, db, account, &models.KratosIdentities{}) if err != nil { return &userv3.Group{}, fmt.Errorf("unable to find user '%v'", account) } @@ -237,7 +236,7 @@ func (s *groupService) createGroupAccountRelations(ctx context.Context, db bun.I if len(grpaccs) == 0 { return group, nil } - _, err := pg.Create(ctx, db, &grpaccs) + _, err := dao.Create(ctx, db, &grpaccs) if err != nil { return &userv3.Group{}, err } @@ -255,11 +254,11 @@ func (s *groupService) createGroupAccountRelations(ctx context.Context, db bun.I func (s *groupService) getPartnerOrganization(ctx context.Context, db bun.IDB, group *userv3.Group) (uuid.UUID, uuid.UUID, error) { partner := group.GetMetadata().GetPartner() org := group.GetMetadata().GetOrganization() - partnerId, err := pg.GetPartnerId(ctx, db, partner) + partnerId, err := dao.GetPartnerId(ctx, db, partner) if err != nil { return uuid.Nil, uuid.Nil, err } - organizationId, err := pg.GetOrganizationId(ctx, db, org) + organizationId, err := dao.GetOrganizationId(ctx, db, org) if err != nil { return partnerId, uuid.Nil, err } @@ -272,7 +271,7 @@ func (s *groupService) Create(ctx context.Context, group *userv3.Group) (*userv3 if err != nil { return nil, fmt.Errorf("unable to get partner and org id") } - g, _ := pg.GetIdByNamePartnerOrg(ctx, s.db, group.GetMetadata().GetName(), uuid.NullUUID{UUID: partnerId, Valid: true}, uuid.NullUUID{UUID: organizationId, Valid: true}, &models.Group{}) + g, _ := dao.GetIdByNamePartnerOrg(ctx, s.db, group.GetMetadata().GetName(), uuid.NullUUID{UUID: partnerId, Valid: true}, uuid.NullUUID{UUID: organizationId, Valid: true}, &models.Group{}) if g != nil { return nil, fmt.Errorf("group '%v' already exists", group.GetMetadata().GetName()) } @@ -293,7 +292,7 @@ func (s *groupService) Create(ctx context.Context, group *userv3.Group) (*userv3 return &userv3.Group{}, err } - entity, err := pg.Create(ctx, tx, &grp) + entity, err := dao.Create(ctx, tx, &grp) if err != nil { tx.Rollback() // TODO: check errors for rollback (and do what?) return &userv3.Group{}, err @@ -367,7 +366,7 @@ func (s *groupService) GetByID(ctx context.Context, group *userv3.Group) (*userv if err != nil { return &userv3.Group{}, err } - entity, err := pg.GetByID(ctx, s.db, uid, &models.Group{}) + entity, err := dao.GetByID(ctx, s.db, uid, &models.Group{}) if err != nil { return &userv3.Group{}, err } @@ -385,7 +384,7 @@ func (s *groupService) GetByName(ctx context.Context, group *userv3.Group) (*use if err != nil { return nil, fmt.Errorf("unable to get partner and org id") } - entity, err := pg.GetByNamePartnerOrg(ctx, s.db, name, uuid.NullUUID{UUID: partnerId, Valid: true}, uuid.NullUUID{UUID: organizationId, Valid: true}, &models.Group{}) + entity, err := dao.GetByNamePartnerOrg(ctx, s.db, name, uuid.NullUUID{UUID: partnerId, Valid: true}, uuid.NullUUID{UUID: organizationId, Valid: true}, &models.Group{}) if err != nil { return &userv3.Group{}, err } @@ -404,7 +403,7 @@ func (s *groupService) Update(ctx context.Context, group *userv3.Group) (*userv3 if err != nil { return nil, fmt.Errorf("unable to get partner and org id") } - entity, err := pg.GetByNamePartnerOrg(ctx, s.db, name, uuid.NullUUID{UUID: partnerId, Valid: true}, uuid.NullUUID{UUID: organizationId, Valid: true}, &models.Group{}) + entity, err := dao.GetByNamePartnerOrg(ctx, s.db, name, uuid.NullUUID{UUID: partnerId, Valid: true}, uuid.NullUUID{UUID: organizationId, Valid: true}, &models.Group{}) if err != nil { return &userv3.Group{}, fmt.Errorf("no group found with name '%v'", name) } @@ -443,7 +442,7 @@ func (s *groupService) Update(ctx context.Context, group *userv3.Group) (*userv3 return &userv3.Group{}, err } - _, err = pg.Update(ctx, tx, grp.ID, grp) + _, err = dao.Update(ctx, tx, grp.ID, grp) if err != nil { tx.Rollback() return &userv3.Group{}, err @@ -472,7 +471,7 @@ func (s *groupService) Delete(ctx context.Context, group *userv3.Group) (*userv3 if err != nil { return &userv3.Group{}, fmt.Errorf("unable to get partner and org id") } - entity, err := pg.GetByNamePartnerOrg(ctx, s.db, name, uuid.NullUUID{UUID: partnerId, Valid: true}, uuid.NullUUID{UUID: organizationId, Valid: true}, &models.Group{}) + entity, err := dao.GetByNamePartnerOrg(ctx, s.db, name, uuid.NullUUID{UUID: partnerId, Valid: true}, uuid.NullUUID{UUID: organizationId, Valid: true}, &models.Group{}) if err != nil { return &userv3.Group{}, err } @@ -493,7 +492,7 @@ func (s *groupService) Delete(ctx context.Context, group *userv3.Group) (*userv3 tx.Rollback() return &userv3.Group{}, err } - err = pg.Delete(ctx, s.db, grp.ID, grp) + err = dao.Delete(ctx, s.db, grp.ID, grp) if err != nil { tx.Rollback() return &userv3.Group{}, err @@ -520,16 +519,16 @@ func (s *groupService) List(ctx context.Context, group *userv3.Group) (*userv3.G }, } if len(group.Metadata.Organization) > 0 { - orgId, err := pg.GetOrganizationId(ctx, s.db, group.Metadata.Organization) + orgId, err := dao.GetOrganizationId(ctx, s.db, group.Metadata.Organization) if err != nil { return groupList, err } - partId, err := pg.GetPartnerId(ctx, s.db, group.Metadata.Partner) + partId, err := dao.GetPartnerId(ctx, s.db, group.Metadata.Partner) if err != nil { return groupList, err } var grps []models.Group - entities, err := pg.List(ctx, s.db, uuid.NullUUID{UUID: partId, Valid: true}, uuid.NullUUID{UUID: orgId, Valid: true}, &grps) + entities, err := dao.List(ctx, s.db, uuid.NullUUID{UUID: partId, Valid: true}, uuid.NullUUID{UUID: orgId, Valid: true}, &grps) if err != nil { return groupList, err } diff --git a/pkg/service/idp.go b/pkg/service/idp.go index 9905db5..41a7ca2 100644 --- a/pkg/service/idp.go +++ b/pkg/service/idp.go @@ -14,8 +14,8 @@ import ( "net/url" "time" + "github.com/RafaySystems/rcloud-base/internal/dao" "github.com/RafaySystems/rcloud-base/internal/models" - "github.com/RafaySystems/rcloud-base/internal/persistence/provider/pg" commonv3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" systemv3 "github.com/RafaySystems/rcloud-base/proto/types/systempb/v3" "github.com/google/uuid" @@ -104,11 +104,11 @@ func generateSpCert(host string) (string, string, error) { func (s *idpService) getPartnerOrganization(ctx context.Context, provider *systemv3.Idp) (uuid.UUID, uuid.UUID, error) { partner := provider.GetMetadata().GetPartner() org := provider.GetMetadata().GetOrganization() - partnerId, err := pg.GetPartnerId(ctx, s.db, partner) + partnerId, err := dao.GetPartnerId(ctx, s.db, partner) if err != nil { return uuid.Nil, uuid.Nil, err } - organizationId, err := pg.GetOrganizationId(ctx, s.db, org) + organizationId, err := dao.GetOrganizationId(ctx, s.db, org) if err != nil { return partnerId, uuid.Nil, err } @@ -131,7 +131,7 @@ func (s *idpService) Create(ctx context.Context, idp *systemv3.Idp) (*systemv3.I if err != nil { return nil, fmt.Errorf("unable to get partner and org id") } - i, _ := pg.GetIdByNamePartnerOrg( + i, _ := dao.GetIdByNamePartnerOrg( ctx, s.db, idp.GetMetadata().GetName(), @@ -144,7 +144,7 @@ func (s *idpService) Create(ctx context.Context, idp *systemv3.Idp) (*systemv3.I } e := &models.Idp{} - pg.GetX(ctx, s.db, "domain", domain, e) + dao.GetX(ctx, s.db, "domain", domain, e) if e.Domain == domain { return &systemv3.Idp{}, fmt.Errorf("DUPLICATE DOMAIN") } @@ -176,7 +176,7 @@ func (s *idpService) Create(ctx context.Context, idp *systemv3.Idp) (*systemv3.I entity.SpCert = spcert entity.SpKey = spkey } - _, err = pg.Create(ctx, s.db, entity) + _, err = dao.Create(ctx, s.db, entity) if err != nil { return &systemv3.Idp{}, err } @@ -215,7 +215,7 @@ func (s *idpService) GetByID(ctx context.Context, idp *systemv3.Idp) (*systemv3. } entity := &models.Idp{} // TODO: Check for existence of id before GetByID - _, err = pg.GetByID(ctx, s.db, id, entity) + _, err = dao.GetByID(ctx, s.db, id, entity) if err != nil { return &systemv3.Idp{}, err } @@ -256,7 +256,7 @@ func (s *idpService) GetByName(ctx context.Context, idp *systemv3.Idp) (*systemv return &systemv3.Idp{}, status.Error(codes.InvalidArgument, "EMPTY NAME") } entity := &models.Idp{} - _, err := pg.GetByName(ctx, s.db, name, entity) + _, err := dao.GetByName(ctx, s.db, name, entity) if err != nil { return &systemv3.Idp{}, err } @@ -302,14 +302,14 @@ func (s *idpService) Update(ctx context.Context, idp *systemv3.Idp) (*systemv3.I return &systemv3.Idp{}, status.Error(codes.InvalidArgument, "EMPTY DOMAIN") } - _, err := pg.GetByName(ctx, s.db, name, existingIdp) + _, err := dao.GetByName(ctx, s.db, name, existingIdp) if err != nil { // TODO: Handle both db and idp not exist errors // separately. return &systemv3.Idp{}, status.Errorf(codes.InvalidArgument, "IDP %q NOT EXIST", name) } - pg.GetX(ctx, s.db, "domain", domain, existingIdp) + dao.GetX(ctx, s.db, "domain", domain, existingIdp) if existingIdp.Domain == domain { return &systemv3.Idp{}, status.Error(codes.InvalidArgument, "DUPLICATE DOMAIN") } @@ -352,7 +352,7 @@ func (s *idpService) Update(ctx context.Context, idp *systemv3.Idp) (*systemv3.I entity.SpKey = spkey } - _, err = pg.Update(ctx, s.db, existingIdp.Id, entity) + _, err = dao.Update(ctx, s.db, existingIdp.Id, entity) if err != nil { return &systemv3.Idp{}, err } @@ -390,7 +390,7 @@ func (s *idpService) List(ctx context.Context) (*systemv3.IdpList, error) { orgID uuid.NullUUID parID uuid.NullUUID ) - _, err := pg.List(ctx, s.db, parID, orgID, &entities) + _, err := dao.List(ctx, s.db, parID, orgID, &entities) if err != nil { return &systemv3.IdpList{}, err } @@ -443,12 +443,12 @@ func (s *idpService) Delete(ctx context.Context, idp *systemv3.Idp) error { return status.Error(codes.InvalidArgument, "EMPTY NAME") } - _, err := pg.GetByName(ctx, s.db, name, entity) + _, err := dao.GetByName(ctx, s.db, name, entity) if err != nil { return status.Errorf(codes.InvalidArgument, "IDP %q NOT EXISTS", name) } - err = pg.Delete(ctx, s.db, entity.Id, &models.Idp{}) + err = dao.Delete(ctx, s.db, entity.Id, &models.Idp{}) if err != nil { return err } diff --git a/pkg/service/metro.go b/pkg/service/metro.go index 87df315..cf7e1f0 100644 --- a/pkg/service/metro.go +++ b/pkg/service/metro.go @@ -4,8 +4,8 @@ import ( "context" "time" + "github.com/RafaySystems/rcloud-base/internal/dao" "github.com/RafaySystems/rcloud-base/internal/models" - "github.com/RafaySystems/rcloud-base/internal/persistence/provider/pg" commonv3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" infrav3 "github.com/RafaySystems/rcloud-base/proto/types/infrapb/v3" "github.com/google/uuid" @@ -44,7 +44,7 @@ func NewMetroService(db *bun.DB) MetroService { func (s *metroService) Create(ctx context.Context, metro *infrav3.Location) (*infrav3.Location, error) { var part models.Partner - _, err := pg.GetByName(ctx, s.db, metro.Metadata.Partner, &part) + _, err := dao.GetByName(ctx, s.db, metro.Metadata.Partner, &part) if err != nil { return nil, err } @@ -65,7 +65,7 @@ func (s *metroService) Create(ctx context.Context, metro *infrav3.Location) (*in OrganizationId: uuid.Nil, PartnerId: part.ID, } - _, err = pg.Create(ctx, s.db, &metrodb) + _, err = dao.Create(ctx, s.db, &metrodb) if err != nil { return nil, err } @@ -78,7 +78,7 @@ func (s *metroService) GetByName(ctx context.Context, name string) (*infrav3.Loc var metro infrav3.Location - entity, err := pg.GetByName(ctx, s.db, name, &models.Metro{}) + entity, err := dao.GetByName(ctx, s.db, name, &models.Metro{}) if err != nil { return nil, err } @@ -109,7 +109,7 @@ func (s *metroService) GetByName(ctx context.Context, name string) (*infrav3.Loc func (s *metroService) GetById(ctx context.Context, id uuid.UUID) (*infrav3.Location, error) { var location infrav3.Location - entity, err := pg.GetByID(ctx, s.db, id, &models.Metro{}) + entity, err := dao.GetByID(ctx, s.db, id, &models.Metro{}) if err != nil { return nil, err } @@ -141,7 +141,7 @@ func (s *metroService) GetById(ctx context.Context, id uuid.UUID) (*infrav3.Loca func (s *metroService) Update(ctx context.Context, metro *infrav3.Location) (*infrav3.Location, error) { - entity, err := pg.GetByName(ctx, s.db, metro.Metadata.Name, &models.Metro{}) + entity, err := dao.GetByName(ctx, s.db, metro.Metadata.Name, &models.Metro{}) if err != nil { return metro, err } @@ -157,7 +157,7 @@ func (s *metroService) Update(ctx context.Context, metro *infrav3.Location) (*in metrodb.Longitude = metro.Spec.Longitude metrodb.ModifiedAt = time.Now() - _, err = pg.Update(ctx, s.db, metrodb.ID, metrodb) + _, err = dao.Update(ctx, s.db, metrodb.ID, metrodb) if err != nil { return metro, err } @@ -168,12 +168,12 @@ func (s *metroService) Update(ctx context.Context, metro *infrav3.Location) (*in func (s *metroService) Delete(ctx context.Context, metro *infrav3.Location) (*infrav3.Location, error) { - entity, err := pg.GetByName(ctx, s.db, metro.Metadata.Name, &models.Metro{}) + entity, err := dao.GetByName(ctx, s.db, metro.Metadata.Name, &models.Metro{}) if err != nil { return metro, err } if metrodb, ok := entity.(*models.Metro); ok { - err = pg.Delete(ctx, s.db, metrodb.ID, metrodb) + err = dao.Delete(ctx, s.db, metrodb.ID, metrodb) if err != nil { return metro, err } @@ -188,12 +188,12 @@ func (s *metroService) List(ctx context.Context, partner string) (*infrav3.Locat var metrodbs []models.Metro var part models.Partner - _, err := pg.GetByName(ctx, s.db, partner, &part) + _, err := dao.GetByName(ctx, s.db, partner, &part) if err != nil { return nil, err } - entities, err := pg.List(ctx, s.db, uuid.NullUUID{UUID: part.ID, Valid: true}, uuid.NullUUID{UUID: uuid.Nil, Valid: false}, &metrodbs) + entities, err := dao.List(ctx, s.db, uuid.NullUUID{UUID: part.ID, Valid: true}, uuid.NullUUID{UUID: uuid.Nil, Valid: false}, &metrodbs) if err != nil { return nil, err } @@ -226,7 +226,7 @@ func (s *metroService) List(ctx context.Context, partner string) (*infrav3.Locat } func (s *metroService) GetIDByName(ctx context.Context, name string) (uuid.UUID, error) { - entity, err := pg.GetByName(ctx, s.db, name, &models.Metro{}) + entity, err := dao.GetByName(ctx, s.db, name, &models.Metro{}) if err != nil { return uuid.Nil, err } diff --git a/pkg/service/oidc_provider.go b/pkg/service/oidc_provider.go index 3b184e9..70e7917 100644 --- a/pkg/service/oidc_provider.go +++ b/pkg/service/oidc_provider.go @@ -8,8 +8,8 @@ import ( "net/url" "time" + "github.com/RafaySystems/rcloud-base/internal/dao" "github.com/RafaySystems/rcloud-base/internal/models" - "github.com/RafaySystems/rcloud-base/internal/persistence/provider/pg" commonv3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" systemv3 "github.com/RafaySystems/rcloud-base/proto/types/systempb/v3" "github.com/google/uuid" @@ -50,11 +50,11 @@ func validateURL(rawURL string) error { func (s *oidcProvider) getPartnerOrganization(ctx context.Context, provider *systemv3.OIDCProvider) (uuid.UUID, uuid.UUID, error) { partner := provider.GetMetadata().GetPartner() org := provider.GetMetadata().GetOrganization() - partnerId, err := pg.GetPartnerId(ctx, s.db, partner) + partnerId, err := dao.GetPartnerId(ctx, s.db, partner) if err != nil { return uuid.Nil, uuid.Nil, err } - organizationId, err := pg.GetOrganizationId(ctx, s.db, org) + organizationId, err := dao.GetOrganizationId(ctx, s.db, org) if err != nil { return partnerId, uuid.Nil, err } @@ -75,7 +75,7 @@ func (s *oidcProvider) Create(ctx context.Context, provider *systemv3.OIDCProvid if err != nil { return nil, fmt.Errorf("unable to get partner and org id") } - p, _ := pg.GetIdByNamePartnerOrg( + p, _ := dao.GetIdByNamePartnerOrg( ctx, s.db, provider.GetMetadata().GetName(), @@ -124,7 +124,7 @@ func (s *oidcProvider) Create(ctx context.Context, provider *systemv3.OIDCProvid RequestedClaims: provider.Spec.GetRequestedClaims().AsMap(), Predefined: provider.Spec.GetPredefined(), } - _, err = pg.Create(ctx, s.db, entity) + _, err = dao.Create(ctx, s.db, entity) if err != nil { return &systemv3.OIDCProvider{}, err } @@ -162,7 +162,7 @@ func (s *oidcProvider) GetByID(ctx context.Context, provider *systemv3.OIDCProvi } entity := &models.OIDCProvider{} - _, err = pg.GetByID(ctx, s.db, id, entity) + _, err = dao.GetByID(ctx, s.db, id, entity) // TODO: Return proper error for Id not exist if err != nil { return &systemv3.OIDCProvider{}, err @@ -201,7 +201,7 @@ func (s *oidcProvider) GetByName(ctx context.Context, provider *systemv3.OIDCPro } entity := &models.OIDCProvider{} - _, err := pg.GetByName(ctx, s.db, name, entity) + _, err := dao.GetByName(ctx, s.db, name, entity) if err != nil { if errors.Is(err, sql.ErrNoRows) { @@ -246,7 +246,7 @@ func (s *oidcProvider) List(ctx context.Context) (*systemv3.OIDCProviderList, er orgID uuid.NullUUID parID uuid.NullUUID ) - _, err := pg.List(ctx, s.db, parID, orgID, &entities) + _, err := dao.List(ctx, s.db, parID, orgID, &entities) if err != nil { return &systemv3.OIDCProviderList{}, nil } @@ -302,7 +302,7 @@ func (s *oidcProvider) Update(ctx context.Context, provider *systemv3.OIDCProvid } existingP := &models.OIDCProvider{} - _, err = pg.GetByName(ctx, s.db, name, existingP) + _, err = dao.GetByName(ctx, s.db, name, existingP) if err != nil { if errors.Is(err, sql.ErrNoRows) { return &systemv3.OIDCProvider{}, status.Errorf(codes.InvalidArgument, "OIDC PROVIDER %q NOT EXIST", name) @@ -347,7 +347,7 @@ func (s *oidcProvider) Update(ctx context.Context, provider *systemv3.OIDCProvid RequestedClaims: provider.Spec.GetRequestedClaims().AsMap(), Predefined: provider.Spec.GetPredefined(), } - _, err = pg.Update(ctx, s.db, existingP.Id, entity) + _, err = dao.Update(ctx, s.db, existingP.Id, entity) if err != nil { return &systemv3.OIDCProvider{}, err } @@ -384,12 +384,12 @@ func (s *oidcProvider) Delete(ctx context.Context, provider *systemv3.OIDCProvid if len(name) == 0 { return status.Error(codes.InvalidArgument, "EMPTY NAME") } - _, err := pg.GetByName(ctx, s.db, name, entity) + _, err := dao.GetByName(ctx, s.db, name, entity) if err != nil { return status.Errorf(codes.InvalidArgument, "OIDC PROVIDER %q NOT EXIST", name) } - err = pg.Delete(ctx, s.db, entity.Id, &models.OIDCProvider{}) + err = dao.Delete(ctx, s.db, entity.Id, &models.OIDCProvider{}) if err != nil { return err } diff --git a/pkg/service/organization.go b/pkg/service/organization.go index 795baa2..70f4d69 100644 --- a/pkg/service/organization.go +++ b/pkg/service/organization.go @@ -6,8 +6,8 @@ import ( "fmt" "time" + "github.com/RafaySystems/rcloud-base/internal/dao" "github.com/RafaySystems/rcloud-base/internal/models" - "github.com/RafaySystems/rcloud-base/internal/persistence/provider/pg" v3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" systemv3 "github.com/RafaySystems/rcloud-base/proto/types/systempb/v3" "github.com/google/uuid" @@ -49,7 +49,7 @@ func NewOrganizationService(db *bun.DB) OrganizationService { func (s *organizationService) Create(ctx context.Context, org *systemv3.Organization) (*systemv3.Organization, error) { var partner models.Partner - _, err := pg.GetByName(ctx, s.db, org.Metadata.Partner, &partner) + _, err := dao.GetByName(ctx, s.db, org.Metadata.Partner, &partner) if err != nil { return &systemv3.Organization{}, err } @@ -91,7 +91,7 @@ func (s *organizationService) Create(ctx context.Context, org *systemv3.Organiza CreatedAt: time.Now(), ModifiedAt: time.Now(), } - entity, err := pg.Create(ctx, s.db, &organization) + entity, err := dao.Create(ctx, s.db, &organization) if err != nil { return &systemv3.Organization{}, err } @@ -119,7 +119,7 @@ func (s *organizationService) GetByID(ctx context.Context, id string) (*systemv3 if err != nil { return &systemv3.Organization{}, err } - entity, err := pg.GetByID(ctx, s.db, uid, &models.Organization{}) + entity, err := dao.GetByID(ctx, s.db, uid, &models.Organization{}) if err != nil { return &systemv3.Organization{}, err } @@ -127,7 +127,7 @@ func (s *organizationService) GetByID(ctx context.Context, id string) (*systemv3 if org, ok := entity.(*models.Organization); ok { var partner models.Partner - _, err := pg.GetByID(ctx, s.db, org.PartnerId, &partner) + _, err := dao.GetByID(ctx, s.db, org.PartnerId, &partner) if err != nil { return &systemv3.Organization{}, err } @@ -165,7 +165,7 @@ func (s *organizationService) GetByName(ctx context.Context, name string) (*syst Name: name, }, } - entity, err := pg.GetByName(ctx, s.db, name, &models.Organization{}) + entity, err := dao.GetByName(ctx, s.db, name, &models.Organization{}) if err != nil { return &systemv3.Organization{}, err } @@ -173,7 +173,7 @@ func (s *organizationService) GetByName(ctx context.Context, name string) (*syst if org, ok := entity.(*models.Organization); ok { var partner models.Partner - _, err := pg.GetByID(ctx, s.db, org.PartnerId, &partner) + _, err := dao.GetByID(ctx, s.db, org.PartnerId, &partner) if err != nil { return &systemv3.Organization{}, err } @@ -189,7 +189,7 @@ func (s *organizationService) GetByName(ctx context.Context, name string) (*syst func (s *organizationService) Update(ctx context.Context, organization *systemv3.Organization) (*systemv3.Organization, error) { - entity, err := pg.GetByName(ctx, s.db, organization.Metadata.Name, &models.Organization{}) + entity, err := dao.GetByName(ctx, s.db, organization.Metadata.Name, &models.Organization{}) if err != nil { return &systemv3.Organization{}, err } @@ -222,7 +222,7 @@ func (s *organizationService) Update(ctx context.Context, organization *systemv3 org.IsTOTPEnabled = organization.GetSpec().GetIsTotpEnabled() org.AreClustersShared = organization.GetSpec().GetAreClustersShared() - _, err = pg.Update(ctx, s.db, org.ID, org) + _, err = dao.Update(ctx, s.db, org.ID, org) if err != nil { return &systemv3.Organization{}, err } @@ -233,13 +233,13 @@ func (s *organizationService) Update(ctx context.Context, organization *systemv3 func (s *organizationService) Delete(ctx context.Context, organization *systemv3.Organization) (*systemv3.Organization, error) { - entity, err := pg.GetByName(ctx, s.db, organization.Metadata.Name, &models.Organization{}) + entity, err := dao.GetByName(ctx, s.db, organization.Metadata.Name, &models.Organization{}) if err != nil { return &systemv3.Organization{}, err } if org, ok := entity.(*models.Organization); ok { - err := pg.Delete(ctx, s.db, org.ID, org) + err := dao.Delete(ctx, s.db, org.ID, org) if err != nil { return &systemv3.Organization{}, err } @@ -264,13 +264,13 @@ func (s *organizationService) List(ctx context.Context, organization *systemv3.O } if len(organization.Metadata.Partner) > 0 { var partner models.Partner - _, err := pg.GetByName(ctx, s.db, organization.Metadata.Partner, &partner) + _, err := dao.GetByName(ctx, s.db, organization.Metadata.Partner, &partner) if err != nil { return &systemv3.OrganizationList{}, err } var orgs []models.Organization - entities, err := pg.List(ctx, s.db, uuid.NullUUID{UUID: partner.ID, Valid: true}, uuid.NullUUID{UUID: uuid.Nil}, &orgs) + entities, err := dao.List(ctx, s.db, uuid.NullUUID{UUID: partner.ID, Valid: true}, uuid.NullUUID{UUID: uuid.Nil}, &orgs) if err != nil { return &systemv3.OrganizationList{}, err } diff --git a/pkg/service/partner.go b/pkg/service/partner.go index 828daf7..4890893 100644 --- a/pkg/service/partner.go +++ b/pkg/service/partner.go @@ -5,8 +5,8 @@ import ( "encoding/json" "time" + "github.com/RafaySystems/rcloud-base/internal/dao" "github.com/RafaySystems/rcloud-base/internal/models" - "github.com/RafaySystems/rcloud-base/internal/persistence/provider/pg" v3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" systemv3 "github.com/RafaySystems/rcloud-base/proto/types/systempb/v3" "github.com/google/uuid" @@ -65,7 +65,7 @@ func (s *partnerService) Create(ctx context.Context, partner *systemv3.Partner) CreatedAt: time.Now(), ModifiedAt: time.Now(), } - entity, err := pg.Create(ctx, s.db, &part) + entity, err := dao.Create(ctx, s.db, &part) if err != nil { return &systemv3.Partner{}, err } @@ -94,7 +94,7 @@ func (s *partnerService) GetByID(ctx context.Context, id string) (*systemv3.Part if err != nil { return &systemv3.Partner{}, err } - entity, err := pg.GetByID(ctx, s.db, uid, &models.Partner{}) + entity, err := dao.GetByID(ctx, s.db, uid, &models.Partner{}) if err != nil { return &systemv3.Partner{}, err } @@ -152,7 +152,7 @@ func (s *partnerService) GetByName(ctx context.Context, name string) (*systemv3. }, } - entity, err := pg.GetByName(ctx, s.db, name, &models.Partner{}) + entity, err := dao.GetByName(ctx, s.db, name, &models.Partner{}) if err != nil { return &systemv3.Partner{}, err } @@ -203,7 +203,7 @@ func (s *partnerService) GetByName(ctx context.Context, name string) (*systemv3. func (s *partnerService) Update(ctx context.Context, partner *systemv3.Partner) (*systemv3.Partner, error) { - entity, err := pg.GetByName(ctx, s.db, partner.Metadata.Name, &models.Partner{}) + entity, err := dao.GetByName(ctx, s.db, partner.Metadata.Name, &models.Partner{}) if err != nil { return &systemv3.Partner{}, err } @@ -232,7 +232,7 @@ func (s *partnerService) Update(ctx context.Context, partner *systemv3.Partner) part.ModifiedAt = time.Now() //Update the partner details - _, err = pg.Update(ctx, s.db, part.ID, part) + _, err = dao.Update(ctx, s.db, part.ID, part) if err != nil { return &systemv3.Partner{}, err } @@ -246,13 +246,13 @@ func (s *partnerService) Update(ctx context.Context, partner *systemv3.Partner) } func (s *partnerService) Delete(ctx context.Context, partner *systemv3.Partner) (*systemv3.Partner, error) { - entity, err := pg.GetByName(ctx, s.db, partner.Metadata.Name, &models.Partner{}) + entity, err := dao.GetByName(ctx, s.db, partner.Metadata.Name, &models.Partner{}) if err != nil { return &systemv3.Partner{}, err } if part, ok := entity.(*models.Partner); ok { - err := pg.Delete(ctx, s.db, part.ID, part) + err := dao.Delete(ctx, s.db, part.ID, part) if err != nil { return &systemv3.Partner{}, err } diff --git a/pkg/service/project.go b/pkg/service/project.go index be852ea..e599f7e 100644 --- a/pkg/service/project.go +++ b/pkg/service/project.go @@ -5,8 +5,8 @@ import ( "fmt" "time" + "github.com/RafaySystems/rcloud-base/internal/dao" "github.com/RafaySystems/rcloud-base/internal/models" - "github.com/RafaySystems/rcloud-base/internal/persistence/provider/pg" v3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" systemv3 "github.com/RafaySystems/rcloud-base/proto/types/systempb/v3" "github.com/google/uuid" @@ -53,7 +53,7 @@ func (s *projectService) Create(ctx context.Context, project *systemv3.Project) } var org models.Organization - _, err := pg.GetByName(ctx, s.db, project.Metadata.Organization, &org) + _, err := dao.GetByName(ctx, s.db, project.Metadata.Organization, &org) if err != nil { return nil, err } @@ -69,7 +69,7 @@ func (s *projectService) Create(ctx context.Context, project *systemv3.Project) PartnerId: org.PartnerId, Default: project.GetSpec().GetDefault(), } - entity, err := pg.Create(ctx, s.db, &proj) + entity, err := dao.Create(ctx, s.db, &proj) if err != nil { return &systemv3.Project{}, err } @@ -100,7 +100,7 @@ func (s *projectService) GetByID(ctx context.Context, id string) (*systemv3.Proj if err != nil { return &systemv3.Project{}, err } - entity, err := pg.GetByID(ctx, s.db, uid, &models.Project{}) + entity, err := dao.GetByID(ctx, s.db, uid, &models.Project{}) if err != nil { return &systemv3.Project{}, err } @@ -135,7 +135,7 @@ func (s *projectService) GetByName(ctx context.Context, name string) (*systemv3. }, } - entity, err := pg.GetByName(ctx, s.db, name, &models.Project{}) + entity, err := dao.GetByName(ctx, s.db, name, &models.Project{}) if err != nil { return &systemv3.Project{}, err } @@ -143,13 +143,13 @@ func (s *projectService) GetByName(ctx context.Context, name string) (*systemv3. if proj, ok := entity.(*models.Project); ok { var org models.Organization - _, err := pg.GetByID(ctx, s.db, proj.OrganizationId, &org) + _, err := dao.GetByID(ctx, s.db, proj.OrganizationId, &org) if err != nil { return nil, err } var partner models.Partner - _, err = pg.GetByID(ctx, s.db, proj.PartnerId, &partner) + _, err = dao.GetByID(ctx, s.db, proj.PartnerId, &partner) if err != nil { return nil, err } @@ -173,7 +173,7 @@ func (s *projectService) GetByName(ctx context.Context, name string) (*systemv3. func (s *projectService) Update(ctx context.Context, project *systemv3.Project) (*systemv3.Project, error) { - entity, err := pg.GetByName(ctx, s.db, project.Metadata.Name, &models.Project{}) + entity, err := dao.GetByName(ctx, s.db, project.Metadata.Name, &models.Project{}) if err != nil { return &systemv3.Project{}, err } @@ -184,7 +184,7 @@ func (s *projectService) Update(ctx context.Context, project *systemv3.Project) proj.Default = project.Spec.Default proj.ModifiedAt = time.Now() - _, err = pg.Update(ctx, s.db, proj.ID, proj) + _, err = dao.Update(ctx, s.db, proj.ID, proj) if err != nil { return &systemv3.Project{}, err } @@ -199,12 +199,12 @@ func (s *projectService) Update(ctx context.Context, project *systemv3.Project) } func (s *projectService) Delete(ctx context.Context, project *systemv3.Project) (*systemv3.Project, error) { - entity, err := pg.GetByName(ctx, s.db, project.Metadata.Name, &models.Project{}) + entity, err := dao.GetByName(ctx, s.db, project.Metadata.Name, &models.Project{}) if err != nil { return &systemv3.Project{}, err } if proj, ok := entity.(*models.Project); ok { - err := pg.Delete(ctx, s.db, proj.ID, proj) + err := dao.Delete(ctx, s.db, proj.ID, proj) if err != nil { return &systemv3.Project{}, err } @@ -228,17 +228,17 @@ func (s *projectService) List(ctx context.Context, project *systemv3.Project) (* } if len(project.Metadata.Organization) > 0 { var org models.Organization - _, err := pg.GetByName(ctx, s.db, project.Metadata.Organization, &org) + _, err := dao.GetByName(ctx, s.db, project.Metadata.Organization, &org) if err != nil { return &systemv3.ProjectList{}, err } var part models.Partner - _, err = pg.GetByName(ctx, s.db, project.Metadata.Partner, &part) + _, err = dao.GetByName(ctx, s.db, project.Metadata.Partner, &part) if err != nil { return &systemv3.ProjectList{}, err } var projs []models.Project - entities, err := pg.List(ctx, s.db, uuid.NullUUID{UUID: part.ID, Valid: true}, uuid.NullUUID{UUID: org.ID, Valid: true}, &projs) + entities, err := dao.List(ctx, s.db, uuid.NullUUID{UUID: part.ID, Valid: true}, uuid.NullUUID{UUID: org.ID, Valid: true}, &projs) if err != nil { return &systemv3.ProjectList{}, err } diff --git a/pkg/service/role.go b/pkg/service/role.go index 56572e6..fb7dd6e 100644 --- a/pkg/service/role.go +++ b/pkg/service/role.go @@ -9,7 +9,6 @@ import ( "github.com/RafaySystems/rcloud-base/internal/dao" "github.com/RafaySystems/rcloud-base/internal/models" - "github.com/RafaySystems/rcloud-base/internal/persistence/provider/pg" authzv1 "github.com/RafaySystems/rcloud-base/proto/types/authz" v3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" rolev3 "github.com/RafaySystems/rcloud-base/proto/types/rolepb/v3" @@ -53,11 +52,11 @@ func NewRoleService(db *bun.DB, azc AuthzService) RoleService { func (s *roleService) getPartnerOrganization(ctx context.Context, db bun.IDB, role *rolev3.Role) (uuid.UUID, uuid.UUID, error) { partner := role.GetMetadata().GetPartner() org := role.GetMetadata().GetOrganization() - partnerId, err := pg.GetPartnerId(ctx, s.db, partner) + partnerId, err := dao.GetPartnerId(ctx, s.db, partner) if err != nil { return uuid.Nil, uuid.Nil, err } - organizationId, err := pg.GetOrganizationId(ctx, s.db, org) + organizationId, err := dao.GetOrganizationId(ctx, s.db, org) if err != nil { return partnerId, uuid.Nil, err } @@ -66,7 +65,7 @@ func (s *roleService) getPartnerOrganization(ctx context.Context, db bun.IDB, ro } func (s *roleService) deleteRolePermissionMapping(ctx context.Context, db bun.IDB, rleId uuid.UUID, role *rolev3.Role) (*rolev3.Role, error) { - err := pg.DeleteX(ctx, s.db, "resource_role_id", rleId, &models.ResourceRolePermission{}) + err := dao.DeleteX(ctx, s.db, "resource_role_id", rleId, &models.ResourceRolePermission{}) if err != nil { return &rolev3.Role{}, err } @@ -88,7 +87,7 @@ func (s *roleService) createRolePermissionMapping(ctx context.Context, db bun.ID var items []models.ResourceRolePermission for _, p := range perms { - entity, err := pg.GetIdByName(ctx, s.db, p, &models.ResourcePermission{}) + entity, err := dao.GetIdByName(ctx, s.db, p, &models.ResourcePermission{}) if err != nil { return role, fmt.Errorf("unable to find role permission '%v'", p) } @@ -102,7 +101,7 @@ func (s *roleService) createRolePermissionMapping(ctx context.Context, db bun.ID } } if len(items) > 0 { - _, err := pg.Create(ctx, s.db, &items) + _, err := dao.Create(ctx, s.db, &items) if err != nil { return role, err } @@ -126,7 +125,7 @@ func (s *roleService) Create(ctx context.Context, role *rolev3.Role) (*rolev3.Ro if err != nil { return nil, fmt.Errorf("unable to get partner and org id") } - r, _ := pg.GetIdByNamePartnerOrg(ctx, s.db, role.GetMetadata().GetName(), uuid.NullUUID{UUID: partnerId, Valid: true}, uuid.NullUUID{UUID: organizationId, Valid: true}, &models.Role{}) + r, _ := dao.GetIdByNamePartnerOrg(ctx, s.db, role.GetMetadata().GetName(), uuid.NullUUID{UUID: partnerId, Valid: true}, uuid.NullUUID{UUID: organizationId, Valid: true}, &models.Role{}) if r != nil { return nil, fmt.Errorf("role '%v' already exists", role.GetMetadata().GetName()) } @@ -157,7 +156,7 @@ func (s *roleService) Create(ctx context.Context, role *rolev3.Role) (*rolev3.Ro return &rolev3.Role{}, err } - entity, err := pg.Create(ctx, tx, &rle) + entity, err := dao.Create(ctx, tx, &rle) if err != nil { tx.Rollback() return &rolev3.Role{}, err @@ -190,7 +189,7 @@ func (s *roleService) GetByID(ctx context.Context, role *rolev3.Role) (*rolev3.R if err != nil { return &rolev3.Role{}, err } - entity, err := pg.GetByID(ctx, s.db, uid, &models.Role{}) + entity, err := dao.GetByID(ctx, s.db, uid, &models.Role{}) if err != nil { return &rolev3.Role{}, err } @@ -212,7 +211,7 @@ func (s *roleService) GetByName(ctx context.Context, role *rolev3.Role) (*rolev3 if err != nil { return nil, fmt.Errorf("unable to get partner and org id") } - entity, err := pg.GetByNamePartnerOrg(ctx, s.db, name, uuid.NullUUID{UUID: partnerId, Valid: true}, uuid.NullUUID{UUID: organizationId, Valid: true}, &models.Role{}) + entity, err := dao.GetByNamePartnerOrg(ctx, s.db, name, uuid.NullUUID{UUID: partnerId, Valid: true}, uuid.NullUUID{UUID: organizationId, Valid: true}, &models.Role{}) if err != nil { return &rolev3.Role{}, err } @@ -236,7 +235,7 @@ func (s *roleService) Update(ctx context.Context, role *rolev3.Role) (*rolev3.Ro } name := role.GetMetadata().GetName() - entity, err := pg.GetByNamePartnerOrg(ctx, s.db, name, uuid.NullUUID{UUID: partnerId, Valid: true}, uuid.NullUUID{UUID: organizationId, Valid: true}, &models.Role{}) + entity, err := dao.GetByNamePartnerOrg(ctx, s.db, name, uuid.NullUUID{UUID: partnerId, Valid: true}, uuid.NullUUID{UUID: organizationId, Valid: true}, &models.Role{}) if err != nil { return role, fmt.Errorf("unable to find role '%v'", name) } @@ -254,7 +253,7 @@ func (s *roleService) Update(ctx context.Context, role *rolev3.Role) (*rolev3.Ro return &rolev3.Role{}, err } - _, err = pg.Update(ctx, tx, rle.ID, rle) + _, err = dao.Update(ctx, tx, rle.ID, rle) if err != nil { tx.Rollback() return &rolev3.Role{}, err @@ -296,7 +295,7 @@ func (s *roleService) Delete(ctx context.Context, role *rolev3.Role) (*rolev3.Ro return &rolev3.Role{}, fmt.Errorf("unable to get partner and org id; %v", err) } - entity, err := pg.GetByNamePartnerOrg(ctx, s.db, name, uuid.NullUUID{UUID: partnerId, Valid: true}, uuid.NullUUID{UUID: organizationId, Valid: true}, &models.Role{}) + entity, err := dao.GetByNamePartnerOrg(ctx, s.db, name, uuid.NullUUID{UUID: partnerId, Valid: true}, uuid.NullUUID{UUID: organizationId, Valid: true}, &models.Role{}) if err != nil { return &rolev3.Role{}, err } @@ -314,7 +313,7 @@ func (s *roleService) Delete(ctx context.Context, role *rolev3.Role) (*rolev3.Ro return &rolev3.Role{}, err } - err = pg.Delete(ctx, s.db, rle.ID, rle) + err = dao.Delete(ctx, s.db, rle.ID, rle) if err != nil { tx.Rollback() return &rolev3.Role{}, err @@ -373,16 +372,16 @@ func (s *roleService) List(ctx context.Context, role *rolev3.Role) (*rolev3.Role }, } if len(role.Metadata.Organization) > 0 { - orgId, err := pg.GetOrganizationId(ctx, s.db, role.Metadata.Organization) + orgId, err := dao.GetOrganizationId(ctx, s.db, role.Metadata.Organization) if err != nil { return roleList, err } - partId, err := pg.GetPartnerId(ctx, s.db, role.Metadata.Partner) + partId, err := dao.GetPartnerId(ctx, s.db, role.Metadata.Partner) if err != nil { return roleList, err } var rles []models.Role - entities, err := pg.List(ctx, s.db, uuid.NullUUID{UUID: partId, Valid: true}, uuid.NullUUID{UUID: orgId, Valid: true}, &rles) + entities, err := dao.List(ctx, s.db, uuid.NullUUID{UUID: partId, Valid: true}, uuid.NullUUID{UUID: orgId, Valid: true}, &rles) if err != nil { return roleList, err } diff --git a/pkg/service/rolepermission.go b/pkg/service/rolepermission.go index 58c91b8..ad772e4 100644 --- a/pkg/service/rolepermission.go +++ b/pkg/service/rolepermission.go @@ -3,8 +3,8 @@ package service import ( "context" + "github.com/RafaySystems/rcloud-base/internal/dao" "github.com/RafaySystems/rcloud-base/internal/models" - "github.com/RafaySystems/rcloud-base/internal/persistence/provider/pg" v3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" rolev3 "github.com/RafaySystems/rcloud-base/proto/types/rolepb/v3" "github.com/google/uuid" @@ -47,11 +47,11 @@ func (s *rolepermissionService) toV3Rolepermission(rolepermission *rolev3.RolePe func (s *rolepermissionService) getPartnerOrganization(ctx context.Context, rolepermission *rolev3.RolePermission) (uuid.UUID, uuid.UUID, error) { partner := rolepermission.GetMetadata().GetPartner() org := rolepermission.GetMetadata().GetOrganization() - partnerId, err := pg.GetPartnerId(ctx, s.db, partner) + partnerId, err := dao.GetPartnerId(ctx, s.db, partner) if err != nil { return uuid.Nil, uuid.Nil, err } - organizationId, err := pg.GetOrganizationId(ctx, s.db, org) + organizationId, err := dao.GetOrganizationId(ctx, s.db, org) if err != nil { return partnerId, uuid.Nil, err } @@ -61,7 +61,7 @@ func (s *rolepermissionService) getPartnerOrganization(ctx context.Context, role func (s *rolepermissionService) GetByName(ctx context.Context, rolepermission *rolev3.RolePermission) (*rolev3.RolePermission, error) { name := rolepermission.GetMetadata().GetName() - entity, err := pg.GetByName(ctx, s.db, name, &models.ResourcePermission{}) + entity, err := dao.GetByName(ctx, s.db, name, &models.ResourcePermission{}) if err != nil { return rolepermission, err } @@ -85,7 +85,7 @@ func (s *rolepermissionService) List(ctx context.Context, rolepermission *rolev3 }, } var rles []models.ResourcePermission - entities, err := pg.List(ctx, s.db, uuid.NullUUID{UUID: uuid.Nil, Valid: false}, uuid.NullUUID{UUID: uuid.Nil, Valid: false}, &rles) + entities, err := dao.List(ctx, s.db, uuid.NullUUID{UUID: uuid.Nil, Valid: false}, uuid.NullUUID{UUID: uuid.Nil, Valid: false}, &rles) if err != nil { return rolepermissionList, err } diff --git a/pkg/service/user.go b/pkg/service/user.go index 1b1e1e0..4d59b31 100644 --- a/pkg/service/user.go +++ b/pkg/service/user.go @@ -13,8 +13,7 @@ import ( "github.com/RafaySystems/rcloud-base/internal/dao" "github.com/RafaySystems/rcloud-base/internal/models" - providers "github.com/RafaySystems/rcloud-base/internal/persistence/provider/kratos" - "github.com/RafaySystems/rcloud-base/internal/persistence/provider/pg" + providers "github.com/RafaySystems/rcloud-base/internal/provider/kratos" "github.com/RafaySystems/rcloud-base/pkg/common" userrpcv3 "github.com/RafaySystems/rcloud-base/proto/rpc/user" authzv1 "github.com/RafaySystems/rcloud-base/proto/types/authz" @@ -109,7 +108,7 @@ func (s *userService) createUserRoleRelations(ctx context.Context, db bun.IDB, u var ps []*authzv1.Policy for _, pnr := range projectNamespaceRoles { role := pnr.GetRole() - entity, err := pg.GetIdByName(ctx, db, role, &models.Role{}) + entity, err := dao.GetIdByName(ctx, db, role, &models.Role{}) if err != nil { return user, fmt.Errorf("unable to find role '%v'", role) } @@ -126,7 +125,7 @@ func (s *userService) createUserRoleRelations(ctx context.Context, db bun.IDB, u switch { case pnr.Namespace != nil: - projectId, err := pg.GetProjectId(ctx, db, project) + projectId, err := dao.GetProjectId(ctx, db, project) if err != nil { return user, fmt.Errorf("unable to find project '%v'", project) } @@ -152,7 +151,7 @@ func (s *userService) createUserRoleRelations(ctx context.Context, db bun.IDB, u Obj: role, }) case project != "": - projectId, err := pg.GetProjectId(ctx, db, project) + projectId, err := dao.GetProjectId(ctx, db, project) if err != nil { return user, fmt.Errorf("unable to find project '%v'", project) } @@ -201,19 +200,19 @@ func (s *userService) createUserRoleRelations(ctx context.Context, db bun.IDB, u } } if len(panrs) > 0 { - _, err := pg.Create(ctx, db, &panrs) + _, err := dao.Create(ctx, db, &panrs) if err != nil { return &userv3.User{}, err } } if len(pars) > 0 { - _, err := pg.Create(ctx, db, &pars) + _, err := dao.Create(ctx, db, &pars) if err != nil { return &userv3.User{}, err } } if len(ars) > 0 { - _, err := pg.Create(ctx, db, &ars) + _, err := dao.Create(ctx, db, &ars) if err != nil { return &userv3.User{}, err } @@ -233,11 +232,11 @@ func (s *userService) createUserRoleRelations(ctx context.Context, db bun.IDB, u func (s *userService) getPartnerOrganization(ctx context.Context, db bun.IDB, user *userv3.User) (uuid.UUID, uuid.UUID, error) { partner := user.GetMetadata().GetPartner() org := user.GetMetadata().GetOrganization() - partnerId, err := pg.GetPartnerId(ctx, db, partner) + partnerId, err := dao.GetPartnerId(ctx, db, partner) if err != nil { return uuid.Nil, uuid.Nil, err } - organizationId, err := pg.GetOrganizationId(ctx, db, org) + organizationId, err := dao.GetOrganizationId(ctx, db, org) if err != nil { return partnerId, uuid.Nil, err } @@ -332,7 +331,7 @@ func (s *userService) GetByID(ctx context.Context, user *userv3.User) (*userv3.U if err != nil { return &userv3.User{}, err } - entity, err := pg.GetByID(ctx, s.db, uid, &models.KratosIdentities{}) + entity, err := dao.GetByID(ctx, s.db, uid, &models.KratosIdentities{}) if err != nil { return &userv3.User{}, err } @@ -351,7 +350,7 @@ func (s *userService) GetByID(ctx context.Context, user *userv3.User) (*userv3.U func (s *userService) GetByName(ctx context.Context, user *userv3.User) (*userv3.User, error) { name := user.GetMetadata().GetName() - entity, err := pg.GetByTraits(ctx, s.db, name, &models.KratosIdentities{}) + entity, err := dao.GetByTraits(ctx, s.db, name, &models.KratosIdentities{}) if err != nil { return &userv3.User{}, err } @@ -369,15 +368,15 @@ func (s *userService) GetByName(ctx context.Context, user *userv3.User) (*userv3 } func (s *userService) deleteUserRoleRelations(ctx context.Context, db bun.IDB, userId uuid.UUID, user *userv3.User) error { - err := pg.DeleteX(ctx, db, "account_id", userId, &models.AccountResourcerole{}) + err := dao.DeleteX(ctx, db, "account_id", userId, &models.AccountResourcerole{}) if err != nil { return err } - err = pg.DeleteX(ctx, db, "account_id", userId, &models.ProjectAccountResourcerole{}) + err = dao.DeleteX(ctx, db, "account_id", userId, &models.ProjectAccountResourcerole{}) if err != nil { return err } - err = pg.DeleteX(ctx, db, "account_id", userId, &models.ProjectAccountNamespaceRole{}) + err = dao.DeleteX(ctx, db, "account_id", userId, &models.ProjectAccountNamespaceRole{}) if err != nil { return err } @@ -392,7 +391,7 @@ func (s *userService) deleteUserRoleRelations(ctx context.Context, db bun.IDB, u func (s *userService) Update(ctx context.Context, user *userv3.User) (*userv3.User, error) { name := user.GetMetadata().GetName() - entity, err := pg.GetIdByTraits(ctx, s.db, name, &models.KratosIdentities{}) + entity, err := dao.GetIdByTraits(ctx, s.db, name, &models.KratosIdentities{}) if err != nil { return &userv3.User{}, fmt.Errorf("no user found with name '%v'", name) } @@ -443,7 +442,7 @@ func (s *userService) Update(ctx context.Context, user *userv3.User) (*userv3.Us func (s *userService) Delete(ctx context.Context, user *userv3.User) (*userrpcv3.DeleteUserResponse, error) { name := user.GetMetadata().GetName() - entity, err := pg.GetIdByTraits(ctx, s.db, name, &models.KratosIdentities{}) + entity, err := dao.GetIdByTraits(ctx, s.db, name, &models.KratosIdentities{}) if err != nil { return &userrpcv3.DeleteUserResponse{}, fmt.Errorf("no user founnd with username '%v'", name) } @@ -467,7 +466,7 @@ func (s *userService) Delete(ctx context.Context, user *userv3.User) (*userrpcv3 return &userrpcv3.DeleteUserResponse{}, err } - err = pg.DeleteX(ctx, s.db, "account_id", usr.ID, &models.GroupAccount{}) + err = dao.DeleteX(ctx, s.db, "account_id", usr.ID, &models.GroupAccount{}) if err != nil { tx.Rollback() return &userrpcv3.DeleteUserResponse{}, fmt.Errorf("unable to delete user; %v", err) @@ -494,7 +493,7 @@ func (s *userService) List(ctx context.Context, _ *userv3.User) (*userv3.UserLis }, } var accs []models.KratosIdentities - entities, err := pg.ListAll(ctx, s.db, &accs) + entities, err := dao.ListAll(ctx, s.db, &accs) if err != nil { return userList, err } @@ -526,19 +525,19 @@ func (s *userService) RetrieveCliConfig(ctx context.Context, req *userrpcv3.ApiK } // fetch the metadata information required to populate cli config var proj models.Project - _, err = pg.GetByID(ctx, s.db, ap.ProjecttId, &proj) + _, err = dao.GetByID(ctx, s.db, ap.ProjecttId, &proj) if err != nil { return nil, err } var org models.Organization - _, err = pg.GetByID(ctx, s.db, ap.OrganizationId, &org) + _, err = dao.GetByID(ctx, s.db, ap.OrganizationId, &org) if err != nil { return nil, err } var part models.Partner - _, err = pg.GetByID(ctx, s.db, ap.PartnerId, &part) + _, err = dao.GetByID(ctx, s.db, ap.PartnerId, &part) if err != nil { return nil, err } From fb4fa3781c75e05ec0b869e70a7c849b378ea338 Mon Sep 17 00:00:00 2001 From: Abin Simon Date: Thu, 24 Mar 2022 12:42:59 +0530 Subject: [PATCH 2/2] Rename RafaySystems to RafayLabs --- .github/workflows/go.yml | 2 +- Dockerfile | 2 +- Makefile | 2 +- README.md | 4 +- _kratos/development/session_main.go | 2 +- ...it_information_lookup_cluster_responses.go | 2 +- ...audit_information_lookup_user_responses.go | 2 +- ...strap_create_bootstrap_agent_parameters.go | 2 +- ...tstrap_create_bootstrap_agent_responses.go | 2 +- ...tstrap_delete_bootstrap_agent_responses.go | 2 +- ...ap_get_bootstrap_agent_config_responses.go | 2 +- ...bootstrap_get_bootstrap_agent_responses.go | 2 +- ..._get_bootstrap_agent_template_responses.go | 2 +- ...get_bootstrap_agent_templates_responses.go | 2 +- ...ootstrap_get_bootstrap_agents_responses.go | 2 +- ...bootstrap_get_bootstrap_infra_responses.go | 2 +- ...tch_bootstrap_agent_template_parameters.go | 2 +- ...atch_bootstrap_agent_template_responses.go | 2 +- ...tstrap_patch_bootstrap_infra_parameters.go | 2 +- ...otstrap_patch_bootstrap_infra_responses.go | 2 +- ...trap_register_bootstrap_agent_responses.go | 2 +- ...strap_update_bootstrap_agent_parameters.go | 2 +- ...tstrap_update_bootstrap_agent_responses.go | 2 +- ...zation_get_user_authorization_responses.go | 2 +- ..._get_kubectl_cluster_settings_responses.go | 2 +- ...ate_kubectl_cluster_settings_parameters.go | 2 +- ...date_kubectl_cluster_settings_responses.go | 2 +- .../client/sentry_bootstrap_service_client.go | 2 +- buf.gen.yaml | 2 +- go.mod | 2 +- internal/cluster/cluster.go | 12 +++--- internal/cluster/clusterproxy.go | 2 +- internal/cluster/conditions.go | 8 ++-- internal/cluster/constants/constants.go | 2 +- internal/cluster/dao/cluster.go | 8 ++-- .../cluster/dao/clusteroperatorbootstrap.go | 6 +-- internal/cluster/dao/clustertoken.go | 6 +-- internal/cluster/dao/namespaces.go | 10 ++--- internal/cluster/dao/projectcluster.go | 8 ++-- internal/cluster/util/labels.go | 2 +- internal/dao/bootstrap.go | 10 ++--- internal/dao/group.go | 4 +- internal/dao/kubeconfig.go | 4 +- internal/dao/lookup.go | 2 +- internal/dao/permission.go | 2 +- internal/dao/role.go | 2 +- internal/dao/user.go | 4 +- internal/fixtures/load.go | 10 ++--- main.go | 40 +++++++++---------- pkg/audit/events.go | 4 +- pkg/auth/v3/auth.go | 4 +- pkg/auth/v3/interceptor.go | 4 +- pkg/auth/v3/middleware.go | 2 +- pkg/auth/v3/pool.go | 4 +- pkg/auth/v3/service.go | 4 +- pkg/auth/v3/session.go | 2 +- pkg/controller/apply/apply.go | 8 ++-- pkg/controller/apply/apply_test.go | 4 +- pkg/controller/apply/patch.go | 4 +- pkg/controller/apply/util.go | 6 +-- pkg/controller/apply/util_test.go | 2 +- pkg/controller/client/client.go | 2 +- pkg/controller/runtime/object.go | 6 +-- pkg/controller/runtime/object_test.go | 2 +- pkg/controller/scheme/scheme.go | 2 +- pkg/controller/step/state.go | 2 +- pkg/controller/step/step.go | 12 +++--- pkg/controller/util/object.go | 2 +- pkg/controller/util/owner.go | 4 +- pkg/controller/util/patch.go | 4 +- pkg/controller/util/patch_test.go | 4 +- pkg/controller/util/step.go | 2 +- pkg/converter/import.go | 8 ++-- pkg/converter/util.go | 2 +- pkg/event/queue.go | 2 +- pkg/gateway/httpbody.go | 2 +- pkg/gateway/json_test.go | 4 +- pkg/gateway/testdata/gateway_test.go | 4 +- pkg/gateway/yaml_test.go | 4 +- pkg/hasher/test/hashid_test.go | 2 +- pkg/leaderelection/election.go | 2 +- pkg/match/match.go | 4 +- pkg/notify/notify.go | 12 +++--- pkg/patch/status.go | 6 +-- pkg/query/options.go | 4 +- pkg/query/selector.go | 2 +- .../cluster_conditions_reconciler.go | 10 ++--- pkg/reconcile/cluster_handler.go | 10 ++--- pkg/reconcile/cluster_reconciler.go | 10 ++--- pkg/reconcile/utils.go | 2 +- pkg/sentry/authz/authz.go | 20 +++++----- pkg/sentry/kubeconfig/kubeconfig.go | 20 +++++----- pkg/sentry/peering/peering.go | 14 +++---- pkg/sentry/register/register.go | 16 ++++---- pkg/service/account_permission.go | 6 +-- pkg/service/apikey.go | 8 ++-- pkg/service/audit_log_query.go | 2 +- pkg/service/authz.go | 6 +-- pkg/service/bootstrap.go | 14 +++---- pkg/service/cluster.go | 32 +++++++-------- pkg/service/cluster_test.go | 10 ++--- pkg/service/group.go | 10 ++--- pkg/service/group_permission.go | 6 +-- pkg/service/group_test.go | 4 +- pkg/service/idp.go | 8 ++-- pkg/service/kubeconfig_revocation.go | 8 ++-- pkg/service/kubeconfig_settings.go | 8 ++-- pkg/service/kubectl_cluster_setting.go | 8 ++-- pkg/service/metro.go | 8 ++-- pkg/service/metro_test.go | 4 +- pkg/service/mocks.go | 2 +- pkg/service/namespace.go | 16 ++++---- pkg/service/oidc_provider.go | 8 ++-- pkg/service/organization.go | 8 ++-- pkg/service/organization_test.go | 4 +- pkg/service/partner.go | 8 ++-- pkg/service/partner_test.go | 4 +- pkg/service/project.go | 8 ++-- pkg/service/project_test.go | 4 +- pkg/service/relay_audit_query.go | 2 +- pkg/service/role.go | 10 ++--- pkg/service/role_test.go | 4 +- pkg/service/rolepermission.go | 8 ++-- pkg/service/rolepermission_test.go | 4 +- pkg/service/user.go | 16 ++++---- pkg/service/user_test.go | 6 +-- pkg/sso/saml/middleware.go | 2 +- pkg/sso/saml/saml.go | 2 +- proto/rpc/audit/auditlog.pb.go | 2 +- proto/rpc/audit/relayaudit.pb.go | 2 +- proto/rpc/authz/authz.pb.go | 2 +- proto/rpc/authz/authz_grpc.pb.go | 2 +- proto/rpc/role/role.pb.go | 2 +- proto/rpc/role/role.pb.gw.go | 2 +- proto/rpc/role/role_grpc.pb.go | 2 +- proto/rpc/role/rolepermission.pb.go | 2 +- proto/rpc/role/rolepermission.pb.gw.go | 2 +- proto/rpc/role/rolepermission_grpc.pb.go | 2 +- proto/rpc/scheduler/cluster.pb.go | 4 +- proto/rpc/scheduler/cluster.pb.gw.go | 4 +- proto/rpc/scheduler/cluster_grpc.pb.go | 4 +- proto/rpc/scheduler/internal.go | 2 +- proto/rpc/sentry/audit_info.pb.go | 4 +- proto/rpc/sentry/bootstrap.pb.go | 4 +- proto/rpc/sentry/bootstrap.pb.gw.go | 4 +- proto/rpc/sentry/bootstrap_grpc.pb.go | 4 +- proto/rpc/sentry/cluster_authz.pb.go | 6 +-- proto/rpc/sentry/internal.go | 4 +- proto/rpc/sentry/kubeconfig.pb.go | 4 +- proto/rpc/sentry/kubeconfig_grpc.pb.go | 2 +- proto/rpc/sentry/kubectl_cluster.pb.go | 4 +- proto/rpc/system/idp.pb.go | 2 +- proto/rpc/system/idp.pb.gw.go | 2 +- proto/rpc/system/idp_grpc.pb.go | 2 +- proto/rpc/system/metro.pb.go | 2 +- proto/rpc/system/metro.pb.gw.go | 2 +- proto/rpc/system/metro_grpc.pb.go | 2 +- proto/rpc/system/oidc_provider.pb.go | 2 +- proto/rpc/system/oidc_provider.pb.gw.go | 2 +- proto/rpc/system/oidc_provider_grpc.pb.go | 2 +- proto/rpc/system/organization.pb.go | 2 +- proto/rpc/system/organization.pb.gw.go | 2 +- proto/rpc/system/organization_grpc.pb.go | 2 +- proto/rpc/system/partner.pb.go | 2 +- proto/rpc/system/partner.pb.gw.go | 2 +- proto/rpc/system/partner_grpc.pb.go | 2 +- proto/rpc/system/project.pb.go | 2 +- proto/rpc/system/project.pb.gw.go | 2 +- proto/rpc/system/project_grpc.pb.go | 2 +- proto/rpc/user/group.pb.go | 2 +- proto/rpc/user/group.pb.gw.go | 2 +- proto/rpc/user/group_grpc.pb.go | 2 +- proto/rpc/user/user.pb.go | 4 +- proto/rpc/user/user.pb.gw.go | 2 +- proto/rpc/user/user_grpc.pb.go | 4 +- proto/rpc/v3/auth.pb.go | 2 +- proto/rpc/v3/auth_grpc.pb.go | 2 +- proto/types/infrapb/v3/cluster.pb.go | 2 +- proto/types/rolepb/v3/role.pb.go | 2 +- proto/types/rolepb/v3/rolepermission.pb.go | 2 +- proto/types/scheduler/namespace.pb.go | 4 +- proto/types/sentry/sentry.pb.go | 2 +- proto/types/systempb/v3/idp.pb.go | 2 +- proto/types/systempb/v3/oidc_provider.pb.go | 2 +- proto/types/systempb/v3/organization.pb.go | 2 +- proto/types/systempb/v3/partner.pb.go | 2 +- proto/types/systempb/v3/project.pb.go | 2 +- proto/types/userpb/v3/group.pb.go | 4 +- proto/types/userpb/v3/user.pb.go | 4 +- scripts/initialize/main.go | 20 +++++----- server/audit_info.go | 8 ++-- server/auditlog.go | 4 +- server/bootstrap.go | 20 +++++----- server/cluster.go | 16 ++++---- server/cluster_authz.go | 6 +-- server/group.go | 8 ++-- server/idp.go | 6 +-- server/kubeconfig.go | 18 ++++----- server/kubectl_cluster_settings.go | 10 ++--- server/metro.go | 6 +-- server/oidc_provider.go | 6 +-- server/organization.go | 8 ++-- server/partner.go | 8 ++-- server/project.go | 8 ++-- server/relayaudit.go | 6 +-- server/relaypeerclient.go | 2 +- server/relaypeerservice.go | 4 +- server/relaypeerservice_test.go | 6 +-- server/role.go | 8 ++-- server/rolepermission.go | 6 +-- server/user.go | 12 +++--- server/utils.go | 2 +- 212 files changed, 533 insertions(+), 533 deletions(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 16f4492..c6bba17 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -25,7 +25,7 @@ jobs: - name: Format run: if [ "$(gofmt -s -l . | wc -l)" -gt 0 ]; then exit 1; fi - # Tests need to be fixed. https://github.com/RafaySystems/rcloud-base/issues/46 + # Tests need to be fixed. https://github.com/RafayLabs/rcloud-base/issues/46 # - name: Test all # run: go test -v ./... diff --git a/Dockerfile b/Dockerfile index bbc2ff7..ec91a86 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ LABEL description="Build container" ENV CGO_ENABLED 0 COPY . /build WORKDIR /build -RUN go build github.com/RafaySystems/rcloud-base +RUN go build github.com/RafayLabs/rcloud-base FROM alpine:latest as runtime LABEL description="Run container" diff --git a/Makefile b/Makefile index 12af41d..a79dfcc 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ .PHONY: tidy tidy: - GOPRIVATE=github.com/RafaySystems/* go mod tidy + GOPRIVATE=github.com/RafayLabs/* go mod tidy .PHONY: vendor vendor: go mod vendor diff --git a/README.md b/README.md index 810ada1..bd6a7a3 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ docker-compose up -d Start rcloud-base: ```bash -go run github.com/RafaySystems/rcloud-base +go run github.com/RafayLabs/rcloud-base ``` ### Manual @@ -135,5 +135,5 @@ docker-compose up -d Start rcloud-base server: ``` -go run github.com/RafaySystems/rcloud-base +go run github.com/RafayLabs/rcloud-base ``` diff --git a/_kratos/development/session_main.go b/_kratos/development/session_main.go index 3e7ef8f..4a4c09a 100644 --- a/_kratos/development/session_main.go +++ b/_kratos/development/session_main.go @@ -3,7 +3,7 @@ package main import ( "time" - "github.com/RafaySystems/rcloud-base/_kratos/development/pkg" + "github.com/RafayLabs/rcloud-base/_kratos/development/pkg" ory "github.com/ory/kratos-client-go" ) diff --git a/api/def/clients/sentry/client/audit_information/audit_information_lookup_cluster_responses.go b/api/def/clients/sentry/client/audit_information/audit_information_lookup_cluster_responses.go index f2462ee..3e1fe41 100644 --- a/api/def/clients/sentry/client/audit_information/audit_information_lookup_cluster_responses.go +++ b/api/def/clients/sentry/client/audit_information/audit_information_lookup_cluster_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/RafaySystems/rcloud-base/api/def/clients/sentry/models" + "github.com/RafayLabs/rcloud-base/api/def/clients/sentry/models" ) // AuditInformationLookupClusterReader is a Reader for the AuditInformationLookupCluster structure. diff --git a/api/def/clients/sentry/client/audit_information/audit_information_lookup_user_responses.go b/api/def/clients/sentry/client/audit_information/audit_information_lookup_user_responses.go index a76b9e5..1b13eab 100644 --- a/api/def/clients/sentry/client/audit_information/audit_information_lookup_user_responses.go +++ b/api/def/clients/sentry/client/audit_information/audit_information_lookup_user_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/RafaySystems/rcloud-base/api/def/clients/sentry/models" + "github.com/RafayLabs/rcloud-base/api/def/clients/sentry/models" ) // AuditInformationLookupUserReader is a Reader for the AuditInformationLookupUser structure. diff --git a/api/def/clients/sentry/client/bootstrap/bootstrap_create_bootstrap_agent_parameters.go b/api/def/clients/sentry/client/bootstrap/bootstrap_create_bootstrap_agent_parameters.go index 7190121..75cc859 100644 --- a/api/def/clients/sentry/client/bootstrap/bootstrap_create_bootstrap_agent_parameters.go +++ b/api/def/clients/sentry/client/bootstrap/bootstrap_create_bootstrap_agent_parameters.go @@ -15,7 +15,7 @@ import ( cr "github.com/go-openapi/runtime/client" "github.com/go-openapi/strfmt" - "github.com/RafaySystems/rcloud-base/api/def/clients/sentry/models" + "github.com/RafayLabs/rcloud-base/api/def/clients/sentry/models" ) // NewBootstrapCreateBootstrapAgentParams creates a new BootstrapCreateBootstrapAgentParams object, diff --git a/api/def/clients/sentry/client/bootstrap/bootstrap_create_bootstrap_agent_responses.go b/api/def/clients/sentry/client/bootstrap/bootstrap_create_bootstrap_agent_responses.go index a63cde4..4a357f3 100644 --- a/api/def/clients/sentry/client/bootstrap/bootstrap_create_bootstrap_agent_responses.go +++ b/api/def/clients/sentry/client/bootstrap/bootstrap_create_bootstrap_agent_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/RafaySystems/rcloud-base/api/def/clients/sentry/models" + "github.com/RafayLabs/rcloud-base/api/def/clients/sentry/models" ) // BootstrapCreateBootstrapAgentReader is a Reader for the BootstrapCreateBootstrapAgent structure. diff --git a/api/def/clients/sentry/client/bootstrap/bootstrap_delete_bootstrap_agent_responses.go b/api/def/clients/sentry/client/bootstrap/bootstrap_delete_bootstrap_agent_responses.go index b570cc7..93e1136 100644 --- a/api/def/clients/sentry/client/bootstrap/bootstrap_delete_bootstrap_agent_responses.go +++ b/api/def/clients/sentry/client/bootstrap/bootstrap_delete_bootstrap_agent_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/RafaySystems/rcloud-base/api/def/clients/sentry/models" + "github.com/RafayLabs/rcloud-base/api/def/clients/sentry/models" ) // BootstrapDeleteBootstrapAgentReader is a Reader for the BootstrapDeleteBootstrapAgent structure. diff --git a/api/def/clients/sentry/client/bootstrap/bootstrap_get_bootstrap_agent_config_responses.go b/api/def/clients/sentry/client/bootstrap/bootstrap_get_bootstrap_agent_config_responses.go index 549d869..862e93a 100644 --- a/api/def/clients/sentry/client/bootstrap/bootstrap_get_bootstrap_agent_config_responses.go +++ b/api/def/clients/sentry/client/bootstrap/bootstrap_get_bootstrap_agent_config_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/RafaySystems/rcloud-base/api/def/clients/sentry/models" + "github.com/RafayLabs/rcloud-base/api/def/clients/sentry/models" ) // BootstrapGetBootstrapAgentConfigReader is a Reader for the BootstrapGetBootstrapAgentConfig structure. diff --git a/api/def/clients/sentry/client/bootstrap/bootstrap_get_bootstrap_agent_responses.go b/api/def/clients/sentry/client/bootstrap/bootstrap_get_bootstrap_agent_responses.go index 88eeb27..6759acc 100644 --- a/api/def/clients/sentry/client/bootstrap/bootstrap_get_bootstrap_agent_responses.go +++ b/api/def/clients/sentry/client/bootstrap/bootstrap_get_bootstrap_agent_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/RafaySystems/rcloud-base/api/def/clients/sentry/models" + "github.com/RafayLabs/rcloud-base/api/def/clients/sentry/models" ) // BootstrapGetBootstrapAgentReader is a Reader for the BootstrapGetBootstrapAgent structure. diff --git a/api/def/clients/sentry/client/bootstrap/bootstrap_get_bootstrap_agent_template_responses.go b/api/def/clients/sentry/client/bootstrap/bootstrap_get_bootstrap_agent_template_responses.go index 4b78f1f..048a0d2 100644 --- a/api/def/clients/sentry/client/bootstrap/bootstrap_get_bootstrap_agent_template_responses.go +++ b/api/def/clients/sentry/client/bootstrap/bootstrap_get_bootstrap_agent_template_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/RafaySystems/rcloud-base/api/def/clients/sentry/models" + "github.com/RafayLabs/rcloud-base/api/def/clients/sentry/models" ) // BootstrapGetBootstrapAgentTemplateReader is a Reader for the BootstrapGetBootstrapAgentTemplate structure. diff --git a/api/def/clients/sentry/client/bootstrap/bootstrap_get_bootstrap_agent_templates_responses.go b/api/def/clients/sentry/client/bootstrap/bootstrap_get_bootstrap_agent_templates_responses.go index 610997c..a47b1ba 100644 --- a/api/def/clients/sentry/client/bootstrap/bootstrap_get_bootstrap_agent_templates_responses.go +++ b/api/def/clients/sentry/client/bootstrap/bootstrap_get_bootstrap_agent_templates_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/RafaySystems/rcloud-base/api/def/clients/sentry/models" + "github.com/RafayLabs/rcloud-base/api/def/clients/sentry/models" ) // BootstrapGetBootstrapAgentTemplatesReader is a Reader for the BootstrapGetBootstrapAgentTemplates structure. diff --git a/api/def/clients/sentry/client/bootstrap/bootstrap_get_bootstrap_agents_responses.go b/api/def/clients/sentry/client/bootstrap/bootstrap_get_bootstrap_agents_responses.go index 314cba3..3a20fab 100644 --- a/api/def/clients/sentry/client/bootstrap/bootstrap_get_bootstrap_agents_responses.go +++ b/api/def/clients/sentry/client/bootstrap/bootstrap_get_bootstrap_agents_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/RafaySystems/rcloud-base/api/def/clients/sentry/models" + "github.com/RafayLabs/rcloud-base/api/def/clients/sentry/models" ) // BootstrapGetBootstrapAgentsReader is a Reader for the BootstrapGetBootstrapAgents structure. diff --git a/api/def/clients/sentry/client/bootstrap/bootstrap_get_bootstrap_infra_responses.go b/api/def/clients/sentry/client/bootstrap/bootstrap_get_bootstrap_infra_responses.go index af4aabd..2fca3f6 100644 --- a/api/def/clients/sentry/client/bootstrap/bootstrap_get_bootstrap_infra_responses.go +++ b/api/def/clients/sentry/client/bootstrap/bootstrap_get_bootstrap_infra_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/RafaySystems/rcloud-base/api/def/clients/sentry/models" + "github.com/RafayLabs/rcloud-base/api/def/clients/sentry/models" ) // BootstrapGetBootstrapInfraReader is a Reader for the BootstrapGetBootstrapInfra structure. diff --git a/api/def/clients/sentry/client/bootstrap/bootstrap_patch_bootstrap_agent_template_parameters.go b/api/def/clients/sentry/client/bootstrap/bootstrap_patch_bootstrap_agent_template_parameters.go index 423b421..6164f1e 100644 --- a/api/def/clients/sentry/client/bootstrap/bootstrap_patch_bootstrap_agent_template_parameters.go +++ b/api/def/clients/sentry/client/bootstrap/bootstrap_patch_bootstrap_agent_template_parameters.go @@ -15,7 +15,7 @@ import ( cr "github.com/go-openapi/runtime/client" "github.com/go-openapi/strfmt" - "github.com/RafaySystems/rcloud-base/api/def/clients/sentry/models" + "github.com/RafayLabs/rcloud-base/api/def/clients/sentry/models" ) // NewBootstrapPatchBootstrapAgentTemplateParams creates a new BootstrapPatchBootstrapAgentTemplateParams object, diff --git a/api/def/clients/sentry/client/bootstrap/bootstrap_patch_bootstrap_agent_template_responses.go b/api/def/clients/sentry/client/bootstrap/bootstrap_patch_bootstrap_agent_template_responses.go index 5463fda..7bb5955 100644 --- a/api/def/clients/sentry/client/bootstrap/bootstrap_patch_bootstrap_agent_template_responses.go +++ b/api/def/clients/sentry/client/bootstrap/bootstrap_patch_bootstrap_agent_template_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/RafaySystems/rcloud-base/api/def/clients/sentry/models" + "github.com/RafayLabs/rcloud-base/api/def/clients/sentry/models" ) // BootstrapPatchBootstrapAgentTemplateReader is a Reader for the BootstrapPatchBootstrapAgentTemplate structure. diff --git a/api/def/clients/sentry/client/bootstrap/bootstrap_patch_bootstrap_infra_parameters.go b/api/def/clients/sentry/client/bootstrap/bootstrap_patch_bootstrap_infra_parameters.go index f2e03ef..d023797 100644 --- a/api/def/clients/sentry/client/bootstrap/bootstrap_patch_bootstrap_infra_parameters.go +++ b/api/def/clients/sentry/client/bootstrap/bootstrap_patch_bootstrap_infra_parameters.go @@ -15,7 +15,7 @@ import ( cr "github.com/go-openapi/runtime/client" "github.com/go-openapi/strfmt" - "github.com/RafaySystems/rcloud-base/api/def/clients/sentry/models" + "github.com/RafayLabs/rcloud-base/api/def/clients/sentry/models" ) // NewBootstrapPatchBootstrapInfraParams creates a new BootstrapPatchBootstrapInfraParams object, diff --git a/api/def/clients/sentry/client/bootstrap/bootstrap_patch_bootstrap_infra_responses.go b/api/def/clients/sentry/client/bootstrap/bootstrap_patch_bootstrap_infra_responses.go index 4536d8a..a007505 100644 --- a/api/def/clients/sentry/client/bootstrap/bootstrap_patch_bootstrap_infra_responses.go +++ b/api/def/clients/sentry/client/bootstrap/bootstrap_patch_bootstrap_infra_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/RafaySystems/rcloud-base/api/def/clients/sentry/models" + "github.com/RafayLabs/rcloud-base/api/def/clients/sentry/models" ) // BootstrapPatchBootstrapInfraReader is a Reader for the BootstrapPatchBootstrapInfra structure. diff --git a/api/def/clients/sentry/client/bootstrap/bootstrap_register_bootstrap_agent_responses.go b/api/def/clients/sentry/client/bootstrap/bootstrap_register_bootstrap_agent_responses.go index 1dd01f0..3608c20 100644 --- a/api/def/clients/sentry/client/bootstrap/bootstrap_register_bootstrap_agent_responses.go +++ b/api/def/clients/sentry/client/bootstrap/bootstrap_register_bootstrap_agent_responses.go @@ -14,7 +14,7 @@ import ( "github.com/go-openapi/strfmt" "github.com/go-openapi/swag" - "github.com/RafaySystems/rcloud-base/api/def/clients/sentry/models" + "github.com/RafayLabs/rcloud-base/api/def/clients/sentry/models" ) // BootstrapRegisterBootstrapAgentReader is a Reader for the BootstrapRegisterBootstrapAgent structure. diff --git a/api/def/clients/sentry/client/bootstrap/bootstrap_update_bootstrap_agent_parameters.go b/api/def/clients/sentry/client/bootstrap/bootstrap_update_bootstrap_agent_parameters.go index 0c4561c..41e8f0a 100644 --- a/api/def/clients/sentry/client/bootstrap/bootstrap_update_bootstrap_agent_parameters.go +++ b/api/def/clients/sentry/client/bootstrap/bootstrap_update_bootstrap_agent_parameters.go @@ -15,7 +15,7 @@ import ( cr "github.com/go-openapi/runtime/client" "github.com/go-openapi/strfmt" - "github.com/RafaySystems/rcloud-base/api/def/clients/sentry/models" + "github.com/RafayLabs/rcloud-base/api/def/clients/sentry/models" ) // NewBootstrapUpdateBootstrapAgentParams creates a new BootstrapUpdateBootstrapAgentParams object, diff --git a/api/def/clients/sentry/client/bootstrap/bootstrap_update_bootstrap_agent_responses.go b/api/def/clients/sentry/client/bootstrap/bootstrap_update_bootstrap_agent_responses.go index a17b4f9..bbb991b 100644 --- a/api/def/clients/sentry/client/bootstrap/bootstrap_update_bootstrap_agent_responses.go +++ b/api/def/clients/sentry/client/bootstrap/bootstrap_update_bootstrap_agent_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/RafaySystems/rcloud-base/api/def/clients/sentry/models" + "github.com/RafayLabs/rcloud-base/api/def/clients/sentry/models" ) // BootstrapUpdateBootstrapAgentReader is a Reader for the BootstrapUpdateBootstrapAgent structure. diff --git a/api/def/clients/sentry/client/cluster_authorization/cluster_authorization_get_user_authorization_responses.go b/api/def/clients/sentry/client/cluster_authorization/cluster_authorization_get_user_authorization_responses.go index b156239..c51ae10 100644 --- a/api/def/clients/sentry/client/cluster_authorization/cluster_authorization_get_user_authorization_responses.go +++ b/api/def/clients/sentry/client/cluster_authorization/cluster_authorization_get_user_authorization_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/RafaySystems/rcloud-base/api/def/clients/sentry/models" + "github.com/RafayLabs/rcloud-base/api/def/clients/sentry/models" ) // ClusterAuthorizationGetUserAuthorizationReader is a Reader for the ClusterAuthorizationGetUserAuthorization structure. diff --git a/api/def/clients/sentry/client/kubectl_cluster_settings/kubectl_cluster_settings_get_kubectl_cluster_settings_responses.go b/api/def/clients/sentry/client/kubectl_cluster_settings/kubectl_cluster_settings_get_kubectl_cluster_settings_responses.go index 0f22087..6ebbaeb 100644 --- a/api/def/clients/sentry/client/kubectl_cluster_settings/kubectl_cluster_settings_get_kubectl_cluster_settings_responses.go +++ b/api/def/clients/sentry/client/kubectl_cluster_settings/kubectl_cluster_settings_get_kubectl_cluster_settings_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/RafaySystems/rcloud-base/api/def/clients/sentry/models" + "github.com/RafayLabs/rcloud-base/api/def/clients/sentry/models" ) // KubectlClusterSettingsGetKubectlClusterSettingsReader is a Reader for the KubectlClusterSettingsGetKubectlClusterSettings structure. diff --git a/api/def/clients/sentry/client/kubectl_cluster_settings/kubectl_cluster_settings_update_kubectl_cluster_settings_parameters.go b/api/def/clients/sentry/client/kubectl_cluster_settings/kubectl_cluster_settings_update_kubectl_cluster_settings_parameters.go index 8980062..ea45d94 100644 --- a/api/def/clients/sentry/client/kubectl_cluster_settings/kubectl_cluster_settings_update_kubectl_cluster_settings_parameters.go +++ b/api/def/clients/sentry/client/kubectl_cluster_settings/kubectl_cluster_settings_update_kubectl_cluster_settings_parameters.go @@ -15,7 +15,7 @@ import ( cr "github.com/go-openapi/runtime/client" "github.com/go-openapi/strfmt" - "github.com/RafaySystems/rcloud-base/api/def/clients/sentry/models" + "github.com/RafayLabs/rcloud-base/api/def/clients/sentry/models" ) // NewKubectlClusterSettingsUpdateKubectlClusterSettingsParams creates a new KubectlClusterSettingsUpdateKubectlClusterSettingsParams object, diff --git a/api/def/clients/sentry/client/kubectl_cluster_settings/kubectl_cluster_settings_update_kubectl_cluster_settings_responses.go b/api/def/clients/sentry/client/kubectl_cluster_settings/kubectl_cluster_settings_update_kubectl_cluster_settings_responses.go index a744f52..4258529 100644 --- a/api/def/clients/sentry/client/kubectl_cluster_settings/kubectl_cluster_settings_update_kubectl_cluster_settings_responses.go +++ b/api/def/clients/sentry/client/kubectl_cluster_settings/kubectl_cluster_settings_update_kubectl_cluster_settings_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/RafaySystems/rcloud-base/api/def/clients/sentry/models" + "github.com/RafayLabs/rcloud-base/api/def/clients/sentry/models" ) // KubectlClusterSettingsUpdateKubectlClusterSettingsReader is a Reader for the KubectlClusterSettingsUpdateKubectlClusterSettings structure. diff --git a/api/def/clients/sentry/client/sentry_bootstrap_service_client.go b/api/def/clients/sentry/client/sentry_bootstrap_service_client.go index fb0907a..3ad01ed 100644 --- a/api/def/clients/sentry/client/sentry_bootstrap_service_client.go +++ b/api/def/clients/sentry/client/sentry_bootstrap_service_client.go @@ -10,7 +10,7 @@ import ( httptransport "github.com/go-openapi/runtime/client" "github.com/go-openapi/strfmt" - "github.com/RafaySystems/rcloud-base/api/def/clients/sentry/client/bootstrap" + "github.com/RafayLabs/rcloud-base/api/def/clients/sentry/client/bootstrap" ) // Default sentry bootstrap service HTTP client. diff --git a/buf.gen.yaml b/buf.gen.yaml index 0a926bd..359f9cc 100644 --- a/buf.gen.yaml +++ b/buf.gen.yaml @@ -2,7 +2,7 @@ version: v1 managed: enabled: true go_package_prefix: - default: github.com/RafaySystems/rcloud-base + default: github.com/RafayLabs/rcloud-base except: - buf.build/googleapis/googleapis - buf.build/grpc-ecosystem/grpc-gateway diff --git a/go.mod b/go.mod index 5e431eb..282131e 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/RafaySystems/rcloud-base +module github.com/RafayLabs/rcloud-base go 1.17 diff --git a/internal/cluster/cluster.go b/internal/cluster/cluster.go index 85d203f..2aeac4b 100644 --- a/internal/cluster/cluster.go +++ b/internal/cluster/cluster.go @@ -8,12 +8,12 @@ import ( "regexp" "strings" - "github.com/RafaySystems/rcloud-base/internal/cluster/constants" - "github.com/RafaySystems/rcloud-base/internal/cluster/fixtures" - "github.com/RafaySystems/rcloud-base/internal/cluster/util" - "github.com/RafaySystems/rcloud-base/pkg/common" - "github.com/RafaySystems/rcloud-base/pkg/log" - infrav3 "github.com/RafaySystems/rcloud-base/proto/types/infrapb/v3" + "github.com/RafayLabs/rcloud-base/internal/cluster/constants" + "github.com/RafayLabs/rcloud-base/internal/cluster/fixtures" + "github.com/RafayLabs/rcloud-base/internal/cluster/util" + "github.com/RafayLabs/rcloud-base/pkg/common" + "github.com/RafayLabs/rcloud-base/pkg/log" + infrav3 "github.com/RafayLabs/rcloud-base/proto/types/infrapb/v3" ) var _log = log.GetLogger() diff --git a/internal/cluster/clusterproxy.go b/internal/cluster/clusterproxy.go index 6fb06db..3ff60bc 100644 --- a/internal/cluster/clusterproxy.go +++ b/internal/cluster/clusterproxy.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - infrav3 "github.com/RafaySystems/rcloud-base/proto/types/infrapb/v3" + infrav3 "github.com/RafayLabs/rcloud-base/proto/types/infrapb/v3" ) const ( diff --git a/internal/cluster/conditions.go b/internal/cluster/conditions.go index c596fe2..fc18207 100644 --- a/internal/cluster/conditions.go +++ b/internal/cluster/conditions.go @@ -3,10 +3,10 @@ package cluster import ( "time" - "github.com/RafaySystems/rcloud-base/internal/cluster/constants" - commonv3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" - infrav3 "github.com/RafaySystems/rcloud-base/proto/types/infrapb/v3" - "github.com/RafaySystems/rcloud-base/proto/types/scheduler" + "github.com/RafayLabs/rcloud-base/internal/cluster/constants" + commonv3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" + infrav3 "github.com/RafayLabs/rcloud-base/proto/types/infrapb/v3" + "github.com/RafayLabs/rcloud-base/proto/types/scheduler" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/internal/cluster/constants/constants.go b/internal/cluster/constants/constants.go index a174ede..f68323e 100644 --- a/internal/cluster/constants/constants.go +++ b/internal/cluster/constants/constants.go @@ -3,7 +3,7 @@ package constants import ( "regexp" - commonv3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" + commonv3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" ) type ClusterGeneration int diff --git a/internal/cluster/dao/cluster.go b/internal/cluster/dao/cluster.go index 82b22bc..500720b 100644 --- a/internal/cluster/dao/cluster.go +++ b/internal/cluster/dao/cluster.go @@ -5,10 +5,10 @@ import ( "strings" "time" - "github.com/RafaySystems/rcloud-base/internal/cluster/constants" - "github.com/RafaySystems/rcloud-base/internal/dao" - "github.com/RafaySystems/rcloud-base/internal/models" - commonv3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" + "github.com/RafayLabs/rcloud-base/internal/cluster/constants" + "github.com/RafayLabs/rcloud-base/internal/dao" + "github.com/RafayLabs/rcloud-base/internal/models" + commonv3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" "github.com/google/uuid" "github.com/uptrace/bun" ) diff --git a/internal/cluster/dao/clusteroperatorbootstrap.go b/internal/cluster/dao/clusteroperatorbootstrap.go index 4cf5c33..e5d6e04 100644 --- a/internal/cluster/dao/clusteroperatorbootstrap.go +++ b/internal/cluster/dao/clusteroperatorbootstrap.go @@ -3,9 +3,9 @@ package dao import ( "context" - "github.com/RafaySystems/rcloud-base/internal/dao" - "github.com/RafaySystems/rcloud-base/internal/models" - "github.com/RafaySystems/rcloud-base/pkg/log" + "github.com/RafayLabs/rcloud-base/internal/dao" + "github.com/RafayLabs/rcloud-base/internal/models" + "github.com/RafayLabs/rcloud-base/pkg/log" "github.com/uptrace/bun" ) diff --git a/internal/cluster/dao/clustertoken.go b/internal/cluster/dao/clustertoken.go index 2498dfc..31396e5 100644 --- a/internal/cluster/dao/clustertoken.go +++ b/internal/cluster/dao/clustertoken.go @@ -4,9 +4,9 @@ import ( "context" "errors" - "github.com/RafaySystems/rcloud-base/internal/dao" - "github.com/RafaySystems/rcloud-base/internal/models" - infrav3 "github.com/RafaySystems/rcloud-base/proto/types/infrapb/v3" + "github.com/RafayLabs/rcloud-base/internal/dao" + "github.com/RafayLabs/rcloud-base/internal/models" + infrav3 "github.com/RafayLabs/rcloud-base/proto/types/infrapb/v3" "github.com/rs/xid" "github.com/uptrace/bun" ) diff --git a/internal/cluster/dao/namespaces.go b/internal/cluster/dao/namespaces.go index ab25167..05b20e2 100644 --- a/internal/cluster/dao/namespaces.go +++ b/internal/cluster/dao/namespaces.go @@ -4,11 +4,11 @@ import ( "context" "time" - "github.com/RafaySystems/rcloud-base/internal/dao" - "github.com/RafaySystems/rcloud-base/internal/models" - commonv3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" - infrav3 "github.com/RafaySystems/rcloud-base/proto/types/infrapb/v3" - "github.com/RafaySystems/rcloud-base/proto/types/scheduler" + "github.com/RafayLabs/rcloud-base/internal/dao" + "github.com/RafayLabs/rcloud-base/internal/models" + commonv3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" + infrav3 "github.com/RafayLabs/rcloud-base/proto/types/infrapb/v3" + "github.com/RafayLabs/rcloud-base/proto/types/scheduler" "github.com/google/uuid" "github.com/uptrace/bun" ) diff --git a/internal/cluster/dao/projectcluster.go b/internal/cluster/dao/projectcluster.go index c739bec..88c7b4f 100644 --- a/internal/cluster/dao/projectcluster.go +++ b/internal/cluster/dao/projectcluster.go @@ -3,10 +3,10 @@ package dao import ( "context" - "github.com/RafaySystems/rcloud-base/internal/dao" - "github.com/RafaySystems/rcloud-base/internal/models" - "github.com/RafaySystems/rcloud-base/pkg/query" - commonv3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" + "github.com/RafayLabs/rcloud-base/internal/dao" + "github.com/RafayLabs/rcloud-base/internal/models" + "github.com/RafayLabs/rcloud-base/pkg/query" + commonv3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" "github.com/google/uuid" "github.com/uptrace/bun" ) diff --git a/internal/cluster/util/labels.go b/internal/cluster/util/labels.go index 1f57504..77b707f 100644 --- a/internal/cluster/util/labels.go +++ b/internal/cluster/util/labels.go @@ -5,7 +5,7 @@ import ( "regexp" "strings" - "github.com/RafaySystems/rcloud-base/internal/cluster/constants" + "github.com/RafayLabs/rcloud-base/internal/cluster/constants" ) func IsValidKubernetesLabelNameValueRegex(input string) bool { diff --git a/internal/dao/bootstrap.go b/internal/dao/bootstrap.go index b25d537..c74e078 100644 --- a/internal/dao/bootstrap.go +++ b/internal/dao/bootstrap.go @@ -6,11 +6,11 @@ import ( "fmt" "time" - "github.com/RafaySystems/rcloud-base/internal/models" - "github.com/RafaySystems/rcloud-base/internal/random" - "github.com/RafaySystems/rcloud-base/pkg/query" - commonv3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" - "github.com/RafaySystems/rcloud-base/proto/types/sentry" + "github.com/RafayLabs/rcloud-base/internal/models" + "github.com/RafayLabs/rcloud-base/internal/random" + "github.com/RafayLabs/rcloud-base/pkg/query" + commonv3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" + "github.com/RafayLabs/rcloud-base/proto/types/sentry" "github.com/google/uuid" "github.com/uptrace/bun" ) diff --git a/internal/dao/group.go b/internal/dao/group.go index ddfc337..30eca1d 100644 --- a/internal/dao/group.go +++ b/internal/dao/group.go @@ -3,8 +3,8 @@ package dao import ( "context" - "github.com/RafaySystems/rcloud-base/internal/models" - userv3 "github.com/RafaySystems/rcloud-base/proto/types/userpb/v3" + "github.com/RafayLabs/rcloud-base/internal/models" + userv3 "github.com/RafayLabs/rcloud-base/proto/types/userpb/v3" "github.com/google/uuid" "github.com/uptrace/bun" ) diff --git a/internal/dao/kubeconfig.go b/internal/dao/kubeconfig.go index 9d02303..7a3f570 100644 --- a/internal/dao/kubeconfig.go +++ b/internal/dao/kubeconfig.go @@ -4,8 +4,8 @@ import ( "context" "time" - "github.com/RafaySystems/rcloud-base/internal/models" - "github.com/RafaySystems/rcloud-base/proto/types/sentry" + "github.com/RafayLabs/rcloud-base/internal/models" + "github.com/RafayLabs/rcloud-base/proto/types/sentry" "github.com/google/uuid" "github.com/uptrace/bun" ) diff --git a/internal/dao/lookup.go b/internal/dao/lookup.go index 17d414a..35286c9 100644 --- a/internal/dao/lookup.go +++ b/internal/dao/lookup.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/RafaySystems/rcloud-base/internal/models" + "github.com/RafayLabs/rcloud-base/internal/models" "github.com/google/uuid" "github.com/uptrace/bun" ) diff --git a/internal/dao/permission.go b/internal/dao/permission.go index bf5bb8d..8ed7bcf 100644 --- a/internal/dao/permission.go +++ b/internal/dao/permission.go @@ -3,7 +3,7 @@ package dao import ( "context" - "github.com/RafaySystems/rcloud-base/internal/models" + "github.com/RafayLabs/rcloud-base/internal/models" "github.com/google/uuid" "github.com/uptrace/bun" ) diff --git a/internal/dao/role.go b/internal/dao/role.go index dd88900..26ecd4e 100644 --- a/internal/dao/role.go +++ b/internal/dao/role.go @@ -3,7 +3,7 @@ package dao import ( "context" - "github.com/RafaySystems/rcloud-base/internal/models" + "github.com/RafayLabs/rcloud-base/internal/models" "github.com/google/uuid" "github.com/uptrace/bun" ) diff --git a/internal/dao/user.go b/internal/dao/user.go index 4072592..90b1abb 100644 --- a/internal/dao/user.go +++ b/internal/dao/user.go @@ -3,8 +3,8 @@ package dao import ( "context" - "github.com/RafaySystems/rcloud-base/internal/models" - userv3 "github.com/RafaySystems/rcloud-base/proto/types/userpb/v3" + "github.com/RafayLabs/rcloud-base/internal/models" + userv3 "github.com/RafayLabs/rcloud-base/proto/types/userpb/v3" "github.com/google/uuid" "github.com/uptrace/bun" ) diff --git a/internal/fixtures/load.go b/internal/fixtures/load.go index 7f591b2..a59d646 100644 --- a/internal/fixtures/load.go +++ b/internal/fixtures/load.go @@ -9,14 +9,14 @@ import ( "crypto/x509/pkix" - "github.com/RafaySystems/rcloud-base/pkg/sentry/cryptoutil" - "github.com/RafaySystems/rcloud-base/pkg/service" + "github.com/RafayLabs/rcloud-base/pkg/sentry/cryptoutil" + "github.com/RafayLabs/rcloud-base/pkg/service" "github.com/rs/xid" "sigs.k8s.io/yaml" - "github.com/RafaySystems/rcloud-base/pkg/log" - commonv3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" - sentry "github.com/RafaySystems/rcloud-base/proto/types/sentry" + "github.com/RafayLabs/rcloud-base/pkg/log" + commonv3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" + sentry "github.com/RafayLabs/rcloud-base/proto/types/sentry" "github.com/shurcooL/httpfs/vfsutil" ) diff --git a/main.go b/main.go index 7d47afd..1b3a816 100644 --- a/main.go +++ b/main.go @@ -12,26 +12,26 @@ import ( "sync" "time" - "github.com/RafaySystems/rcloud-base/internal/fixtures" - providers "github.com/RafaySystems/rcloud-base/internal/provider/kratos" - authv3 "github.com/RafaySystems/rcloud-base/pkg/auth/v3" - "github.com/RafaySystems/rcloud-base/pkg/common" - "github.com/RafaySystems/rcloud-base/pkg/enforcer" - "github.com/RafaySystems/rcloud-base/pkg/gateway" - "github.com/RafaySystems/rcloud-base/pkg/grpc" - "github.com/RafaySystems/rcloud-base/pkg/leaderelection" - "github.com/RafaySystems/rcloud-base/pkg/log" - "github.com/RafaySystems/rcloud-base/pkg/notify" - "github.com/RafaySystems/rcloud-base/pkg/reconcile" - "github.com/RafaySystems/rcloud-base/pkg/sentry/peering" - "github.com/RafaySystems/rcloud-base/pkg/service" - auditrpc "github.com/RafaySystems/rcloud-base/proto/rpc/audit" - rolerpc "github.com/RafaySystems/rcloud-base/proto/rpc/role" - schedulerrpc "github.com/RafaySystems/rcloud-base/proto/rpc/scheduler" - sentryrpc "github.com/RafaySystems/rcloud-base/proto/rpc/sentry" - systemrpc "github.com/RafaySystems/rcloud-base/proto/rpc/system" - userrpc "github.com/RafaySystems/rcloud-base/proto/rpc/user" - "github.com/RafaySystems/rcloud-base/server" + "github.com/RafayLabs/rcloud-base/internal/fixtures" + providers "github.com/RafayLabs/rcloud-base/internal/provider/kratos" + authv3 "github.com/RafayLabs/rcloud-base/pkg/auth/v3" + "github.com/RafayLabs/rcloud-base/pkg/common" + "github.com/RafayLabs/rcloud-base/pkg/enforcer" + "github.com/RafayLabs/rcloud-base/pkg/gateway" + "github.com/RafayLabs/rcloud-base/pkg/grpc" + "github.com/RafayLabs/rcloud-base/pkg/leaderelection" + "github.com/RafayLabs/rcloud-base/pkg/log" + "github.com/RafayLabs/rcloud-base/pkg/notify" + "github.com/RafayLabs/rcloud-base/pkg/reconcile" + "github.com/RafayLabs/rcloud-base/pkg/sentry/peering" + "github.com/RafayLabs/rcloud-base/pkg/service" + auditrpc "github.com/RafayLabs/rcloud-base/proto/rpc/audit" + rolerpc "github.com/RafayLabs/rcloud-base/proto/rpc/role" + schedulerrpc "github.com/RafayLabs/rcloud-base/proto/rpc/scheduler" + sentryrpc "github.com/RafayLabs/rcloud-base/proto/rpc/sentry" + systemrpc "github.com/RafayLabs/rcloud-base/proto/rpc/system" + userrpc "github.com/RafayLabs/rcloud-base/proto/rpc/user" + "github.com/RafayLabs/rcloud-base/server" "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" kclient "github.com/ory/kratos-client-go" "github.com/rs/xid" diff --git a/pkg/audit/events.go b/pkg/audit/events.go index f2e9e09..f6ff000 100644 --- a/pkg/audit/events.go +++ b/pkg/audit/events.go @@ -8,8 +8,8 @@ import ( "strings" "time" - logv2 "github.com/RafaySystems/rcloud-base/pkg/log" - commonv3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" + logv2 "github.com/RafayLabs/rcloud-base/pkg/log" + commonv3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" "github.com/Shopify/sarama" "google.golang.org/grpc/metadata" ) diff --git a/pkg/auth/v3/auth.go b/pkg/auth/v3/auth.go index a51d08b..aed0d93 100644 --- a/pkg/auth/v3/auth.go +++ b/pkg/auth/v3/auth.go @@ -3,8 +3,8 @@ package authv3 import ( "os" - logv2 "github.com/RafaySystems/rcloud-base/pkg/log" - "github.com/RafaySystems/rcloud-base/pkg/service" + logv2 "github.com/RafayLabs/rcloud-base/pkg/log" + "github.com/RafayLabs/rcloud-base/pkg/service" kclient "github.com/ory/kratos-client-go" "github.com/uptrace/bun" ) diff --git a/pkg/auth/v3/interceptor.go b/pkg/auth/v3/interceptor.go index 4ede0e0..628fbb7 100644 --- a/pkg/auth/v3/interceptor.go +++ b/pkg/auth/v3/interceptor.go @@ -3,8 +3,8 @@ package authv3 import ( context "context" - "github.com/RafaySystems/rcloud-base/pkg/gateway" - commonpbv3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" + "github.com/RafayLabs/rcloud-base/pkg/gateway" + commonpbv3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" "google.golang.org/grpc/metadata" diff --git a/pkg/auth/v3/middleware.go b/pkg/auth/v3/middleware.go index ee06a4b..2ec8daa 100644 --- a/pkg/auth/v3/middleware.go +++ b/pkg/auth/v3/middleware.go @@ -4,7 +4,7 @@ import ( "net/http" "regexp" - commonpbv3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" + commonpbv3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" "github.com/uptrace/bun" "github.com/urfave/negroni" ) diff --git a/pkg/auth/v3/pool.go b/pkg/auth/v3/pool.go index cd3e539..f29cae6 100644 --- a/pkg/auth/v3/pool.go +++ b/pkg/auth/v3/pool.go @@ -1,8 +1,8 @@ package authv3 import ( - "github.com/RafaySystems/rcloud-base/pkg/pool" - rpcv3 "github.com/RafaySystems/rcloud-base/proto/rpc/v3" + "github.com/RafayLabs/rcloud-base/pkg/pool" + rpcv3 "github.com/RafayLabs/rcloud-base/proto/rpc/v3" "context" diff --git a/pkg/auth/v3/service.go b/pkg/auth/v3/service.go index 9fe0bfc..d3b9119 100644 --- a/pkg/auth/v3/service.go +++ b/pkg/auth/v3/service.go @@ -6,8 +6,8 @@ import ( "net/http" "strings" - rpcv3 "github.com/RafaySystems/rcloud-base/proto/rpc/user" - commonv3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" + rpcv3 "github.com/RafayLabs/rcloud-base/proto/rpc/user" + commonv3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" "github.com/spacemonkeygo/httpsig" ) diff --git a/pkg/auth/v3/session.go b/pkg/auth/v3/session.go index a7f863c..3e223f2 100644 --- a/pkg/auth/v3/session.go +++ b/pkg/auth/v3/session.go @@ -3,7 +3,7 @@ package authv3 import ( "context" - commonv3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" + commonv3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" ) type contextKey struct{} diff --git a/pkg/controller/apply/apply.go b/pkg/controller/apply/apply.go index 56f3908..44d0caa 100644 --- a/pkg/controller/apply/apply.go +++ b/pkg/controller/apply/apply.go @@ -7,10 +7,10 @@ import ( "strings" "time" - "github.com/RafaySystems/rcloud-base/pkg/controller/client" - scheme "github.com/RafaySystems/rcloud-base/pkg/controller/scheme" - "github.com/RafaySystems/rcloud-base/pkg/controller/util" - clusterv2 "github.com/RafaySystems/rcloud-base/proto/types/controller" + "github.com/RafayLabs/rcloud-base/pkg/controller/client" + scheme "github.com/RafayLabs/rcloud-base/pkg/controller/scheme" + "github.com/RafayLabs/rcloud-base/pkg/controller/util" + clusterv2 "github.com/RafayLabs/rcloud-base/proto/types/controller" apixv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" apierrs "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/meta" diff --git a/pkg/controller/apply/apply_test.go b/pkg/controller/apply/apply_test.go index aa85cc0..8d0f58d 100644 --- a/pkg/controller/apply/apply_test.go +++ b/pkg/controller/apply/apply_test.go @@ -12,8 +12,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ctrlclient "sigs.k8s.io/controller-runtime/pkg/client" - cruntime "github.com/RafaySystems/rcloud-base/pkg/controller/runtime" - clusterv2 "github.com/RafaySystems/rcloud-base/proto/types/controller" + cruntime "github.com/RafayLabs/rcloud-base/pkg/controller/runtime" + clusterv2 "github.com/RafayLabs/rcloud-base/proto/types/controller" "sigs.k8s.io/yaml" ) diff --git a/pkg/controller/apply/patch.go b/pkg/controller/apply/patch.go index becb21c..656ce07 100644 --- a/pkg/controller/apply/patch.go +++ b/pkg/controller/apply/patch.go @@ -4,8 +4,8 @@ import ( "bytes" "fmt" - "github.com/RafaySystems/rcloud-base/pkg/controller/scheme" - "github.com/RafaySystems/rcloud-base/pkg/controller/util" + "github.com/RafayLabs/rcloud-base/pkg/controller/scheme" + "github.com/RafayLabs/rcloud-base/pkg/controller/util" sp "k8s.io/apimachinery/pkg/util/strategicpatch" "k8s.io/apimachinery/pkg/types" diff --git a/pkg/controller/apply/util.go b/pkg/controller/apply/util.go index 63d0445..23231d3 100644 --- a/pkg/controller/apply/util.go +++ b/pkg/controller/apply/util.go @@ -7,12 +7,12 @@ import ( v1 "k8s.io/api/core/v1" - "github.com/RafaySystems/rcloud-base/pkg/controller/scheme" - clusterv2 "github.com/RafaySystems/rcloud-base/proto/types/controller" + "github.com/RafayLabs/rcloud-base/pkg/controller/scheme" + clusterv2 "github.com/RafayLabs/rcloud-base/proto/types/controller" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - cruntime "github.com/RafaySystems/rcloud-base/pkg/controller/runtime" + cruntime "github.com/RafayLabs/rcloud-base/pkg/controller/runtime" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" ) diff --git a/pkg/controller/apply/util_test.go b/pkg/controller/apply/util_test.go index aebb3ec..436c4d2 100644 --- a/pkg/controller/apply/util_test.go +++ b/pkg/controller/apply/util_test.go @@ -3,7 +3,7 @@ package apply import ( "testing" - clusterv2 "github.com/RafaySystems/rcloud-base/proto/types/controller" + clusterv2 "github.com/RafayLabs/rcloud-base/proto/types/controller" ) func TestGetGVK(t *testing.T) { diff --git a/pkg/controller/client/client.go b/pkg/controller/client/client.go index 1e85fb8..cf022b3 100644 --- a/pkg/controller/client/client.go +++ b/pkg/controller/client/client.go @@ -3,7 +3,7 @@ package client import ( "time" - "github.com/RafaySystems/rcloud-base/pkg/controller/scheme" + "github.com/RafayLabs/rcloud-base/pkg/controller/scheme" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/apiutil" "sigs.k8s.io/controller-runtime/pkg/client/config" diff --git a/pkg/controller/runtime/object.go b/pkg/controller/runtime/object.go index 047c411..741af9a 100644 --- a/pkg/controller/runtime/object.go +++ b/pkg/controller/runtime/object.go @@ -4,8 +4,8 @@ import ( "bytes" "errors" - "github.com/RafaySystems/rcloud-base/pkg/controller/scheme" - apiv2 "github.com/RafaySystems/rcloud-base/proto/types/controller" + "github.com/RafayLabs/rcloud-base/pkg/controller/scheme" + apiv2 "github.com/RafayLabs/rcloud-base/proto/types/controller" rbacv1 "k8s.io/api/rbac/v1" apixv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" "k8s.io/apimachinery/pkg/runtime" @@ -14,7 +14,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - "github.com/RafaySystems/rcloud-base/pkg/controller/util" + "github.com/RafayLabs/rcloud-base/pkg/controller/util" ) var ( diff --git a/pkg/controller/runtime/object_test.go b/pkg/controller/runtime/object_test.go index 4698ef3..d3bf882 100644 --- a/pkg/controller/runtime/object_test.go +++ b/pkg/controller/runtime/object_test.go @@ -7,7 +7,7 @@ import ( "reflect" "testing" - apiv2 "github.com/RafaySystems/rcloud-base/proto/types/controller" + apiv2 "github.com/RafayLabs/rcloud-base/proto/types/controller" appsv1 "k8s.io/api/apps/v1" "sigs.k8s.io/yaml" ) diff --git a/pkg/controller/scheme/scheme.go b/pkg/controller/scheme/scheme.go index b423a08..f96b1f0 100644 --- a/pkg/controller/scheme/scheme.go +++ b/pkg/controller/scheme/scheme.go @@ -3,7 +3,7 @@ package scheme import ( "sync" - apiv2 "github.com/RafaySystems/rcloud-base/proto/types/controller" + apiv2 "github.com/RafayLabs/rcloud-base/proto/types/controller" // DO NOT UPDATE // API Extensions v1 is not available in k8s v1.14.x apixv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" diff --git a/pkg/controller/step/state.go b/pkg/controller/step/state.go index b40f076..5fcd4c4 100644 --- a/pkg/controller/step/state.go +++ b/pkg/controller/step/state.go @@ -3,7 +3,7 @@ package step import ( "fmt" - clusterv2 "github.com/RafaySystems/rcloud-base/proto/types/controller" + clusterv2 "github.com/RafayLabs/rcloud-base/proto/types/controller" appsv1 "k8s.io/api/apps/v1" batchv1 "k8s.io/api/batch/v1" corev1 "k8s.io/api/core/v1" diff --git a/pkg/controller/step/step.go b/pkg/controller/step/step.go index 0d4bddb..6b3863a 100644 --- a/pkg/controller/step/step.go +++ b/pkg/controller/step/step.go @@ -3,12 +3,12 @@ package step import ( "context" - "github.com/RafaySystems/rcloud-base/pkg/controller/apply" - cr "github.com/RafaySystems/rcloud-base/pkg/controller/runtime" - "github.com/RafaySystems/rcloud-base/pkg/controller/scheme" - "github.com/RafaySystems/rcloud-base/pkg/controller/util" - hash "github.com/RafaySystems/rcloud-base/pkg/hasher" - clusterv2 "github.com/RafaySystems/rcloud-base/proto/types/controller" + "github.com/RafayLabs/rcloud-base/pkg/controller/apply" + cr "github.com/RafayLabs/rcloud-base/pkg/controller/runtime" + "github.com/RafayLabs/rcloud-base/pkg/controller/scheme" + "github.com/RafayLabs/rcloud-base/pkg/controller/util" + hash "github.com/RafayLabs/rcloud-base/pkg/hasher" + clusterv2 "github.com/RafayLabs/rcloud-base/proto/types/controller" corev1 "k8s.io/api/core/v1" apierrs "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/meta" diff --git a/pkg/controller/util/object.go b/pkg/controller/util/object.go index d239154..d4e0192 100644 --- a/pkg/controller/util/object.go +++ b/pkg/controller/util/object.go @@ -1,7 +1,7 @@ package util import ( - "github.com/RafaySystems/rcloud-base/pkg/controller/scheme" + "github.com/RafayLabs/rcloud-base/pkg/controller/scheme" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime/schema" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/pkg/controller/util/owner.go b/pkg/controller/util/owner.go index 6e0b2f6..518c21e 100644 --- a/pkg/controller/util/owner.go +++ b/pkg/controller/util/owner.go @@ -4,13 +4,13 @@ import ( "encoding/json" "fmt" - "github.com/RafaySystems/rcloud-base/pkg/controller/scheme" + "github.com/RafayLabs/rcloud-base/pkg/controller/scheme" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "sigs.k8s.io/controller-runtime/pkg/client/apiutil" - clusterv2 "github.com/RafaySystems/rcloud-base/proto/types/controller" + clusterv2 "github.com/RafayLabs/rcloud-base/proto/types/controller" ctrlutil "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" ) diff --git a/pkg/controller/util/patch.go b/pkg/controller/util/patch.go index 41acbd1..6cd0461 100644 --- a/pkg/controller/util/patch.go +++ b/pkg/controller/util/patch.go @@ -3,10 +3,10 @@ package util import ( "fmt" - clusterv2 "github.com/RafaySystems/rcloud-base/proto/types/controller" + clusterv2 "github.com/RafayLabs/rcloud-base/proto/types/controller" apixv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" - "github.com/RafaySystems/rcloud-base/pkg/controller/scheme" + "github.com/RafayLabs/rcloud-base/pkg/controller/scheme" jp "github.com/evanphx/json-patch" "k8s.io/apimachinery/pkg/runtime/schema" jmp "k8s.io/apimachinery/pkg/util/jsonmergepatch" diff --git a/pkg/controller/util/patch_test.go b/pkg/controller/util/patch_test.go index 9fdd970..8270a84 100644 --- a/pkg/controller/util/patch_test.go +++ b/pkg/controller/util/patch_test.go @@ -5,9 +5,9 @@ import ( "io/ioutil" "os" - "github.com/RafaySystems/rcloud-base/pkg/controller/scheme" + "github.com/RafayLabs/rcloud-base/pkg/controller/scheme" - apiv2 "github.com/RafaySystems/rcloud-base/proto/types/controller" + apiv2 "github.com/RafayLabs/rcloud-base/proto/types/controller" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" "sigs.k8s.io/yaml" diff --git a/pkg/controller/util/step.go b/pkg/controller/util/step.go index 47f6541..8182f94 100644 --- a/pkg/controller/util/step.go +++ b/pkg/controller/util/step.go @@ -1,7 +1,7 @@ package util import ( - clusterv2 "github.com/RafaySystems/rcloud-base/proto/types/controller" + clusterv2 "github.com/RafayLabs/rcloud-base/proto/types/controller" ) const ( diff --git a/pkg/converter/import.go b/pkg/converter/import.go index 8759d32..5b74b11 100644 --- a/pkg/converter/import.go +++ b/pkg/converter/import.go @@ -5,11 +5,11 @@ import ( "fmt" "strings" - runtimeutil "github.com/RafaySystems/rcloud-base/pkg/controller/runtime" - "github.com/RafaySystems/rcloud-base/pkg/hasher" + runtimeutil "github.com/RafayLabs/rcloud-base/pkg/controller/runtime" + "github.com/RafayLabs/rcloud-base/pkg/hasher" - "github.com/RafaySystems/rcloud-base/pkg/log" - controllerv2 "github.com/RafaySystems/rcloud-base/proto/types/controller" + "github.com/RafayLabs/rcloud-base/pkg/log" + controllerv2 "github.com/RafayLabs/rcloud-base/proto/types/controller" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/converter/util.go b/pkg/converter/util.go index 5ecb6dc..271c784 100644 --- a/pkg/converter/util.go +++ b/pkg/converter/util.go @@ -3,7 +3,7 @@ package converter import ( gojson "encoding/json" - apiv2 "github.com/RafaySystems/rcloud-base/proto/types/controller" + apiv2 "github.com/RafayLabs/rcloud-base/proto/types/controller" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" ) diff --git a/pkg/event/queue.go b/pkg/event/queue.go index d5e50e6..454663d 100644 --- a/pkg/event/queue.go +++ b/pkg/event/queue.go @@ -3,7 +3,7 @@ package event import ( "sync" - "github.com/RafaySystems/rcloud-base/pkg/log" + "github.com/RafayLabs/rcloud-base/pkg/log" ) const ( diff --git a/pkg/gateway/httpbody.go b/pkg/gateway/httpbody.go index 02a55e3..62774fb 100644 --- a/pkg/gateway/httpbody.go +++ b/pkg/gateway/httpbody.go @@ -1,7 +1,7 @@ package gateway import ( - common "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" + common "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" ) diff --git a/pkg/gateway/json_test.go b/pkg/gateway/json_test.go index a47296d..9009296 100644 --- a/pkg/gateway/json_test.go +++ b/pkg/gateway/json_test.go @@ -4,8 +4,8 @@ import ( "bytes" "testing" - "github.com/RafaySystems/rcloud-base/pkg/gateway" - "github.com/RafaySystems/rcloud-base/pkg/gateway/testdata" + "github.com/RafayLabs/rcloud-base/pkg/gateway" + "github.com/RafayLabs/rcloud-base/pkg/gateway/testdata" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/pkg/gateway/testdata/gateway_test.go b/pkg/gateway/testdata/gateway_test.go index 8e4844b..3988e6c 100644 --- a/pkg/gateway/testdata/gateway_test.go +++ b/pkg/gateway/testdata/gateway_test.go @@ -9,8 +9,8 @@ import ( "net/http" "testing" - "github.com/RafaySystems/rcloud-base/pkg/gateway" - "github.com/RafaySystems/rcloud-base/pkg/grpc" + "github.com/RafayLabs/rcloud-base/pkg/gateway" + "github.com/RafayLabs/rcloud-base/pkg/grpc" "github.com/grpc-ecosystem/grpc-gateway/runtime" ) diff --git a/pkg/gateway/yaml_test.go b/pkg/gateway/yaml_test.go index 021f1c0..7050c44 100644 --- a/pkg/gateway/yaml_test.go +++ b/pkg/gateway/yaml_test.go @@ -4,8 +4,8 @@ import ( "bytes" "testing" - "github.com/RafaySystems/rcloud-base/pkg/gateway" - "github.com/RafaySystems/rcloud-base/pkg/gateway/testdata" + "github.com/RafayLabs/rcloud-base/pkg/gateway" + "github.com/RafayLabs/rcloud-base/pkg/gateway/testdata" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/pkg/hasher/test/hashid_test.go b/pkg/hasher/test/hashid_test.go index 3ec4060..8ceb1f5 100644 --- a/pkg/hasher/test/hashid_test.go +++ b/pkg/hasher/test/hashid_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/RafaySystems/rcloud-base/pkg/hasher" + "github.com/RafayLabs/rcloud-base/pkg/hasher" ) func TestGetRSID(t *testing.T) { diff --git a/pkg/leaderelection/election.go b/pkg/leaderelection/election.go index 9d244c8..d7b6da4 100644 --- a/pkg/leaderelection/election.go +++ b/pkg/leaderelection/election.go @@ -3,7 +3,7 @@ package leaderelection import ( "context" - log "github.com/RafaySystems/rcloud-base/pkg/log" + log "github.com/RafayLabs/rcloud-base/pkg/log" le "k8s.io/client-go/tools/leaderelection" rl "k8s.io/client-go/tools/leaderelection/resourcelock" ) diff --git a/pkg/match/match.go b/pkg/match/match.go index a927fd6..96df244 100644 --- a/pkg/match/match.go +++ b/pkg/match/match.go @@ -1,8 +1,8 @@ package match import ( - "github.com/RafaySystems/rcloud-base/pkg/query" - commonv3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" + "github.com/RafayLabs/rcloud-base/pkg/query" + commonv3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" "k8s.io/apimachinery/pkg/labels" ) diff --git a/pkg/notify/notify.go b/pkg/notify/notify.go index f031d0d..11f4f71 100644 --- a/pkg/notify/notify.go +++ b/pkg/notify/notify.go @@ -8,12 +8,12 @@ import ( "sync" "time" - "github.com/RafaySystems/rcloud-base/pkg/log" - "github.com/RafaySystems/rcloud-base/pkg/match" - "github.com/RafaySystems/rcloud-base/pkg/query" - "github.com/RafaySystems/rcloud-base/pkg/service" - commonv3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" - infrav3 "github.com/RafaySystems/rcloud-base/proto/types/infrapb/v3" + "github.com/RafayLabs/rcloud-base/pkg/log" + "github.com/RafayLabs/rcloud-base/pkg/match" + "github.com/RafayLabs/rcloud-base/pkg/query" + "github.com/RafayLabs/rcloud-base/pkg/service" + commonv3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" + infrav3 "github.com/RafayLabs/rcloud-base/proto/types/infrapb/v3" ) var ( diff --git a/pkg/patch/status.go b/pkg/patch/status.go index 63df19b..0c8d9eb 100644 --- a/pkg/patch/status.go +++ b/pkg/patch/status.go @@ -3,9 +3,9 @@ package patch import ( "encoding/json" - sp "github.com/RafaySystems/rcloud-base/pkg/controller/strategicpatch" - infrav3 "github.com/RafaySystems/rcloud-base/proto/types/infrapb/v3" - "github.com/RafaySystems/rcloud-base/proto/types/scheduler" + sp "github.com/RafayLabs/rcloud-base/pkg/controller/strategicpatch" + infrav3 "github.com/RafayLabs/rcloud-base/proto/types/infrapb/v3" + "github.com/RafayLabs/rcloud-base/proto/types/scheduler" ) type clusterConditions struct { diff --git a/pkg/query/options.go b/pkg/query/options.go index eaa35bf..d6227ef 100644 --- a/pkg/query/options.go +++ b/pkg/query/options.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - "github.com/RafaySystems/rcloud-base/internal/random" - commonv3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" + "github.com/RafayLabs/rcloud-base/internal/random" + commonv3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" "github.com/uptrace/bun" ) diff --git a/pkg/query/selector.go b/pkg/query/selector.go index 27cd5e9..b495996 100644 --- a/pkg/query/selector.go +++ b/pkg/query/selector.go @@ -1,7 +1,7 @@ package query import ( - commonv3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" + commonv3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" "github.com/uptrace/bun" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/selection" diff --git a/pkg/reconcile/cluster_conditions_reconciler.go b/pkg/reconcile/cluster_conditions_reconciler.go index 6772c3a..7e2ec2b 100644 --- a/pkg/reconcile/cluster_conditions_reconciler.go +++ b/pkg/reconcile/cluster_conditions_reconciler.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - clstrutil "github.com/RafaySystems/rcloud-base/internal/cluster" - "github.com/RafaySystems/rcloud-base/internal/cluster/constants" - "github.com/RafaySystems/rcloud-base/pkg/log" - "github.com/RafaySystems/rcloud-base/pkg/service" - infrav3 "github.com/RafaySystems/rcloud-base/proto/types/infrapb/v3" + clstrutil "github.com/RafayLabs/rcloud-base/internal/cluster" + "github.com/RafayLabs/rcloud-base/internal/cluster/constants" + "github.com/RafayLabs/rcloud-base/pkg/log" + "github.com/RafayLabs/rcloud-base/pkg/service" + infrav3 "github.com/RafayLabs/rcloud-base/proto/types/infrapb/v3" ) var _log = log.GetLogger() diff --git a/pkg/reconcile/cluster_handler.go b/pkg/reconcile/cluster_handler.go index a271f3b..42c5a80 100644 --- a/pkg/reconcile/cluster_handler.go +++ b/pkg/reconcile/cluster_handler.go @@ -4,11 +4,11 @@ import ( "context" "time" - "github.com/RafaySystems/rcloud-base/pkg/event" - "github.com/RafaySystems/rcloud-base/pkg/query" - "github.com/RafaySystems/rcloud-base/pkg/service" - commonv3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" - infrav3 "github.com/RafaySystems/rcloud-base/proto/types/infrapb/v3" + "github.com/RafayLabs/rcloud-base/pkg/event" + "github.com/RafayLabs/rcloud-base/pkg/query" + "github.com/RafayLabs/rcloud-base/pkg/service" + commonv3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" + infrav3 "github.com/RafayLabs/rcloud-base/proto/types/infrapb/v3" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/util/workqueue" ) diff --git a/pkg/reconcile/cluster_reconciler.go b/pkg/reconcile/cluster_reconciler.go index 1ed92b3..0f34cbc 100644 --- a/pkg/reconcile/cluster_reconciler.go +++ b/pkg/reconcile/cluster_reconciler.go @@ -5,12 +5,12 @@ import ( "fmt" "time" - clstrutil "github.com/RafaySystems/rcloud-base/internal/cluster" - "github.com/RafaySystems/rcloud-base/internal/cluster/constants" - "github.com/RafaySystems/rcloud-base/pkg/service" - infrav3 "github.com/RafaySystems/rcloud-base/proto/types/infrapb/v3" + clstrutil "github.com/RafayLabs/rcloud-base/internal/cluster" + "github.com/RafayLabs/rcloud-base/internal/cluster/constants" + "github.com/RafayLabs/rcloud-base/pkg/service" + infrav3 "github.com/RafayLabs/rcloud-base/proto/types/infrapb/v3" - "github.com/RafaySystems/rcloud-base/pkg/query" + "github.com/RafayLabs/rcloud-base/pkg/query" "github.com/pkg/errors" ) diff --git a/pkg/reconcile/utils.go b/pkg/reconcile/utils.go index 7e59f13..e35d631 100644 --- a/pkg/reconcile/utils.go +++ b/pkg/reconcile/utils.go @@ -3,7 +3,7 @@ package reconcile import ( "encoding/json" - "github.com/RafaySystems/rcloud-base/pkg/event" + "github.com/RafayLabs/rcloud-base/pkg/event" ) func resourceToKey(r event.Resource) string { diff --git a/pkg/sentry/authz/authz.go b/pkg/sentry/authz/authz.go index 4fd8f66..0b5f2ec 100644 --- a/pkg/sentry/authz/authz.go +++ b/pkg/sentry/authz/authz.go @@ -7,16 +7,16 @@ import ( "strings" "time" - "github.com/RafaySystems/rcloud-base/internal/constants" - "github.com/RafaySystems/rcloud-base/pkg/controller/runtime" - "github.com/RafaySystems/rcloud-base/pkg/log" - "github.com/RafaySystems/rcloud-base/pkg/query" - "github.com/RafaySystems/rcloud-base/pkg/sentry/kubeconfig" - "github.com/RafaySystems/rcloud-base/pkg/service" - sentryrpc "github.com/RafaySystems/rcloud-base/proto/rpc/sentry" - commonv3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" - "github.com/RafaySystems/rcloud-base/proto/types/controller" - "github.com/RafaySystems/rcloud-base/proto/types/sentry" + "github.com/RafayLabs/rcloud-base/internal/constants" + "github.com/RafayLabs/rcloud-base/pkg/controller/runtime" + "github.com/RafayLabs/rcloud-base/pkg/log" + "github.com/RafayLabs/rcloud-base/pkg/query" + "github.com/RafayLabs/rcloud-base/pkg/sentry/kubeconfig" + "github.com/RafayLabs/rcloud-base/pkg/service" + sentryrpc "github.com/RafayLabs/rcloud-base/proto/rpc/sentry" + commonv3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" + "github.com/RafayLabs/rcloud-base/proto/types/controller" + "github.com/RafayLabs/rcloud-base/proto/types/sentry" corev1 "k8s.io/api/core/v1" rbacv1 "k8s.io/api/rbac/v1" ) diff --git a/pkg/sentry/kubeconfig/kubeconfig.go b/pkg/sentry/kubeconfig/kubeconfig.go index cd37a9e..39ac5bf 100644 --- a/pkg/sentry/kubeconfig/kubeconfig.go +++ b/pkg/sentry/kubeconfig/kubeconfig.go @@ -9,21 +9,21 @@ import ( "strings" "time" - "github.com/RafaySystems/rcloud-base/pkg/log" - "github.com/RafaySystems/rcloud-base/pkg/query" - sentryrpc "github.com/RafaySystems/rcloud-base/proto/rpc/sentry" - rpcv3 "github.com/RafaySystems/rcloud-base/proto/rpc/user" - commonv3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" - sentry "github.com/RafaySystems/rcloud-base/proto/types/sentry" + "github.com/RafayLabs/rcloud-base/pkg/log" + "github.com/RafayLabs/rcloud-base/pkg/query" + sentryrpc "github.com/RafayLabs/rcloud-base/proto/rpc/sentry" + rpcv3 "github.com/RafayLabs/rcloud-base/proto/rpc/user" + commonv3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" + sentry "github.com/RafayLabs/rcloud-base/proto/types/sentry" "github.com/google/uuid" clientcmdapiv1 "k8s.io/client-go/tools/clientcmd/api/v1" "sigs.k8s.io/yaml" - "github.com/RafaySystems/rcloud-base/internal/constants" - "github.com/RafaySystems/rcloud-base/pkg/sentry/cryptoutil" - "github.com/RafaySystems/rcloud-base/pkg/sentry/util" - "github.com/RafaySystems/rcloud-base/pkg/service" + "github.com/RafayLabs/rcloud-base/internal/constants" + "github.com/RafayLabs/rcloud-base/pkg/sentry/cryptoutil" + "github.com/RafayLabs/rcloud-base/pkg/sentry/util" + "github.com/RafayLabs/rcloud-base/pkg/service" ) const ( diff --git a/pkg/sentry/peering/peering.go b/pkg/sentry/peering/peering.go index 20510b4..6b7c290 100644 --- a/pkg/sentry/peering/peering.go +++ b/pkg/sentry/peering/peering.go @@ -10,13 +10,13 @@ import ( "regexp" "time" - "github.com/RafaySystems/rcloud-base/pkg/log" - "github.com/RafaySystems/rcloud-base/pkg/query" - "github.com/RafaySystems/rcloud-base/pkg/sentry/cryptoutil" - "github.com/RafaySystems/rcloud-base/pkg/sentry/register" - "github.com/RafaySystems/rcloud-base/pkg/service" - sentryrpc "github.com/RafaySystems/rcloud-base/proto/rpc/sentry" - "github.com/RafaySystems/rcloud-base/proto/types/sentry" + "github.com/RafayLabs/rcloud-base/pkg/log" + "github.com/RafayLabs/rcloud-base/pkg/query" + "github.com/RafayLabs/rcloud-base/pkg/sentry/cryptoutil" + "github.com/RafayLabs/rcloud-base/pkg/sentry/register" + "github.com/RafayLabs/rcloud-base/pkg/service" + sentryrpc "github.com/RafayLabs/rcloud-base/proto/rpc/sentry" + "github.com/RafayLabs/rcloud-base/proto/types/sentry" "github.com/dgraph-io/ristretto" "github.com/rs/xid" ) diff --git a/pkg/sentry/register/register.go b/pkg/sentry/register/register.go index 01d7e16..45d4bee 100644 --- a/pkg/sentry/register/register.go +++ b/pkg/sentry/register/register.go @@ -10,18 +10,18 @@ import ( "os" "strings" - "github.com/RafaySystems/rcloud-base/pkg/sentry/cryptoutil" - sentryrpc "github.com/RafaySystems/rcloud-base/proto/rpc/sentry" - commonv3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" - "github.com/RafaySystems/rcloud-base/proto/types/sentry" + "github.com/RafayLabs/rcloud-base/pkg/sentry/cryptoutil" + sentryrpc "github.com/RafayLabs/rcloud-base/proto/rpc/sentry" + commonv3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" + "github.com/RafayLabs/rcloud-base/proto/types/sentry" "github.com/pkg/errors" "github.com/rs/xid" - bootstrapclientv2 "github.com/RafaySystems/rcloud-base/api/def/clients/sentry/client" - bootstrapapiv2 "github.com/RafaySystems/rcloud-base/api/def/clients/sentry/client/bootstrap" + bootstrapclientv2 "github.com/RafayLabs/rcloud-base/api/def/clients/sentry/client" + bootstrapapiv2 "github.com/RafayLabs/rcloud-base/api/def/clients/sentry/client/bootstrap" - "github.com/RafaySystems/rcloud-base/pkg/log" - "github.com/RafaySystems/rcloud-base/pkg/sentry/util" + "github.com/RafayLabs/rcloud-base/pkg/log" + "github.com/RafayLabs/rcloud-base/pkg/sentry/util" ) var ( diff --git a/pkg/service/account_permission.go b/pkg/service/account_permission.go index db6ab3e..cfedd76 100644 --- a/pkg/service/account_permission.go +++ b/pkg/service/account_permission.go @@ -4,9 +4,9 @@ import ( "context" "encoding/json" - "github.com/RafaySystems/rcloud-base/internal/dao" - "github.com/RafaySystems/rcloud-base/internal/models" - "github.com/RafaySystems/rcloud-base/proto/types/sentry" + "github.com/RafayLabs/rcloud-base/internal/dao" + "github.com/RafayLabs/rcloud-base/internal/models" + "github.com/RafayLabs/rcloud-base/proto/types/sentry" "github.com/google/uuid" "github.com/uptrace/bun" "google.golang.org/protobuf/types/known/timestamppb" diff --git a/pkg/service/apikey.go b/pkg/service/apikey.go index 0e17a67..ec9410a 100644 --- a/pkg/service/apikey.go +++ b/pkg/service/apikey.go @@ -5,10 +5,10 @@ import ( "database/sql" "time" - "github.com/RafaySystems/rcloud-base/internal/dao" - "github.com/RafaySystems/rcloud-base/internal/models" - "github.com/RafaySystems/rcloud-base/pkg/crypto" - rpcv3 "github.com/RafaySystems/rcloud-base/proto/rpc/user" + "github.com/RafayLabs/rcloud-base/internal/dao" + "github.com/RafayLabs/rcloud-base/internal/models" + "github.com/RafayLabs/rcloud-base/pkg/crypto" + rpcv3 "github.com/RafayLabs/rcloud-base/proto/rpc/user" "github.com/google/uuid" "github.com/uptrace/bun" "google.golang.org/protobuf/types/known/timestamppb" diff --git a/pkg/service/audit_log_query.go b/pkg/service/audit_log_query.go index 36cc68e..277f9d3 100644 --- a/pkg/service/audit_log_query.go +++ b/pkg/service/audit_log_query.go @@ -6,7 +6,7 @@ import ( "fmt" "strings" - v1 "github.com/RafaySystems/rcloud-base/proto/rpc/audit" + v1 "github.com/RafayLabs/rcloud-base/proto/rpc/audit" "google.golang.org/protobuf/types/known/structpb" ) diff --git a/pkg/service/authz.go b/pkg/service/authz.go index f50f94b..08106fa 100644 --- a/pkg/service/authz.go +++ b/pkg/service/authz.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "github.com/RafaySystems/rcloud-base/internal/dao" - "github.com/RafaySystems/rcloud-base/internal/models" - authzpbv1 "github.com/RafaySystems/rcloud-base/proto/types/authz" + "github.com/RafayLabs/rcloud-base/internal/dao" + "github.com/RafayLabs/rcloud-base/internal/models" + authzpbv1 "github.com/RafayLabs/rcloud-base/proto/types/authz" "github.com/casbin/casbin/v2" "github.com/uptrace/bun" "google.golang.org/grpc/codes" diff --git a/pkg/service/bootstrap.go b/pkg/service/bootstrap.go index 65ad164..d103741 100644 --- a/pkg/service/bootstrap.go +++ b/pkg/service/bootstrap.go @@ -7,13 +7,13 @@ import ( "fmt" "time" - "github.com/RafaySystems/rcloud-base/internal/dao" - "github.com/RafaySystems/rcloud-base/internal/models" - "github.com/RafaySystems/rcloud-base/pkg/converter" - "github.com/RafaySystems/rcloud-base/pkg/query" - "github.com/RafaySystems/rcloud-base/pkg/sentry/cryptoutil" - commonv3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" - "github.com/RafaySystems/rcloud-base/proto/types/sentry" + "github.com/RafayLabs/rcloud-base/internal/dao" + "github.com/RafayLabs/rcloud-base/internal/models" + "github.com/RafayLabs/rcloud-base/pkg/converter" + "github.com/RafayLabs/rcloud-base/pkg/query" + "github.com/RafayLabs/rcloud-base/pkg/sentry/cryptoutil" + commonv3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" + "github.com/RafayLabs/rcloud-base/proto/types/sentry" "github.com/google/uuid" "github.com/uptrace/bun" "google.golang.org/protobuf/types/known/timestamppb" diff --git a/pkg/service/cluster.go b/pkg/service/cluster.go index d3c6f70..3174afe 100644 --- a/pkg/service/cluster.go +++ b/pkg/service/cluster.go @@ -11,22 +11,22 @@ import ( "sync" "time" - clstrutil "github.com/RafaySystems/rcloud-base/internal/cluster" - "github.com/RafaySystems/rcloud-base/internal/cluster/constants" - cdao "github.com/RafaySystems/rcloud-base/internal/cluster/dao" - "github.com/RafaySystems/rcloud-base/internal/cluster/util" - "github.com/RafaySystems/rcloud-base/internal/dao" - "github.com/RafaySystems/rcloud-base/internal/models" - "github.com/RafaySystems/rcloud-base/pkg/common" - "github.com/RafaySystems/rcloud-base/pkg/event" - "github.com/RafaySystems/rcloud-base/pkg/log" - "github.com/RafaySystems/rcloud-base/pkg/patch" - "github.com/RafaySystems/rcloud-base/pkg/query" - sentryutil "github.com/RafaySystems/rcloud-base/pkg/sentry/util" - commonv3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" - infrav3 "github.com/RafaySystems/rcloud-base/proto/types/infrapb/v3" - "github.com/RafaySystems/rcloud-base/proto/types/scheduler" - "github.com/RafaySystems/rcloud-base/proto/types/sentry" + clstrutil "github.com/RafayLabs/rcloud-base/internal/cluster" + "github.com/RafayLabs/rcloud-base/internal/cluster/constants" + cdao "github.com/RafayLabs/rcloud-base/internal/cluster/dao" + "github.com/RafayLabs/rcloud-base/internal/cluster/util" + "github.com/RafayLabs/rcloud-base/internal/dao" + "github.com/RafayLabs/rcloud-base/internal/models" + "github.com/RafayLabs/rcloud-base/pkg/common" + "github.com/RafayLabs/rcloud-base/pkg/event" + "github.com/RafayLabs/rcloud-base/pkg/log" + "github.com/RafayLabs/rcloud-base/pkg/patch" + "github.com/RafayLabs/rcloud-base/pkg/query" + sentryutil "github.com/RafayLabs/rcloud-base/pkg/sentry/util" + commonv3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" + infrav3 "github.com/RafayLabs/rcloud-base/proto/types/infrapb/v3" + "github.com/RafayLabs/rcloud-base/proto/types/scheduler" + "github.com/RafayLabs/rcloud-base/proto/types/sentry" "github.com/google/uuid" "github.com/pkg/errors" "github.com/rs/xid" diff --git a/pkg/service/cluster_test.go b/pkg/service/cluster_test.go index b11ed08..0e75f7a 100644 --- a/pkg/service/cluster_test.go +++ b/pkg/service/cluster_test.go @@ -6,11 +6,11 @@ import ( "testing" "github.com/DATA-DOG/go-sqlmock" - "github.com/RafaySystems/rcloud-base/pkg/common" - "github.com/RafaySystems/rcloud-base/pkg/query" - commonv3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" - v3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" - infrav3 "github.com/RafaySystems/rcloud-base/proto/types/infrapb/v3" + "github.com/RafayLabs/rcloud-base/pkg/common" + "github.com/RafayLabs/rcloud-base/pkg/query" + commonv3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" + v3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" + infrav3 "github.com/RafayLabs/rcloud-base/proto/types/infrapb/v3" "github.com/google/uuid" ) diff --git a/pkg/service/group.go b/pkg/service/group.go index b942676..4966fd7 100644 --- a/pkg/service/group.go +++ b/pkg/service/group.go @@ -7,11 +7,11 @@ import ( "strconv" "time" - "github.com/RafaySystems/rcloud-base/internal/dao" - "github.com/RafaySystems/rcloud-base/internal/models" - authzv1 "github.com/RafaySystems/rcloud-base/proto/types/authz" - v3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" - userv3 "github.com/RafaySystems/rcloud-base/proto/types/userpb/v3" + "github.com/RafayLabs/rcloud-base/internal/dao" + "github.com/RafayLabs/rcloud-base/internal/models" + authzv1 "github.com/RafayLabs/rcloud-base/proto/types/authz" + v3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" + userv3 "github.com/RafayLabs/rcloud-base/proto/types/userpb/v3" "github.com/google/uuid" bun "github.com/uptrace/bun" "google.golang.org/protobuf/types/known/timestamppb" diff --git a/pkg/service/group_permission.go b/pkg/service/group_permission.go index ee4bd3e..fe7c3a3 100644 --- a/pkg/service/group_permission.go +++ b/pkg/service/group_permission.go @@ -4,9 +4,9 @@ import ( "context" "encoding/json" - "github.com/RafaySystems/rcloud-base/internal/dao" - "github.com/RafaySystems/rcloud-base/internal/models" - "github.com/RafaySystems/rcloud-base/proto/types/sentry" + "github.com/RafayLabs/rcloud-base/internal/dao" + "github.com/RafayLabs/rcloud-base/internal/models" + "github.com/RafayLabs/rcloud-base/proto/types/sentry" "github.com/google/uuid" "github.com/uptrace/bun" ) diff --git a/pkg/service/group_test.go b/pkg/service/group_test.go index c90b556..e996cf7 100644 --- a/pkg/service/group_test.go +++ b/pkg/service/group_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/DATA-DOG/go-sqlmock" - v3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" - userv3 "github.com/RafaySystems/rcloud-base/proto/types/userpb/v3" + v3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" + userv3 "github.com/RafayLabs/rcloud-base/proto/types/userpb/v3" "github.com/google/uuid" ) diff --git a/pkg/service/idp.go b/pkg/service/idp.go index 41a7ca2..6773263 100644 --- a/pkg/service/idp.go +++ b/pkg/service/idp.go @@ -14,10 +14,10 @@ import ( "net/url" "time" - "github.com/RafaySystems/rcloud-base/internal/dao" - "github.com/RafaySystems/rcloud-base/internal/models" - commonv3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" - systemv3 "github.com/RafaySystems/rcloud-base/proto/types/systempb/v3" + "github.com/RafayLabs/rcloud-base/internal/dao" + "github.com/RafayLabs/rcloud-base/internal/models" + commonv3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" + systemv3 "github.com/RafayLabs/rcloud-base/proto/types/systempb/v3" "github.com/google/uuid" "github.com/uptrace/bun" "google.golang.org/grpc/codes" diff --git a/pkg/service/kubeconfig_revocation.go b/pkg/service/kubeconfig_revocation.go index 7817bf7..ef80b36 100644 --- a/pkg/service/kubeconfig_revocation.go +++ b/pkg/service/kubeconfig_revocation.go @@ -5,10 +5,10 @@ import ( "database/sql" "time" - "github.com/RafaySystems/rcloud-base/internal/constants" - "github.com/RafaySystems/rcloud-base/internal/dao" - "github.com/RafaySystems/rcloud-base/internal/models" - "github.com/RafaySystems/rcloud-base/proto/types/sentry" + "github.com/RafayLabs/rcloud-base/internal/constants" + "github.com/RafayLabs/rcloud-base/internal/dao" + "github.com/RafayLabs/rcloud-base/internal/models" + "github.com/RafayLabs/rcloud-base/proto/types/sentry" "github.com/google/uuid" "github.com/uptrace/bun" "google.golang.org/protobuf/types/known/timestamppb" diff --git a/pkg/service/kubeconfig_settings.go b/pkg/service/kubeconfig_settings.go index 7319729..2c3dd61 100644 --- a/pkg/service/kubeconfig_settings.go +++ b/pkg/service/kubeconfig_settings.go @@ -5,10 +5,10 @@ import ( "database/sql" "time" - "github.com/RafaySystems/rcloud-base/internal/constants" - "github.com/RafaySystems/rcloud-base/internal/dao" - "github.com/RafaySystems/rcloud-base/internal/models" - "github.com/RafaySystems/rcloud-base/proto/types/sentry" + "github.com/RafayLabs/rcloud-base/internal/constants" + "github.com/RafayLabs/rcloud-base/internal/dao" + "github.com/RafayLabs/rcloud-base/internal/models" + "github.com/RafayLabs/rcloud-base/proto/types/sentry" "github.com/google/uuid" "github.com/uptrace/bun" "google.golang.org/protobuf/types/known/timestamppb" diff --git a/pkg/service/kubectl_cluster_setting.go b/pkg/service/kubectl_cluster_setting.go index 50e4375..a3fc84a 100644 --- a/pkg/service/kubectl_cluster_setting.go +++ b/pkg/service/kubectl_cluster_setting.go @@ -5,10 +5,10 @@ import ( "database/sql" "time" - "github.com/RafaySystems/rcloud-base/internal/constants" - "github.com/RafaySystems/rcloud-base/internal/dao" - "github.com/RafaySystems/rcloud-base/internal/models" - "github.com/RafaySystems/rcloud-base/proto/types/sentry" + "github.com/RafayLabs/rcloud-base/internal/constants" + "github.com/RafayLabs/rcloud-base/internal/dao" + "github.com/RafayLabs/rcloud-base/internal/models" + "github.com/RafayLabs/rcloud-base/proto/types/sentry" "github.com/google/uuid" "github.com/uptrace/bun" "google.golang.org/protobuf/types/known/timestamppb" diff --git a/pkg/service/metro.go b/pkg/service/metro.go index cf7e1f0..5b59507 100644 --- a/pkg/service/metro.go +++ b/pkg/service/metro.go @@ -4,10 +4,10 @@ import ( "context" "time" - "github.com/RafaySystems/rcloud-base/internal/dao" - "github.com/RafaySystems/rcloud-base/internal/models" - commonv3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" - infrav3 "github.com/RafaySystems/rcloud-base/proto/types/infrapb/v3" + "github.com/RafayLabs/rcloud-base/internal/dao" + "github.com/RafayLabs/rcloud-base/internal/models" + commonv3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" + infrav3 "github.com/RafayLabs/rcloud-base/proto/types/infrapb/v3" "github.com/google/uuid" bun "github.com/uptrace/bun" "google.golang.org/protobuf/types/known/timestamppb" diff --git a/pkg/service/metro_test.go b/pkg/service/metro_test.go index b006edd..cd6822e 100644 --- a/pkg/service/metro_test.go +++ b/pkg/service/metro_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/DATA-DOG/go-sqlmock" - commonv3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" - infrav3 "github.com/RafaySystems/rcloud-base/proto/types/infrapb/v3" + commonv3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" + infrav3 "github.com/RafayLabs/rcloud-base/proto/types/infrapb/v3" "github.com/google/uuid" ) diff --git a/pkg/service/mocks.go b/pkg/service/mocks.go index f46cb61..43adb80 100644 --- a/pkg/service/mocks.go +++ b/pkg/service/mocks.go @@ -4,7 +4,7 @@ import ( "context" "strings" - types "github.com/RafaySystems/rcloud-base/proto/types/authz" + types "github.com/RafayLabs/rcloud-base/proto/types/authz" ) type ApUpdate struct { diff --git a/pkg/service/namespace.go b/pkg/service/namespace.go index 1fa280e..466bcc5 100644 --- a/pkg/service/namespace.go +++ b/pkg/service/namespace.go @@ -5,14 +5,14 @@ import ( "encoding/json" "strconv" - "github.com/RafaySystems/rcloud-base/internal/cluster/dao" - "github.com/RafaySystems/rcloud-base/internal/models" - "github.com/RafaySystems/rcloud-base/pkg/converter" - "github.com/RafaySystems/rcloud-base/pkg/patch" - commonv3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" - "github.com/RafaySystems/rcloud-base/proto/types/controller" - infrav3 "github.com/RafaySystems/rcloud-base/proto/types/infrapb/v3" - "github.com/RafaySystems/rcloud-base/proto/types/scheduler" + "github.com/RafayLabs/rcloud-base/internal/cluster/dao" + "github.com/RafayLabs/rcloud-base/internal/models" + "github.com/RafayLabs/rcloud-base/pkg/converter" + "github.com/RafayLabs/rcloud-base/pkg/patch" + commonv3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" + "github.com/RafayLabs/rcloud-base/proto/types/controller" + infrav3 "github.com/RafayLabs/rcloud-base/proto/types/infrapb/v3" + "github.com/RafayLabs/rcloud-base/proto/types/scheduler" "github.com/google/uuid" ) diff --git a/pkg/service/oidc_provider.go b/pkg/service/oidc_provider.go index 70e7917..003fe28 100644 --- a/pkg/service/oidc_provider.go +++ b/pkg/service/oidc_provider.go @@ -8,10 +8,10 @@ import ( "net/url" "time" - "github.com/RafaySystems/rcloud-base/internal/dao" - "github.com/RafaySystems/rcloud-base/internal/models" - commonv3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" - systemv3 "github.com/RafaySystems/rcloud-base/proto/types/systempb/v3" + "github.com/RafayLabs/rcloud-base/internal/dao" + "github.com/RafayLabs/rcloud-base/internal/models" + commonv3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" + systemv3 "github.com/RafayLabs/rcloud-base/proto/types/systempb/v3" "github.com/google/uuid" bun "github.com/uptrace/bun" "google.golang.org/grpc/codes" diff --git a/pkg/service/organization.go b/pkg/service/organization.go index 70f4d69..b10aab2 100644 --- a/pkg/service/organization.go +++ b/pkg/service/organization.go @@ -6,10 +6,10 @@ import ( "fmt" "time" - "github.com/RafaySystems/rcloud-base/internal/dao" - "github.com/RafaySystems/rcloud-base/internal/models" - v3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" - systemv3 "github.com/RafaySystems/rcloud-base/proto/types/systempb/v3" + "github.com/RafayLabs/rcloud-base/internal/dao" + "github.com/RafayLabs/rcloud-base/internal/models" + v3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" + systemv3 "github.com/RafayLabs/rcloud-base/proto/types/systempb/v3" "github.com/google/uuid" bun "github.com/uptrace/bun" "google.golang.org/protobuf/types/known/timestamppb" diff --git a/pkg/service/organization_test.go b/pkg/service/organization_test.go index a24274a..3baa9cb 100644 --- a/pkg/service/organization_test.go +++ b/pkg/service/organization_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/DATA-DOG/go-sqlmock" - v3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" - systemv3 "github.com/RafaySystems/rcloud-base/proto/types/systempb/v3" + v3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" + systemv3 "github.com/RafayLabs/rcloud-base/proto/types/systempb/v3" "github.com/google/uuid" ) diff --git a/pkg/service/partner.go b/pkg/service/partner.go index 4890893..990d8dd 100644 --- a/pkg/service/partner.go +++ b/pkg/service/partner.go @@ -5,10 +5,10 @@ import ( "encoding/json" "time" - "github.com/RafaySystems/rcloud-base/internal/dao" - "github.com/RafaySystems/rcloud-base/internal/models" - v3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" - systemv3 "github.com/RafaySystems/rcloud-base/proto/types/systempb/v3" + "github.com/RafayLabs/rcloud-base/internal/dao" + "github.com/RafayLabs/rcloud-base/internal/models" + v3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" + systemv3 "github.com/RafayLabs/rcloud-base/proto/types/systempb/v3" "github.com/google/uuid" bun "github.com/uptrace/bun" "google.golang.org/protobuf/types/known/timestamppb" diff --git a/pkg/service/partner_test.go b/pkg/service/partner_test.go index ebcf9bd..87bb941 100644 --- a/pkg/service/partner_test.go +++ b/pkg/service/partner_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/DATA-DOG/go-sqlmock" - v3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" - systemv3 "github.com/RafaySystems/rcloud-base/proto/types/systempb/v3" + v3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" + systemv3 "github.com/RafayLabs/rcloud-base/proto/types/systempb/v3" "github.com/google/uuid" bun "github.com/uptrace/bun" "github.com/uptrace/bun/dialect/pgdialect" diff --git a/pkg/service/project.go b/pkg/service/project.go index e599f7e..e37620b 100644 --- a/pkg/service/project.go +++ b/pkg/service/project.go @@ -5,10 +5,10 @@ import ( "fmt" "time" - "github.com/RafaySystems/rcloud-base/internal/dao" - "github.com/RafaySystems/rcloud-base/internal/models" - v3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" - systemv3 "github.com/RafaySystems/rcloud-base/proto/types/systempb/v3" + "github.com/RafayLabs/rcloud-base/internal/dao" + "github.com/RafayLabs/rcloud-base/internal/models" + v3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" + systemv3 "github.com/RafayLabs/rcloud-base/proto/types/systempb/v3" "github.com/google/uuid" bun "github.com/uptrace/bun" "google.golang.org/protobuf/types/known/timestamppb" diff --git a/pkg/service/project_test.go b/pkg/service/project_test.go index 59a5579..500df16 100644 --- a/pkg/service/project_test.go +++ b/pkg/service/project_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/DATA-DOG/go-sqlmock" - v3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" - systemv3 "github.com/RafaySystems/rcloud-base/proto/types/systempb/v3" + v3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" + systemv3 "github.com/RafayLabs/rcloud-base/proto/types/systempb/v3" "github.com/google/uuid" ) diff --git a/pkg/service/relay_audit_query.go b/pkg/service/relay_audit_query.go index 29d4720..6fbaa00 100644 --- a/pkg/service/relay_audit_query.go +++ b/pkg/service/relay_audit_query.go @@ -4,7 +4,7 @@ import ( "bytes" "encoding/json" - v1 "github.com/RafaySystems/rcloud-base/proto/rpc/audit" + v1 "github.com/RafayLabs/rcloud-base/proto/rpc/audit" "google.golang.org/protobuf/types/known/structpb" ) diff --git a/pkg/service/role.go b/pkg/service/role.go index fb7dd6e..332d246 100644 --- a/pkg/service/role.go +++ b/pkg/service/role.go @@ -7,11 +7,11 @@ import ( "strings" "time" - "github.com/RafaySystems/rcloud-base/internal/dao" - "github.com/RafaySystems/rcloud-base/internal/models" - authzv1 "github.com/RafaySystems/rcloud-base/proto/types/authz" - v3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" - rolev3 "github.com/RafaySystems/rcloud-base/proto/types/rolepb/v3" + "github.com/RafayLabs/rcloud-base/internal/dao" + "github.com/RafayLabs/rcloud-base/internal/models" + authzv1 "github.com/RafayLabs/rcloud-base/proto/types/authz" + v3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" + rolev3 "github.com/RafayLabs/rcloud-base/proto/types/rolepb/v3" "github.com/google/uuid" bun "github.com/uptrace/bun" "google.golang.org/protobuf/types/known/timestamppb" diff --git a/pkg/service/role_test.go b/pkg/service/role_test.go index 57548b2..43d1c85 100644 --- a/pkg/service/role_test.go +++ b/pkg/service/role_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/DATA-DOG/go-sqlmock" - v3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" - rolev3 "github.com/RafaySystems/rcloud-base/proto/types/rolepb/v3" + v3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" + rolev3 "github.com/RafayLabs/rcloud-base/proto/types/rolepb/v3" "github.com/google/uuid" ) diff --git a/pkg/service/rolepermission.go b/pkg/service/rolepermission.go index ad772e4..37b677f 100644 --- a/pkg/service/rolepermission.go +++ b/pkg/service/rolepermission.go @@ -3,10 +3,10 @@ package service import ( "context" - "github.com/RafaySystems/rcloud-base/internal/dao" - "github.com/RafaySystems/rcloud-base/internal/models" - v3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" - rolev3 "github.com/RafaySystems/rcloud-base/proto/types/rolepb/v3" + "github.com/RafayLabs/rcloud-base/internal/dao" + "github.com/RafayLabs/rcloud-base/internal/models" + v3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" + rolev3 "github.com/RafayLabs/rcloud-base/proto/types/rolepb/v3" "github.com/google/uuid" bun "github.com/uptrace/bun" ) diff --git a/pkg/service/rolepermission_test.go b/pkg/service/rolepermission_test.go index 4713be8..1a78b28 100644 --- a/pkg/service/rolepermission_test.go +++ b/pkg/service/rolepermission_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/DATA-DOG/go-sqlmock" - v3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" - rolev3 "github.com/RafaySystems/rcloud-base/proto/types/rolepb/v3" + v3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" + rolev3 "github.com/RafayLabs/rcloud-base/proto/types/rolepb/v3" "github.com/google/uuid" ) diff --git a/pkg/service/user.go b/pkg/service/user.go index 4d59b31..0e9f944 100644 --- a/pkg/service/user.go +++ b/pkg/service/user.go @@ -11,14 +11,14 @@ import ( bun "github.com/uptrace/bun" "google.golang.org/protobuf/types/known/timestamppb" - "github.com/RafaySystems/rcloud-base/internal/dao" - "github.com/RafaySystems/rcloud-base/internal/models" - providers "github.com/RafaySystems/rcloud-base/internal/provider/kratos" - "github.com/RafaySystems/rcloud-base/pkg/common" - userrpcv3 "github.com/RafaySystems/rcloud-base/proto/rpc/user" - authzv1 "github.com/RafaySystems/rcloud-base/proto/types/authz" - v3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" - userv3 "github.com/RafaySystems/rcloud-base/proto/types/userpb/v3" + "github.com/RafayLabs/rcloud-base/internal/dao" + "github.com/RafayLabs/rcloud-base/internal/models" + providers "github.com/RafayLabs/rcloud-base/internal/provider/kratos" + "github.com/RafayLabs/rcloud-base/pkg/common" + userrpcv3 "github.com/RafayLabs/rcloud-base/proto/rpc/user" + authzv1 "github.com/RafayLabs/rcloud-base/proto/types/authz" + v3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" + userv3 "github.com/RafayLabs/rcloud-base/proto/types/userpb/v3" ) const ( diff --git a/pkg/service/user_test.go b/pkg/service/user_test.go index ad9d7fd..f95db5b 100644 --- a/pkg/service/user_test.go +++ b/pkg/service/user_test.go @@ -6,9 +6,9 @@ import ( "testing" "github.com/DATA-DOG/go-sqlmock" - "github.com/RafaySystems/rcloud-base/pkg/common" - v3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" - userv3 "github.com/RafaySystems/rcloud-base/proto/types/userpb/v3" + "github.com/RafayLabs/rcloud-base/pkg/common" + v3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" + userv3 "github.com/RafayLabs/rcloud-base/proto/types/userpb/v3" "github.com/google/uuid" ) diff --git a/pkg/sso/saml/middleware.go b/pkg/sso/saml/middleware.go index d955e45..00a8fed 100644 --- a/pkg/sso/saml/middleware.go +++ b/pkg/sso/saml/middleware.go @@ -11,7 +11,7 @@ import ( "os" "strings" - "github.com/RafaySystems/rcloud-base/internal/models" + "github.com/RafayLabs/rcloud-base/internal/models" "github.com/crewjam/saml" "github.com/crewjam/saml/samlsp" ) diff --git a/pkg/sso/saml/saml.go b/pkg/sso/saml/saml.go index 86d489c..abde744 100644 --- a/pkg/sso/saml/saml.go +++ b/pkg/sso/saml/saml.go @@ -1,7 +1,7 @@ package saml import ( - pg "github.com/RafaySystems/rcloud-base/internal/persistence/provider/pg" + pg "github.com/RafayLabs/rcloud-base/internal/persistence/provider/pg" "github.com/crewjam/saml/samlsp" "github.com/uptrace/bun" ) diff --git a/proto/rpc/audit/auditlog.pb.go b/proto/rpc/audit/auditlog.pb.go index cf96314..a0beb3a 100644 --- a/proto/rpc/audit/auditlog.pb.go +++ b/proto/rpc/audit/auditlog.pb.go @@ -7,7 +7,7 @@ package eventv1 import ( - v3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" + v3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" _ "google.golang.org/genproto/googleapis/api/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" diff --git a/proto/rpc/audit/relayaudit.pb.go b/proto/rpc/audit/relayaudit.pb.go index cd168e1..46998c2 100644 --- a/proto/rpc/audit/relayaudit.pb.go +++ b/proto/rpc/audit/relayaudit.pb.go @@ -7,7 +7,7 @@ package eventv1 import ( - v3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" + v3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" _ "google.golang.org/genproto/googleapis/api/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" diff --git a/proto/rpc/authz/authz.pb.go b/proto/rpc/authz/authz.pb.go index 4b5e38f..56c6176 100644 --- a/proto/rpc/authz/authz.pb.go +++ b/proto/rpc/authz/authz.pb.go @@ -7,7 +7,7 @@ package authzv1 import ( - authz "github.com/RafaySystems/rcloud-base/proto/types/authz" + authz "github.com/RafayLabs/rcloud-base/proto/types/authz" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" diff --git a/proto/rpc/authz/authz_grpc.pb.go b/proto/rpc/authz/authz_grpc.pb.go index 9cee3b0..6a6b003 100644 --- a/proto/rpc/authz/authz_grpc.pb.go +++ b/proto/rpc/authz/authz_grpc.pb.go @@ -4,7 +4,7 @@ package authzv1 import ( context "context" - authz "github.com/RafaySystems/rcloud-base/proto/types/authz" + authz "github.com/RafayLabs/rcloud-base/proto/types/authz" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/proto/rpc/role/role.pb.go b/proto/rpc/role/role.pb.go index ecb4449..1ac6cc3 100644 --- a/proto/rpc/role/role.pb.go +++ b/proto/rpc/role/role.pb.go @@ -7,7 +7,7 @@ package rpcv3 import ( - v3 "github.com/RafaySystems/rcloud-base/proto/types/rolepb/v3" + v3 "github.com/RafayLabs/rcloud-base/proto/types/rolepb/v3" _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" _ "google.golang.org/genproto/googleapis/api/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" diff --git a/proto/rpc/role/role.pb.gw.go b/proto/rpc/role/role.pb.gw.go index e3df960..cce4e69 100644 --- a/proto/rpc/role/role.pb.gw.go +++ b/proto/rpc/role/role.pb.gw.go @@ -13,7 +13,7 @@ import ( "io" "net/http" - "github.com/RafaySystems/rcloud-base/proto/types/rolepb/v3" + "github.com/RafayLabs/rcloud-base/proto/types/rolepb/v3" "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "github.com/grpc-ecosystem/grpc-gateway/v2/utilities" "google.golang.org/grpc" diff --git a/proto/rpc/role/role_grpc.pb.go b/proto/rpc/role/role_grpc.pb.go index cb253c9..21ed297 100644 --- a/proto/rpc/role/role_grpc.pb.go +++ b/proto/rpc/role/role_grpc.pb.go @@ -4,7 +4,7 @@ package rpcv3 import ( context "context" - v3 "github.com/RafaySystems/rcloud-base/proto/types/rolepb/v3" + v3 "github.com/RafayLabs/rcloud-base/proto/types/rolepb/v3" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/proto/rpc/role/rolepermission.pb.go b/proto/rpc/role/rolepermission.pb.go index 08bb620..38086ac 100644 --- a/proto/rpc/role/rolepermission.pb.go +++ b/proto/rpc/role/rolepermission.pb.go @@ -7,7 +7,7 @@ package rpcv3 import ( - v3 "github.com/RafaySystems/rcloud-base/proto/types/rolepb/v3" + v3 "github.com/RafayLabs/rcloud-base/proto/types/rolepb/v3" _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" _ "google.golang.org/genproto/googleapis/api/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" diff --git a/proto/rpc/role/rolepermission.pb.gw.go b/proto/rpc/role/rolepermission.pb.gw.go index 0cfa766..1a42073 100644 --- a/proto/rpc/role/rolepermission.pb.gw.go +++ b/proto/rpc/role/rolepermission.pb.gw.go @@ -13,7 +13,7 @@ import ( "io" "net/http" - "github.com/RafaySystems/rcloud-base/proto/types/rolepb/v3" + "github.com/RafayLabs/rcloud-base/proto/types/rolepb/v3" "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "github.com/grpc-ecosystem/grpc-gateway/v2/utilities" "google.golang.org/grpc" diff --git a/proto/rpc/role/rolepermission_grpc.pb.go b/proto/rpc/role/rolepermission_grpc.pb.go index 22c5738..980b156 100644 --- a/proto/rpc/role/rolepermission_grpc.pb.go +++ b/proto/rpc/role/rolepermission_grpc.pb.go @@ -4,7 +4,7 @@ package rpcv3 import ( context "context" - v3 "github.com/RafaySystems/rcloud-base/proto/types/rolepb/v3" + v3 "github.com/RafayLabs/rcloud-base/proto/types/rolepb/v3" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/proto/rpc/scheduler/cluster.pb.go b/proto/rpc/scheduler/cluster.pb.go index c9d3b57..275dd54 100644 --- a/proto/rpc/scheduler/cluster.pb.go +++ b/proto/rpc/scheduler/cluster.pb.go @@ -7,8 +7,8 @@ package rpcv3 import ( - v31 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" - v3 "github.com/RafaySystems/rcloud-base/proto/types/infrapb/v3" + v31 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" + v3 "github.com/RafayLabs/rcloud-base/proto/types/infrapb/v3" _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" _ "google.golang.org/genproto/googleapis/api/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" diff --git a/proto/rpc/scheduler/cluster.pb.gw.go b/proto/rpc/scheduler/cluster.pb.gw.go index f31d5a2..916a28d 100644 --- a/proto/rpc/scheduler/cluster.pb.gw.go +++ b/proto/rpc/scheduler/cluster.pb.gw.go @@ -13,8 +13,8 @@ import ( "io" "net/http" - "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" - "github.com/RafaySystems/rcloud-base/proto/types/infrapb/v3" + "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" + "github.com/RafayLabs/rcloud-base/proto/types/infrapb/v3" "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "github.com/grpc-ecosystem/grpc-gateway/v2/utilities" "google.golang.org/grpc" diff --git a/proto/rpc/scheduler/cluster_grpc.pb.go b/proto/rpc/scheduler/cluster_grpc.pb.go index 370b213..78ab00b 100644 --- a/proto/rpc/scheduler/cluster_grpc.pb.go +++ b/proto/rpc/scheduler/cluster_grpc.pb.go @@ -4,8 +4,8 @@ package rpcv3 import ( context "context" - v31 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" - v3 "github.com/RafaySystems/rcloud-base/proto/types/infrapb/v3" + v31 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" + v3 "github.com/RafayLabs/rcloud-base/proto/types/infrapb/v3" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/proto/rpc/scheduler/internal.go b/proto/rpc/scheduler/internal.go index 1fe0eaa..f2d9bd1 100644 --- a/proto/rpc/scheduler/internal.go +++ b/proto/rpc/scheduler/internal.go @@ -3,7 +3,7 @@ package rpcv3 import ( "context" - "github.com/RafaySystems/rcloud-base/pkg/pool" + "github.com/RafayLabs/rcloud-base/pkg/pool" grpcpool "github.com/processout/grpc-go-pool" ) diff --git a/proto/rpc/sentry/audit_info.pb.go b/proto/rpc/sentry/audit_info.pb.go index 0f63cd3..02ecdfa 100644 --- a/proto/rpc/sentry/audit_info.pb.go +++ b/proto/rpc/sentry/audit_info.pb.go @@ -7,8 +7,8 @@ package sentry import ( - _ "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" - _ "github.com/RafaySystems/rcloud-base/proto/types/sentry" + _ "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" + _ "github.com/RafayLabs/rcloud-base/proto/types/sentry" _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" _ "google.golang.org/genproto/googleapis/api/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" diff --git a/proto/rpc/sentry/bootstrap.pb.go b/proto/rpc/sentry/bootstrap.pb.go index 18db106..0d883e1 100644 --- a/proto/rpc/sentry/bootstrap.pb.go +++ b/proto/rpc/sentry/bootstrap.pb.go @@ -7,8 +7,8 @@ package sentry import ( - v3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" - sentry "github.com/RafaySystems/rcloud-base/proto/types/sentry" + v3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" + sentry "github.com/RafayLabs/rcloud-base/proto/types/sentry" _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" _ "google.golang.org/genproto/googleapis/api/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" diff --git a/proto/rpc/sentry/bootstrap.pb.gw.go b/proto/rpc/sentry/bootstrap.pb.gw.go index 8c843b2..3a4efe1 100644 --- a/proto/rpc/sentry/bootstrap.pb.gw.go +++ b/proto/rpc/sentry/bootstrap.pb.gw.go @@ -13,8 +13,8 @@ import ( "io" "net/http" - "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" - sentry_0 "github.com/RafaySystems/rcloud-base/proto/types/sentry" + "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" + sentry_0 "github.com/RafayLabs/rcloud-base/proto/types/sentry" "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "github.com/grpc-ecosystem/grpc-gateway/v2/utilities" "google.golang.org/grpc" diff --git a/proto/rpc/sentry/bootstrap_grpc.pb.go b/proto/rpc/sentry/bootstrap_grpc.pb.go index 3a57a38..8649e03 100644 --- a/proto/rpc/sentry/bootstrap_grpc.pb.go +++ b/proto/rpc/sentry/bootstrap_grpc.pb.go @@ -4,8 +4,8 @@ package sentry import ( context "context" - v3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" - sentry "github.com/RafaySystems/rcloud-base/proto/types/sentry" + v3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" + sentry "github.com/RafayLabs/rcloud-base/proto/types/sentry" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/proto/rpc/sentry/cluster_authz.pb.go b/proto/rpc/sentry/cluster_authz.pb.go index 9a26c53..d98678c 100644 --- a/proto/rpc/sentry/cluster_authz.pb.go +++ b/proto/rpc/sentry/cluster_authz.pb.go @@ -7,9 +7,9 @@ package sentry import ( - _ "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" - controller "github.com/RafaySystems/rcloud-base/proto/types/controller" - _ "github.com/RafaySystems/rcloud-base/proto/types/sentry" + _ "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" + controller "github.com/RafayLabs/rcloud-base/proto/types/controller" + _ "github.com/RafayLabs/rcloud-base/proto/types/sentry" _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" _ "google.golang.org/genproto/googleapis/api/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" diff --git a/proto/rpc/sentry/internal.go b/proto/rpc/sentry/internal.go index 7a91993..63f69ed 100644 --- a/proto/rpc/sentry/internal.go +++ b/proto/rpc/sentry/internal.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - grpctools "github.com/RafaySystems/rcloud-base/pkg/grpc" - "github.com/RafaySystems/rcloud-base/pkg/pool" + grpctools "github.com/RafayLabs/rcloud-base/pkg/grpc" + "github.com/RafayLabs/rcloud-base/pkg/pool" grpcpool "github.com/processout/grpc-go-pool" "google.golang.org/grpc/credentials" ) diff --git a/proto/rpc/sentry/kubeconfig.pb.go b/proto/rpc/sentry/kubeconfig.pb.go index 8ad060f..538c049 100644 --- a/proto/rpc/sentry/kubeconfig.pb.go +++ b/proto/rpc/sentry/kubeconfig.pb.go @@ -7,8 +7,8 @@ package sentry import ( - v3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" - _ "github.com/RafaySystems/rcloud-base/proto/types/sentry" + v3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" + _ "github.com/RafayLabs/rcloud-base/proto/types/sentry" _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" _ "google.golang.org/genproto/googleapis/api/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" diff --git a/proto/rpc/sentry/kubeconfig_grpc.pb.go b/proto/rpc/sentry/kubeconfig_grpc.pb.go index 2eb8f1c..9b59cea 100644 --- a/proto/rpc/sentry/kubeconfig_grpc.pb.go +++ b/proto/rpc/sentry/kubeconfig_grpc.pb.go @@ -4,7 +4,7 @@ package sentry import ( context "context" - v3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" + v3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/proto/rpc/sentry/kubectl_cluster.pb.go b/proto/rpc/sentry/kubectl_cluster.pb.go index 401d15b..aa65693 100644 --- a/proto/rpc/sentry/kubectl_cluster.pb.go +++ b/proto/rpc/sentry/kubectl_cluster.pb.go @@ -7,8 +7,8 @@ package sentry import ( - v3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" - _ "github.com/RafaySystems/rcloud-base/proto/types/sentry" + v3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" + _ "github.com/RafayLabs/rcloud-base/proto/types/sentry" _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" _ "google.golang.org/genproto/googleapis/api/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" diff --git a/proto/rpc/system/idp.pb.go b/proto/rpc/system/idp.pb.go index d95d260..91cff9f 100644 --- a/proto/rpc/system/idp.pb.go +++ b/proto/rpc/system/idp.pb.go @@ -7,7 +7,7 @@ package rpcv3 import ( - v3 "github.com/RafaySystems/rcloud-base/proto/types/systempb/v3" + v3 "github.com/RafayLabs/rcloud-base/proto/types/systempb/v3" _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" _ "google.golang.org/genproto/googleapis/api/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" diff --git a/proto/rpc/system/idp.pb.gw.go b/proto/rpc/system/idp.pb.gw.go index 46797ff..5630f01 100644 --- a/proto/rpc/system/idp.pb.gw.go +++ b/proto/rpc/system/idp.pb.gw.go @@ -13,7 +13,7 @@ import ( "io" "net/http" - "github.com/RafaySystems/rcloud-base/proto/types/systempb/v3" + "github.com/RafayLabs/rcloud-base/proto/types/systempb/v3" "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "github.com/grpc-ecosystem/grpc-gateway/v2/utilities" "google.golang.org/grpc" diff --git a/proto/rpc/system/idp_grpc.pb.go b/proto/rpc/system/idp_grpc.pb.go index 30cc9ed..151371c 100644 --- a/proto/rpc/system/idp_grpc.pb.go +++ b/proto/rpc/system/idp_grpc.pb.go @@ -4,7 +4,7 @@ package rpcv3 import ( context "context" - v3 "github.com/RafaySystems/rcloud-base/proto/types/systempb/v3" + v3 "github.com/RafayLabs/rcloud-base/proto/types/systempb/v3" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/proto/rpc/system/metro.pb.go b/proto/rpc/system/metro.pb.go index 1dc601a..a8cc99d 100644 --- a/proto/rpc/system/metro.pb.go +++ b/proto/rpc/system/metro.pb.go @@ -7,7 +7,7 @@ package rpcv3 import ( - v3 "github.com/RafaySystems/rcloud-base/proto/types/infrapb/v3" + v3 "github.com/RafayLabs/rcloud-base/proto/types/infrapb/v3" _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" _ "google.golang.org/genproto/googleapis/api/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" diff --git a/proto/rpc/system/metro.pb.gw.go b/proto/rpc/system/metro.pb.gw.go index a21641d..db9c6df 100644 --- a/proto/rpc/system/metro.pb.gw.go +++ b/proto/rpc/system/metro.pb.gw.go @@ -13,7 +13,7 @@ import ( "io" "net/http" - "github.com/RafaySystems/rcloud-base/proto/types/infrapb/v3" + "github.com/RafayLabs/rcloud-base/proto/types/infrapb/v3" "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "github.com/grpc-ecosystem/grpc-gateway/v2/utilities" "google.golang.org/grpc" diff --git a/proto/rpc/system/metro_grpc.pb.go b/proto/rpc/system/metro_grpc.pb.go index eb695fa..544a0dd 100644 --- a/proto/rpc/system/metro_grpc.pb.go +++ b/proto/rpc/system/metro_grpc.pb.go @@ -4,7 +4,7 @@ package rpcv3 import ( context "context" - v3 "github.com/RafaySystems/rcloud-base/proto/types/infrapb/v3" + v3 "github.com/RafayLabs/rcloud-base/proto/types/infrapb/v3" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/proto/rpc/system/oidc_provider.pb.go b/proto/rpc/system/oidc_provider.pb.go index 57da707..4ad6f2e 100644 --- a/proto/rpc/system/oidc_provider.pb.go +++ b/proto/rpc/system/oidc_provider.pb.go @@ -7,7 +7,7 @@ package rpcv3 import ( - v3 "github.com/RafaySystems/rcloud-base/proto/types/systempb/v3" + v3 "github.com/RafayLabs/rcloud-base/proto/types/systempb/v3" _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" _ "google.golang.org/genproto/googleapis/api/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" diff --git a/proto/rpc/system/oidc_provider.pb.gw.go b/proto/rpc/system/oidc_provider.pb.gw.go index 7fb50a4..c310fc7 100644 --- a/proto/rpc/system/oidc_provider.pb.gw.go +++ b/proto/rpc/system/oidc_provider.pb.gw.go @@ -13,7 +13,7 @@ import ( "io" "net/http" - "github.com/RafaySystems/rcloud-base/proto/types/systempb/v3" + "github.com/RafayLabs/rcloud-base/proto/types/systempb/v3" "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "github.com/grpc-ecosystem/grpc-gateway/v2/utilities" "google.golang.org/grpc" diff --git a/proto/rpc/system/oidc_provider_grpc.pb.go b/proto/rpc/system/oidc_provider_grpc.pb.go index cc96819..e240085 100644 --- a/proto/rpc/system/oidc_provider_grpc.pb.go +++ b/proto/rpc/system/oidc_provider_grpc.pb.go @@ -4,7 +4,7 @@ package rpcv3 import ( context "context" - v3 "github.com/RafaySystems/rcloud-base/proto/types/systempb/v3" + v3 "github.com/RafayLabs/rcloud-base/proto/types/systempb/v3" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/proto/rpc/system/organization.pb.go b/proto/rpc/system/organization.pb.go index 9a39be2..045708d 100644 --- a/proto/rpc/system/organization.pb.go +++ b/proto/rpc/system/organization.pb.go @@ -7,7 +7,7 @@ package rpcv3 import ( - v3 "github.com/RafaySystems/rcloud-base/proto/types/systempb/v3" + v3 "github.com/RafayLabs/rcloud-base/proto/types/systempb/v3" _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" _ "google.golang.org/genproto/googleapis/api/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" diff --git a/proto/rpc/system/organization.pb.gw.go b/proto/rpc/system/organization.pb.gw.go index 9008c52..8dc6f83 100644 --- a/proto/rpc/system/organization.pb.gw.go +++ b/proto/rpc/system/organization.pb.gw.go @@ -13,7 +13,7 @@ import ( "io" "net/http" - "github.com/RafaySystems/rcloud-base/proto/types/systempb/v3" + "github.com/RafayLabs/rcloud-base/proto/types/systempb/v3" "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "github.com/grpc-ecosystem/grpc-gateway/v2/utilities" "google.golang.org/grpc" diff --git a/proto/rpc/system/organization_grpc.pb.go b/proto/rpc/system/organization_grpc.pb.go index fc0a8e0..f80d179 100644 --- a/proto/rpc/system/organization_grpc.pb.go +++ b/proto/rpc/system/organization_grpc.pb.go @@ -4,7 +4,7 @@ package rpcv3 import ( context "context" - v3 "github.com/RafaySystems/rcloud-base/proto/types/systempb/v3" + v3 "github.com/RafayLabs/rcloud-base/proto/types/systempb/v3" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/proto/rpc/system/partner.pb.go b/proto/rpc/system/partner.pb.go index 2169d4e..9b10899 100644 --- a/proto/rpc/system/partner.pb.go +++ b/proto/rpc/system/partner.pb.go @@ -7,7 +7,7 @@ package rpcv3 import ( - v3 "github.com/RafaySystems/rcloud-base/proto/types/systempb/v3" + v3 "github.com/RafayLabs/rcloud-base/proto/types/systempb/v3" _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" _ "google.golang.org/genproto/googleapis/api/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" diff --git a/proto/rpc/system/partner.pb.gw.go b/proto/rpc/system/partner.pb.gw.go index 5749c8a..69f9f63 100644 --- a/proto/rpc/system/partner.pb.gw.go +++ b/proto/rpc/system/partner.pb.gw.go @@ -13,7 +13,7 @@ import ( "io" "net/http" - "github.com/RafaySystems/rcloud-base/proto/types/systempb/v3" + "github.com/RafayLabs/rcloud-base/proto/types/systempb/v3" "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "github.com/grpc-ecosystem/grpc-gateway/v2/utilities" "google.golang.org/grpc" diff --git a/proto/rpc/system/partner_grpc.pb.go b/proto/rpc/system/partner_grpc.pb.go index b72ca35..fa2ebc8 100644 --- a/proto/rpc/system/partner_grpc.pb.go +++ b/proto/rpc/system/partner_grpc.pb.go @@ -4,7 +4,7 @@ package rpcv3 import ( context "context" - v3 "github.com/RafaySystems/rcloud-base/proto/types/systempb/v3" + v3 "github.com/RafayLabs/rcloud-base/proto/types/systempb/v3" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/proto/rpc/system/project.pb.go b/proto/rpc/system/project.pb.go index 13a0d3a..39f7b2b 100644 --- a/proto/rpc/system/project.pb.go +++ b/proto/rpc/system/project.pb.go @@ -7,7 +7,7 @@ package rpcv3 import ( - v3 "github.com/RafaySystems/rcloud-base/proto/types/systempb/v3" + v3 "github.com/RafayLabs/rcloud-base/proto/types/systempb/v3" _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" _ "google.golang.org/genproto/googleapis/api/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" diff --git a/proto/rpc/system/project.pb.gw.go b/proto/rpc/system/project.pb.gw.go index cad4c2a..2fea20c 100644 --- a/proto/rpc/system/project.pb.gw.go +++ b/proto/rpc/system/project.pb.gw.go @@ -13,7 +13,7 @@ import ( "io" "net/http" - "github.com/RafaySystems/rcloud-base/proto/types/systempb/v3" + "github.com/RafayLabs/rcloud-base/proto/types/systempb/v3" "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "github.com/grpc-ecosystem/grpc-gateway/v2/utilities" "google.golang.org/grpc" diff --git a/proto/rpc/system/project_grpc.pb.go b/proto/rpc/system/project_grpc.pb.go index 4807bee..e8d5f2d 100644 --- a/proto/rpc/system/project_grpc.pb.go +++ b/proto/rpc/system/project_grpc.pb.go @@ -4,7 +4,7 @@ package rpcv3 import ( context "context" - v3 "github.com/RafaySystems/rcloud-base/proto/types/systempb/v3" + v3 "github.com/RafayLabs/rcloud-base/proto/types/systempb/v3" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/proto/rpc/user/group.pb.go b/proto/rpc/user/group.pb.go index c0c8333..45ea8b1 100644 --- a/proto/rpc/user/group.pb.go +++ b/proto/rpc/user/group.pb.go @@ -7,7 +7,7 @@ package rpcv3 import ( - v3 "github.com/RafaySystems/rcloud-base/proto/types/userpb/v3" + v3 "github.com/RafayLabs/rcloud-base/proto/types/userpb/v3" _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" _ "google.golang.org/genproto/googleapis/api/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" diff --git a/proto/rpc/user/group.pb.gw.go b/proto/rpc/user/group.pb.gw.go index d128f89..8b4dc00 100644 --- a/proto/rpc/user/group.pb.gw.go +++ b/proto/rpc/user/group.pb.gw.go @@ -13,7 +13,7 @@ import ( "io" "net/http" - "github.com/RafaySystems/rcloud-base/proto/types/userpb/v3" + "github.com/RafayLabs/rcloud-base/proto/types/userpb/v3" "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "github.com/grpc-ecosystem/grpc-gateway/v2/utilities" "google.golang.org/grpc" diff --git a/proto/rpc/user/group_grpc.pb.go b/proto/rpc/user/group_grpc.pb.go index 6502d19..ba73b02 100644 --- a/proto/rpc/user/group_grpc.pb.go +++ b/proto/rpc/user/group_grpc.pb.go @@ -4,7 +4,7 @@ package rpcv3 import ( context "context" - v3 "github.com/RafaySystems/rcloud-base/proto/types/userpb/v3" + v3 "github.com/RafayLabs/rcloud-base/proto/types/userpb/v3" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/proto/rpc/user/user.pb.go b/proto/rpc/user/user.pb.go index 6e5df20..34f0507 100644 --- a/proto/rpc/user/user.pb.go +++ b/proto/rpc/user/user.pb.go @@ -7,8 +7,8 @@ package rpcv3 import ( - v31 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" - v3 "github.com/RafaySystems/rcloud-base/proto/types/userpb/v3" + v31 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" + v3 "github.com/RafayLabs/rcloud-base/proto/types/userpb/v3" _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" _ "google.golang.org/genproto/googleapis/api/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" diff --git a/proto/rpc/user/user.pb.gw.go b/proto/rpc/user/user.pb.gw.go index 67c63c8..f2c1175 100644 --- a/proto/rpc/user/user.pb.gw.go +++ b/proto/rpc/user/user.pb.gw.go @@ -13,7 +13,7 @@ import ( "io" "net/http" - "github.com/RafaySystems/rcloud-base/proto/types/userpb/v3" + "github.com/RafayLabs/rcloud-base/proto/types/userpb/v3" "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "github.com/grpc-ecosystem/grpc-gateway/v2/utilities" "google.golang.org/grpc" diff --git a/proto/rpc/user/user_grpc.pb.go b/proto/rpc/user/user_grpc.pb.go index 3026e09..99ca9ac 100644 --- a/proto/rpc/user/user_grpc.pb.go +++ b/proto/rpc/user/user_grpc.pb.go @@ -4,8 +4,8 @@ package rpcv3 import ( context "context" - v31 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" - v3 "github.com/RafaySystems/rcloud-base/proto/types/userpb/v3" + v31 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" + v3 "github.com/RafayLabs/rcloud-base/proto/types/userpb/v3" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/proto/rpc/v3/auth.pb.go b/proto/rpc/v3/auth.pb.go index 55c7702..cc53515 100644 --- a/proto/rpc/v3/auth.pb.go +++ b/proto/rpc/v3/auth.pb.go @@ -7,7 +7,7 @@ package rpcv3 import ( - v3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" + v3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" diff --git a/proto/rpc/v3/auth_grpc.pb.go b/proto/rpc/v3/auth_grpc.pb.go index 0ab54e3..3c618ed 100644 --- a/proto/rpc/v3/auth_grpc.pb.go +++ b/proto/rpc/v3/auth_grpc.pb.go @@ -4,7 +4,7 @@ package rpcv3 import ( context "context" - v3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" + v3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/proto/types/infrapb/v3/cluster.pb.go b/proto/types/infrapb/v3/cluster.pb.go index f296693..21de3c6 100644 --- a/proto/types/infrapb/v3/cluster.pb.go +++ b/proto/types/infrapb/v3/cluster.pb.go @@ -7,7 +7,7 @@ package infrav3 import ( - v3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" + v3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" diff --git a/proto/types/rolepb/v3/role.pb.go b/proto/types/rolepb/v3/role.pb.go index 6c3e505..ca49cdd 100644 --- a/proto/types/rolepb/v3/role.pb.go +++ b/proto/types/rolepb/v3/role.pb.go @@ -7,7 +7,7 @@ package rolev3 import ( - v3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" + v3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" diff --git a/proto/types/rolepb/v3/rolepermission.pb.go b/proto/types/rolepb/v3/rolepermission.pb.go index 3791125..7004c62 100644 --- a/proto/types/rolepb/v3/rolepermission.pb.go +++ b/proto/types/rolepb/v3/rolepermission.pb.go @@ -7,7 +7,7 @@ package rolev3 import ( - v3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" + v3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" diff --git a/proto/types/scheduler/namespace.pb.go b/proto/types/scheduler/namespace.pb.go index dc18565..f9daf5f 100644 --- a/proto/types/scheduler/namespace.pb.go +++ b/proto/types/scheduler/namespace.pb.go @@ -7,8 +7,8 @@ package scheduler import ( - v3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" - controller "github.com/RafaySystems/rcloud-base/proto/types/controller" + v3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" + controller "github.com/RafayLabs/rcloud-base/proto/types/controller" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" timestamppb "google.golang.org/protobuf/types/known/timestamppb" diff --git a/proto/types/sentry/sentry.pb.go b/proto/types/sentry/sentry.pb.go index fa386a4..d8d33e7 100644 --- a/proto/types/sentry/sentry.pb.go +++ b/proto/types/sentry/sentry.pb.go @@ -7,7 +7,7 @@ package sentry import ( - v3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" + v3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" diff --git a/proto/types/systempb/v3/idp.pb.go b/proto/types/systempb/v3/idp.pb.go index 0737fec..46cbb9f 100644 --- a/proto/types/systempb/v3/idp.pb.go +++ b/proto/types/systempb/v3/idp.pb.go @@ -7,7 +7,7 @@ package systemv3 import ( - v3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" + v3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" diff --git a/proto/types/systempb/v3/oidc_provider.pb.go b/proto/types/systempb/v3/oidc_provider.pb.go index 34c4b8c..5f32175 100644 --- a/proto/types/systempb/v3/oidc_provider.pb.go +++ b/proto/types/systempb/v3/oidc_provider.pb.go @@ -7,7 +7,7 @@ package systemv3 import ( - v3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" + v3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" diff --git a/proto/types/systempb/v3/organization.pb.go b/proto/types/systempb/v3/organization.pb.go index f143a31..6664945 100644 --- a/proto/types/systempb/v3/organization.pb.go +++ b/proto/types/systempb/v3/organization.pb.go @@ -7,7 +7,7 @@ package systemv3 import ( - v3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" + v3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" diff --git a/proto/types/systempb/v3/partner.pb.go b/proto/types/systempb/v3/partner.pb.go index 1302baa..24a12a7 100644 --- a/proto/types/systempb/v3/partner.pb.go +++ b/proto/types/systempb/v3/partner.pb.go @@ -7,7 +7,7 @@ package systemv3 import ( - v3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" + v3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" diff --git a/proto/types/systempb/v3/project.pb.go b/proto/types/systempb/v3/project.pb.go index 889fb57..4c1af2f 100644 --- a/proto/types/systempb/v3/project.pb.go +++ b/proto/types/systempb/v3/project.pb.go @@ -7,7 +7,7 @@ package systemv3 import ( - v3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" + v3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" _ "google.golang.org/genproto/googleapis/api/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" diff --git a/proto/types/userpb/v3/group.pb.go b/proto/types/userpb/v3/group.pb.go index afea02b..7b35f26 100644 --- a/proto/types/userpb/v3/group.pb.go +++ b/proto/types/userpb/v3/group.pb.go @@ -7,8 +7,8 @@ package userv3 import ( - v3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" - _ "github.com/RafaySystems/rcloud-base/proto/types/rolepb/v3" + v3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" + _ "github.com/RafayLabs/rcloud-base/proto/types/rolepb/v3" _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" diff --git a/proto/types/userpb/v3/user.pb.go b/proto/types/userpb/v3/user.pb.go index f7ec9cd..7d83870 100644 --- a/proto/types/userpb/v3/user.pb.go +++ b/proto/types/userpb/v3/user.pb.go @@ -7,8 +7,8 @@ package userv3 import ( - v3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" - _ "github.com/RafaySystems/rcloud-base/proto/types/rolepb/v3" + v3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" + _ "github.com/RafayLabs/rcloud-base/proto/types/rolepb/v3" _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" diff --git a/scripts/initialize/main.go b/scripts/initialize/main.go index 8f2304b..ec2e132 100644 --- a/scripts/initialize/main.go +++ b/scripts/initialize/main.go @@ -11,16 +11,16 @@ import ( "os" "path" - "github.com/RafaySystems/rcloud-base/internal/models" - providers "github.com/RafaySystems/rcloud-base/internal/persistence/provider/kratos" - "github.com/RafaySystems/rcloud-base/internal/persistence/provider/pg" - "github.com/RafaySystems/rcloud-base/pkg/common" - "github.com/RafaySystems/rcloud-base/pkg/enforcer" - "github.com/RafaySystems/rcloud-base/pkg/service" - commonv3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" - rolev3 "github.com/RafaySystems/rcloud-base/proto/types/rolepb/v3" - systemv3 "github.com/RafaySystems/rcloud-base/proto/types/systempb/v3" - userv3 "github.com/RafaySystems/rcloud-base/proto/types/userpb/v3" + "github.com/RafayLabs/rcloud-base/internal/models" + providers "github.com/RafayLabs/rcloud-base/internal/persistence/provider/kratos" + "github.com/RafayLabs/rcloud-base/internal/persistence/provider/pg" + "github.com/RafayLabs/rcloud-base/pkg/common" + "github.com/RafayLabs/rcloud-base/pkg/enforcer" + "github.com/RafayLabs/rcloud-base/pkg/service" + commonv3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" + rolev3 "github.com/RafayLabs/rcloud-base/proto/types/rolepb/v3" + systemv3 "github.com/RafayLabs/rcloud-base/proto/types/systempb/v3" + userv3 "github.com/RafayLabs/rcloud-base/proto/types/userpb/v3" kclient "github.com/ory/kratos-client-go" "github.com/spf13/viper" "github.com/uptrace/bun" diff --git a/server/audit_info.go b/server/audit_info.go index 5eac4dc..1d0cdc2 100644 --- a/server/audit_info.go +++ b/server/audit_info.go @@ -5,11 +5,11 @@ import ( "fmt" "strings" - "github.com/RafaySystems/rcloud-base/pkg/query" - sentryrpc "github.com/RafaySystems/rcloud-base/proto/rpc/sentry" + "github.com/RafayLabs/rcloud-base/pkg/query" + sentryrpc "github.com/RafayLabs/rcloud-base/proto/rpc/sentry" - "github.com/RafaySystems/rcloud-base/pkg/sentry/kubeconfig" - "github.com/RafaySystems/rcloud-base/pkg/service" + "github.com/RafayLabs/rcloud-base/pkg/sentry/kubeconfig" + "github.com/RafayLabs/rcloud-base/pkg/service" ) type auditInfoServer struct { diff --git a/server/auditlog.go b/server/auditlog.go index 076ecaa..024c392 100644 --- a/server/auditlog.go +++ b/server/auditlog.go @@ -3,8 +3,8 @@ package server import ( "context" - q "github.com/RafaySystems/rcloud-base/pkg/service" - v1 "github.com/RafaySystems/rcloud-base/proto/rpc/audit" + q "github.com/RafayLabs/rcloud-base/pkg/service" + v1 "github.com/RafayLabs/rcloud-base/proto/rpc/audit" ) type auditLogServer struct { diff --git a/server/bootstrap.go b/server/bootstrap.go index a15d81a..83a907d 100644 --- a/server/bootstrap.go +++ b/server/bootstrap.go @@ -5,21 +5,21 @@ import ( "database/sql" "fmt" - "github.com/RafaySystems/rcloud-base/pkg/service" + "github.com/RafayLabs/rcloud-base/pkg/service" - "github.com/RafaySystems/rcloud-base/pkg/gateway" - "github.com/RafaySystems/rcloud-base/pkg/log" - "github.com/RafaySystems/rcloud-base/pkg/query" - sentryrpc "github.com/RafaySystems/rcloud-base/proto/rpc/sentry" - commonv3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" - infrav3 "github.com/RafaySystems/rcloud-base/proto/types/infrapb/v3" - "github.com/RafaySystems/rcloud-base/proto/types/sentry" + "github.com/RafayLabs/rcloud-base/pkg/gateway" + "github.com/RafayLabs/rcloud-base/pkg/log" + "github.com/RafayLabs/rcloud-base/pkg/query" + sentryrpc "github.com/RafayLabs/rcloud-base/proto/rpc/sentry" + commonv3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" + infrav3 "github.com/RafayLabs/rcloud-base/proto/types/infrapb/v3" + "github.com/RafayLabs/rcloud-base/proto/types/sentry" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/timestamppb" - "github.com/RafaySystems/rcloud-base/pkg/sentry/cryptoutil" - "github.com/RafaySystems/rcloud-base/pkg/sentry/util" + "github.com/RafayLabs/rcloud-base/pkg/sentry/cryptoutil" + "github.com/RafayLabs/rcloud-base/pkg/sentry/util" ) var _log = log.GetLogger() diff --git a/server/cluster.go b/server/cluster.go index f5c7638..a89a1fd 100644 --- a/server/cluster.go +++ b/server/cluster.go @@ -5,14 +5,14 @@ import ( "context" "encoding/base64" - "github.com/RafaySystems/rcloud-base/internal/cluster/fixtures" - "github.com/RafaySystems/rcloud-base/pkg/common" - "github.com/RafaySystems/rcloud-base/pkg/query" - "github.com/RafaySystems/rcloud-base/pkg/service" - rpcv3 "github.com/RafaySystems/rcloud-base/proto/rpc/scheduler" - commonv3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" - v3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" - infrapbv3 "github.com/RafaySystems/rcloud-base/proto/types/infrapb/v3" + "github.com/RafayLabs/rcloud-base/internal/cluster/fixtures" + "github.com/RafayLabs/rcloud-base/pkg/common" + "github.com/RafayLabs/rcloud-base/pkg/query" + "github.com/RafayLabs/rcloud-base/pkg/service" + rpcv3 "github.com/RafayLabs/rcloud-base/proto/rpc/scheduler" + commonv3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" + v3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" + infrapbv3 "github.com/RafayLabs/rcloud-base/proto/types/infrapb/v3" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/server/cluster_authz.go b/server/cluster_authz.go index 865d23a..4ec57c4 100644 --- a/server/cluster_authz.go +++ b/server/cluster_authz.go @@ -3,10 +3,10 @@ package server import ( "context" - sentryrpc "github.com/RafaySystems/rcloud-base/proto/rpc/sentry" + sentryrpc "github.com/RafayLabs/rcloud-base/proto/rpc/sentry" - "github.com/RafaySystems/rcloud-base/pkg/sentry/authz" - "github.com/RafaySystems/rcloud-base/pkg/service" + "github.com/RafayLabs/rcloud-base/pkg/sentry/authz" + "github.com/RafayLabs/rcloud-base/pkg/service" ) type clusterAuthzServer struct { diff --git a/server/group.go b/server/group.go index 6590c0c..75265d8 100644 --- a/server/group.go +++ b/server/group.go @@ -3,10 +3,10 @@ package server import ( "context" - "github.com/RafaySystems/rcloud-base/pkg/service" - rpcv3 "github.com/RafaySystems/rcloud-base/proto/rpc/user" - v3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" - userpbv3 "github.com/RafaySystems/rcloud-base/proto/types/userpb/v3" + "github.com/RafayLabs/rcloud-base/pkg/service" + rpcv3 "github.com/RafayLabs/rcloud-base/proto/rpc/user" + v3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" + userpbv3 "github.com/RafayLabs/rcloud-base/proto/types/userpb/v3" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/server/idp.go b/server/idp.go index d58e551..c6854f0 100644 --- a/server/idp.go +++ b/server/idp.go @@ -3,9 +3,9 @@ package server import ( "context" - "github.com/RafaySystems/rcloud-base/pkg/service" - rpcv3 "github.com/RafaySystems/rcloud-base/proto/rpc/system" - systemv3 "github.com/RafaySystems/rcloud-base/proto/types/systempb/v3" + "github.com/RafayLabs/rcloud-base/pkg/service" + rpcv3 "github.com/RafayLabs/rcloud-base/proto/rpc/system" + systemv3 "github.com/RafayLabs/rcloud-base/proto/types/systempb/v3" "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/server/kubeconfig.go b/server/kubeconfig.go index 6b17cf9..8d7bec4 100644 --- a/server/kubeconfig.go +++ b/server/kubeconfig.go @@ -6,15 +6,15 @@ import ( "sort" "time" - "github.com/RafaySystems/rcloud-base/internal/constants" - "github.com/RafaySystems/rcloud-base/pkg/query" - "github.com/RafaySystems/rcloud-base/pkg/sentry/cryptoutil" - "github.com/RafaySystems/rcloud-base/pkg/sentry/kubeconfig" - "github.com/RafaySystems/rcloud-base/pkg/sentry/util" - "github.com/RafaySystems/rcloud-base/pkg/service" - sentryrpc "github.com/RafaySystems/rcloud-base/proto/rpc/sentry" - commonv3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" - sentry "github.com/RafaySystems/rcloud-base/proto/types/sentry" + "github.com/RafayLabs/rcloud-base/internal/constants" + "github.com/RafayLabs/rcloud-base/pkg/query" + "github.com/RafayLabs/rcloud-base/pkg/sentry/cryptoutil" + "github.com/RafayLabs/rcloud-base/pkg/sentry/kubeconfig" + "github.com/RafayLabs/rcloud-base/pkg/sentry/util" + "github.com/RafayLabs/rcloud-base/pkg/service" + sentryrpc "github.com/RafayLabs/rcloud-base/proto/rpc/sentry" + commonv3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" + sentry "github.com/RafayLabs/rcloud-base/proto/types/sentry" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/server/kubectl_cluster_settings.go b/server/kubectl_cluster_settings.go index 78ba18b..7dfea8f 100644 --- a/server/kubectl_cluster_settings.go +++ b/server/kubectl_cluster_settings.go @@ -3,11 +3,11 @@ package server import ( "context" - "github.com/RafaySystems/rcloud-base/internal/constants" - "github.com/RafaySystems/rcloud-base/pkg/sentry/util" - "github.com/RafaySystems/rcloud-base/pkg/service" - sentryrpc "github.com/RafaySystems/rcloud-base/proto/rpc/sentry" - "github.com/RafaySystems/rcloud-base/proto/types/sentry" + "github.com/RafayLabs/rcloud-base/internal/constants" + "github.com/RafayLabs/rcloud-base/pkg/sentry/util" + "github.com/RafayLabs/rcloud-base/pkg/service" + sentryrpc "github.com/RafayLabs/rcloud-base/proto/rpc/sentry" + "github.com/RafayLabs/rcloud-base/proto/types/sentry" "google.golang.org/grpc/metadata" ) diff --git a/server/metro.go b/server/metro.go index 5ba5996..a5a8e73 100644 --- a/server/metro.go +++ b/server/metro.go @@ -3,9 +3,9 @@ package server import ( "context" - "github.com/RafaySystems/rcloud-base/pkg/service" - systemrpc "github.com/RafaySystems/rcloud-base/proto/rpc/system" - infrav3 "github.com/RafaySystems/rcloud-base/proto/types/infrapb/v3" + "github.com/RafayLabs/rcloud-base/pkg/service" + systemrpc "github.com/RafayLabs/rcloud-base/proto/rpc/system" + infrav3 "github.com/RafayLabs/rcloud-base/proto/types/infrapb/v3" "github.com/google/uuid" ) diff --git a/server/oidc_provider.go b/server/oidc_provider.go index 4b396cd..8c7a69f 100644 --- a/server/oidc_provider.go +++ b/server/oidc_provider.go @@ -3,9 +3,9 @@ package server import ( "context" - "github.com/RafaySystems/rcloud-base/pkg/service" - rpcv3 "github.com/RafaySystems/rcloud-base/proto/rpc/system" - systemv3 "github.com/RafaySystems/rcloud-base/proto/types/systempb/v3" + "github.com/RafayLabs/rcloud-base/pkg/service" + rpcv3 "github.com/RafayLabs/rcloud-base/proto/rpc/system" + systemv3 "github.com/RafayLabs/rcloud-base/proto/types/systempb/v3" "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/server/organization.go b/server/organization.go index 7885464..9da74de 100644 --- a/server/organization.go +++ b/server/organization.go @@ -3,10 +3,10 @@ package server import ( "context" - "github.com/RafaySystems/rcloud-base/pkg/service" - systemrpc "github.com/RafaySystems/rcloud-base/proto/rpc/system" - v3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" - systempbv3 "github.com/RafaySystems/rcloud-base/proto/types/systempb/v3" + "github.com/RafayLabs/rcloud-base/pkg/service" + systemrpc "github.com/RafayLabs/rcloud-base/proto/rpc/system" + v3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" + systempbv3 "github.com/RafayLabs/rcloud-base/proto/types/systempb/v3" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/server/partner.go b/server/partner.go index a6c649f..2876635 100644 --- a/server/partner.go +++ b/server/partner.go @@ -3,10 +3,10 @@ package server import ( "context" - "github.com/RafaySystems/rcloud-base/pkg/service" - systemrpc "github.com/RafaySystems/rcloud-base/proto/rpc/system" - v3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" - systempbv3 "github.com/RafaySystems/rcloud-base/proto/types/systempb/v3" + "github.com/RafayLabs/rcloud-base/pkg/service" + systemrpc "github.com/RafayLabs/rcloud-base/proto/rpc/system" + v3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" + systempbv3 "github.com/RafayLabs/rcloud-base/proto/types/systempb/v3" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/server/project.go b/server/project.go index 3835067..e0a19f8 100644 --- a/server/project.go +++ b/server/project.go @@ -3,10 +3,10 @@ package server import ( "context" - "github.com/RafaySystems/rcloud-base/pkg/service" - systemrpc "github.com/RafaySystems/rcloud-base/proto/rpc/system" - v3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" - systempbv3 "github.com/RafaySystems/rcloud-base/proto/types/systempb/v3" + "github.com/RafayLabs/rcloud-base/pkg/service" + systemrpc "github.com/RafayLabs/rcloud-base/proto/rpc/system" + v3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" + systempbv3 "github.com/RafayLabs/rcloud-base/proto/types/systempb/v3" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/server/relayaudit.go b/server/relayaudit.go index cacb011..c84d54a 100644 --- a/server/relayaudit.go +++ b/server/relayaudit.go @@ -3,9 +3,9 @@ package server import ( "context" "encoding/json" - ec "github.com/RafaySystems/rcloud-base/pkg/common" - q "github.com/RafaySystems/rcloud-base/pkg/service" - v1 "github.com/RafaySystems/rcloud-base/proto/rpc/audit" + ec "github.com/RafayLabs/rcloud-base/pkg/common" + q "github.com/RafayLabs/rcloud-base/pkg/service" + v1 "github.com/RafayLabs/rcloud-base/proto/rpc/audit" ) type relayAuditServer struct { diff --git a/server/relaypeerclient.go b/server/relaypeerclient.go index 66d2000..99c11ff 100644 --- a/server/relaypeerclient.go +++ b/server/relaypeerclient.go @@ -10,7 +10,7 @@ import ( "regexp" "time" - relayrpc "github.com/RafaySystems/rcloud-base/proto/rpc/sentry" + relayrpc "github.com/RafayLabs/rcloud-base/proto/rpc/sentry" "github.com/dgraph-io/ristretto" ) diff --git a/server/relaypeerservice.go b/server/relaypeerservice.go index 6cb5f0e..5a813fe 100644 --- a/server/relaypeerservice.go +++ b/server/relaypeerservice.go @@ -7,8 +7,8 @@ import ( "sync" "time" - "github.com/RafaySystems/rcloud-base/pkg/grpc" - sentryrpc "github.com/RafaySystems/rcloud-base/proto/rpc/sentry" + "github.com/RafayLabs/rcloud-base/pkg/grpc" + sentryrpc "github.com/RafayLabs/rcloud-base/proto/rpc/sentry" "github.com/dgraph-io/ristretto" "github.com/google/uuid" ) diff --git a/server/relaypeerservice_test.go b/server/relaypeerservice_test.go index a47f7b5..1ac4299 100644 --- a/server/relaypeerservice_test.go +++ b/server/relaypeerservice_test.go @@ -11,9 +11,9 @@ import ( "testing" "time" - "github.com/RafaySystems/rcloud-base/pkg/grpc" - "github.com/RafaySystems/rcloud-base/pkg/sentry/peering" - relayrpc "github.com/RafaySystems/rcloud-base/proto/rpc/sentry" + "github.com/RafayLabs/rcloud-base/pkg/grpc" + "github.com/RafayLabs/rcloud-base/pkg/sentry/peering" + relayrpc "github.com/RafayLabs/rcloud-base/proto/rpc/sentry" "github.com/google/uuid" "google.golang.org/grpc/credentials" ) diff --git a/server/role.go b/server/role.go index e8fd8f0..a9e5761 100644 --- a/server/role.go +++ b/server/role.go @@ -3,10 +3,10 @@ package server import ( "context" - "github.com/RafaySystems/rcloud-base/pkg/service" - rpcv3 "github.com/RafaySystems/rcloud-base/proto/rpc/role" - v3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" - rolepbv3 "github.com/RafaySystems/rcloud-base/proto/types/rolepb/v3" + "github.com/RafayLabs/rcloud-base/pkg/service" + rpcv3 "github.com/RafayLabs/rcloud-base/proto/rpc/role" + v3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" + rolepbv3 "github.com/RafayLabs/rcloud-base/proto/types/rolepb/v3" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/server/rolepermission.go b/server/rolepermission.go index a065027..3f6f905 100644 --- a/server/rolepermission.go +++ b/server/rolepermission.go @@ -3,9 +3,9 @@ package server import ( "context" - "github.com/RafaySystems/rcloud-base/pkg/service" - rpcv3 "github.com/RafaySystems/rcloud-base/proto/rpc/role" - rolepbv3 "github.com/RafaySystems/rcloud-base/proto/types/rolepb/v3" + "github.com/RafayLabs/rcloud-base/pkg/service" + rpcv3 "github.com/RafayLabs/rcloud-base/proto/rpc/role" + rolepbv3 "github.com/RafayLabs/rcloud-base/proto/types/rolepb/v3" ) type rolepermissionServer struct { diff --git a/server/user.go b/server/user.go index 845494f..b83d674 100644 --- a/server/user.go +++ b/server/user.go @@ -5,12 +5,12 @@ import ( "encoding/json" "fmt" - authv3 "github.com/RafaySystems/rcloud-base/pkg/auth/v3" - "github.com/RafaySystems/rcloud-base/pkg/service" - rpcv3 "github.com/RafaySystems/rcloud-base/proto/rpc/user" - commonv3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" - v3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" - userpbv3 "github.com/RafaySystems/rcloud-base/proto/types/userpb/v3" + authv3 "github.com/RafayLabs/rcloud-base/pkg/auth/v3" + "github.com/RafayLabs/rcloud-base/pkg/service" + rpcv3 "github.com/RafayLabs/rcloud-base/proto/rpc/user" + commonv3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" + v3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" + userpbv3 "github.com/RafayLabs/rcloud-base/proto/types/userpb/v3" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/server/utils.go b/server/utils.go index 98b2e15..e39f06c 100644 --- a/server/utils.go +++ b/server/utils.go @@ -1,7 +1,7 @@ package server import ( - v3 "github.com/RafaySystems/rcloud-base/proto/types/commonpb/v3" + v3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" "google.golang.org/protobuf/types/known/timestamppb" )