Merge pull request #81 from RafayLabs/restructure-fs

Code restructuring
2026-08-24 15:47:19 +00:00 · 2022-03-24 16:23:08 +05:30
parent e712a1d9e0 fb4fa3781c
commit 40cceb7896
214 changed files with 721 additions and 727 deletions
@@ -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 ./...

@@ -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"
@@ -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
@@ -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
 ```
@@ -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"
 )
@@ -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.
@@ -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.
@@ -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,
@@ -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.
@@ -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.
@@ -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.
@@ -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.
@@ -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.
@@ -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.
@@ -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.
@@ -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.
@@ -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,
@@ -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.
@@ -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,
@@ -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.
@@ -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.
@@ -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,
@@ -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.
@@ -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.
@@ -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.
@@ -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,
@@ -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.
@@ -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.
@@ -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
@@ -1,4 +1,4 @@
-module github.com/RafaySystems/rcloud-base
+module github.com/RafayLabs/rcloud-base

 go 1.17

@@ -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()
@@ -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 (
@@ -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"
 )

@@ -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
@@ -5,10 +5,10 @@ import (
 	"strings"
 	"time"

-	"github.com/RafaySystems/rcloud-base/internal/cluster/constants"
-	"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/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"
 )
@@ -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
 	}
@@ -3,9 +3,9 @@ package dao
 import (
 	"context"

-	"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/RafayLabs/rcloud-base/internal/dao"
+	"github.com/RafayLabs/rcloud-base/internal/models"
+	"github.com/RafayLabs/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
@@ -4,9 +4,9 @@ import (
 	"context"
 	"errors"

-	"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/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"
 )
@@ -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
 	}
@@ -4,11 +4,11 @@ import (
 	"context"
 	"time"

-	"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"
+	"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"
 )
@@ -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
 }

@@ -3,16 +3,16 @@ package dao
 import (
 	"context"

-	"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/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"
 )

 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
@@ -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 {
@@ -6,12 +6,11 @@ import (
 	"fmt"
 	"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"
-	"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"
 )
@@ -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
 	}
@@ -1,4 +1,4 @@
-package pg
+package dao

 import (
 	"context"
@@ -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"
 )
@@ -4,9 +4,8 @@ import (
 	"context"
 	"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/RafayLabs/rcloud-base/internal/models"
+	"github.com/RafayLabs/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
 }

@@ -1,10 +1,10 @@
-package pg
+package dao

 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"
 )
@@ -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"
 )
@@ -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"
 )
@@ -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"
 )
@@ -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"
 )

@@ -12,26 +12,26 @@ import (
 	"sync"
 	"time"

-	"github.com/RafaySystems/rcloud-base/internal/fixtures"
-	providers "github.com/RafaySystems/rcloud-base/internal/persistence/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"
@@ -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"
 )
@@ -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"
 )
@@ -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"
@@ -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"
 )
@@ -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"

@@ -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"
 )

@@ -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{}
@@ -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"
@@ -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"
 )
@@ -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"
@@ -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"
 )
@@ -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) {
@@ -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"
@@ -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 (
@@ -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"
 )
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
 )

@@ -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"
@@ -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"
@@ -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 (
@@ -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"
@@ -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"
 )
@@ -3,7 +3,7 @@ package event
 import (
 	"sync"

-	"github.com/RafaySystems/rcloud-base/pkg/log"
+	"github.com/RafayLabs/rcloud-base/pkg/log"
 )

 const (
@@ -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"
 )

@@ -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"
 )

@@ -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"
 )

@@ -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"
 )

@@ -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) {
@@ -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"
 )
@@ -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"
 )

@@ -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 (
@@ -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 {
@@ -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"
 )

@@ -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"
@@ -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()
@@ -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"
 )
@@ -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"
 )

@@ -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 {
@@ -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"
 )
@@ -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 (
@@ -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"
 )
@@ -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 (
@@ -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"
@@ -5,10 +5,10 @@ import (
 	"database/sql"
 	"time"

-	"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/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"
@@ -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
 	}
@@ -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"
 )

@@ -4,9 +4,9 @@ import (
 	"context"
 	"fmt"

-	"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/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"
@@ -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
 	}
--- a/Show More
+++ b/Show More