Merge pull request #931 from stacklok/db-internal

Move database golang code to `internal` package
mindersec · Sep 11, 2023 · fcb94e3 · fcb94e3
2 parents eb75023 + 6c63fd5
commit fcb94e3
Show file tree

Hide file tree

Showing 69 changed files with 47 additions and 48 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -9,7 +9,7 @@
 /docs/docs/db/schema.md linguist-generated=true
 /docs/docs/protodocs/proto.md linguist-generated=true
 /pkg/generated/** linguist-generated=true
-/pkg/db/db.go linguist-generated=true
-/pkg/db/models.go linguist-generated=true
-/pkg/db/querier.go linguist-generated=true
-/pkg/db/*.sql.go linguist-generated=true
+/internal/db/db.go linguist-generated=true
+/internal/db/models.go linguist-generated=true
+/internal/db/querier.go linguist-generated=true
+/internal/db/*.sql.go linguist-generated=true
diff --git a/.github/workflows/license-check.yml b/.github/workflows/license-check.yml
@@ -15,5 +15,5 @@ jobs:
       - name: Check license headers
         run: |
           set -e
-          addlicense -l apache -c 'Stacklok, Inc' -v -ignore "pkg/generated/*" -ignore "**/database/query/**" -ignore "pkg/db/*" -ignore "docs/docs/**" -ignore "docs/src/**" -ignore "docs/static/**" -ignore "pkg/controlplane/policy_types/**" -ignore "docs/build/**" -ignore "examples/**" *
+          addlicense -l apache -c 'Stacklok, Inc' -v -ignore "pkg/generated/*" -ignore "**/database/query/**" -ignore "internal/db/*" -ignore "docs/docs/**" -ignore "docs/src/**" -ignore "docs/static/**" -ignore "pkg/controlplane/policy_types/**" -ignore "docs/build/**" -ignore "examples/**" *
           git diff --exit-code
diff --git a/Makefile b/Makefile
@@ -137,4 +137,4 @@ dbschema:	## generate database schema with schema spy, monitor file until doc is
 	cd database/schema && $(COMPOSE) down -v && rm -rf output
 
 mock:
-	mockgen -package mockdb -destination database/mock/store.go github.com/stacklok/mediator/pkg/db Store
+	mockgen -package mockdb -destination database/mock/store.go github.com/stacklok/mediator/internal/db Store
diff --git a/README.md b/README.md
@@ -162,7 +162,7 @@ Mediator uses [mockgen](https://github.com/golang/mock) to generate mocks.
 To generate the mocks, run:
 
 ```bash
-mockgen -package mockdb -destination database/mock/store.go github.com/stacklok/mediator/pkg/db Store
+mockgen -package mockdb -destination database/mock/store.go github.com/stacklok/mediator/internal/db Store
 ```
 
 # Configuration

diff --git a/cmd/server/app/serve.go b/cmd/server/app/serve.go
@@ -27,12 +27,12 @@ import (
 	"golang.org/x/sync/errgroup"
 
 	"github.com/stacklok/mediator/internal/config"
+	"github.com/stacklok/mediator/internal/db"
 	"github.com/stacklok/mediator/internal/engine"
 	"github.com/stacklok/mediator/internal/events"
 	"github.com/stacklok/mediator/internal/logger"
 	"github.com/stacklok/mediator/internal/reconcilers"
 	"github.com/stacklok/mediator/pkg/controlplane"
-	"github.com/stacklok/mediator/pkg/db"
 )
 
 var serveCmd = &cobra.Command{

diff --git a/database/mock/store.go b/database/mock/store.go
diff --git a/pkg/db/artifact_versions.sql.go → internal/db/artifact_versions.sql.go b/pkg/db/artifact_versions.sql.go → internal/db/artifact_versions.sql.go
diff --git a/pkg/db/artifacts.sql.go → internal/db/artifacts.sql.go b/pkg/db/artifacts.sql.go → internal/db/artifacts.sql.go
diff --git a/pkg/db/db.go → internal/db/db.go b/pkg/db/db.go → internal/db/db.go
diff --git a/pkg/db/groups.sql.go → internal/db/groups.sql.go b/pkg/db/groups.sql.go → internal/db/groups.sql.go
diff --git a/pkg/db/groups_test.go → internal/db/groups_test.go b/pkg/db/groups_test.go → internal/db/groups_test.go
diff --git a/pkg/db/main_test.go → internal/db/main_test.go b/pkg/db/main_test.go → internal/db/main_test.go
diff --git a/pkg/db/models.go → internal/db/models.go b/pkg/db/models.go → internal/db/models.go
diff --git a/pkg/db/organizations.sql.go → internal/db/organizations.sql.go b/pkg/db/organizations.sql.go → internal/db/organizations.sql.go
diff --git a/pkg/db/organizations_test.go → internal/db/organizations_test.go b/pkg/db/organizations_test.go → internal/db/organizations_test.go
diff --git a/pkg/db/policies.sql.go → internal/db/policies.sql.go b/pkg/db/policies.sql.go → internal/db/policies.sql.go
diff --git a/pkg/db/policy_status.sql.go → internal/db/policy_status.sql.go b/pkg/db/policy_status.sql.go → internal/db/policy_status.sql.go
diff --git a/pkg/db/projects.sql.go → internal/db/projects.sql.go b/pkg/db/projects.sql.go → internal/db/projects.sql.go
diff --git a/pkg/db/projects_test.go → internal/db/projects_test.go b/pkg/db/projects_test.go → internal/db/projects_test.go
diff --git a/pkg/db/provider_access_tokens.sql.go → internal/db/provider_access_tokens.sql.go b/pkg/db/provider_access_tokens.sql.go → internal/db/provider_access_tokens.sql.go
diff --git a/pkg/db/querier.go → internal/db/querier.go b/pkg/db/querier.go → internal/db/querier.go
diff --git a/pkg/db/repositories.sql.go → internal/db/repositories.sql.go b/pkg/db/repositories.sql.go → internal/db/repositories.sql.go
diff --git a/pkg/db/repositories_test.go → internal/db/repositories_test.go b/pkg/db/repositories_test.go → internal/db/repositories_test.go
diff --git a/pkg/db/roles.sql.go → internal/db/roles.sql.go b/pkg/db/roles.sql.go → internal/db/roles.sql.go
diff --git a/pkg/db/roles_test.go → internal/db/roles_test.go b/pkg/db/roles_test.go → internal/db/roles_test.go
diff --git a/pkg/db/rule_types.sql.go → internal/db/rule_types.sql.go b/pkg/db/rule_types.sql.go → internal/db/rule_types.sql.go
diff --git a/pkg/db/session_store.sql.go → internal/db/session_store.sql.go b/pkg/db/session_store.sql.go → internal/db/session_store.sql.go
diff --git a/pkg/db/signing_keys.sql.go → internal/db/signing_keys.sql.go b/pkg/db/signing_keys.sql.go → internal/db/signing_keys.sql.go
diff --git a/pkg/db/store.go → internal/db/store.go b/pkg/db/store.go → internal/db/store.go
diff --git a/pkg/db/user_groups.sql.go → internal/db/user_groups.sql.go b/pkg/db/user_groups.sql.go → internal/db/user_groups.sql.go
diff --git a/pkg/db/user_roles.sql.go → internal/db/user_roles.sql.go b/pkg/db/user_roles.sql.go → internal/db/user_roles.sql.go
diff --git a/pkg/db/users.sql.go → internal/db/users.sql.go b/pkg/db/users.sql.go → internal/db/users.sql.go
diff --git a/pkg/db/users_test.go → internal/db/users_test.go b/pkg/db/users_test.go → internal/db/users_test.go
diff --git a/internal/engine/context.go b/internal/engine/context.go
@@ -18,7 +18,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/stacklok/mediator/pkg/db"
+	"github.com/stacklok/mediator/internal/db"
 	pb "github.com/stacklok/mediator/pkg/generated/protobuf/go/mediator/v1"
 )
 

diff --git a/internal/engine/eval_status.go b/internal/engine/eval_status.go
@@ -21,8 +21,8 @@ import (
 	"fmt"
 	"log"
 
+	"github.com/stacklok/mediator/internal/db"
 	evalerrors "github.com/stacklok/mediator/internal/engine/errors"
-	"github.com/stacklok/mediator/pkg/db"
 )
 
 // createOrUpdateEvalStatusParams is a helper struct to pass parameters to createOrUpdateEvalStatus

diff --git a/internal/engine/executor.go b/internal/engine/executor.go
@@ -22,8 +22,8 @@ import (
 	"github.com/ThreeDotsLabs/watermill/message"
 	"github.com/rs/zerolog"
 
+	"github.com/stacklok/mediator/internal/db"
 	"github.com/stacklok/mediator/internal/events"
-	"github.com/stacklok/mediator/pkg/db"
 	pb "github.com/stacklok/mediator/pkg/generated/protobuf/go/mediator/v1"
 	"github.com/stacklok/mediator/pkg/providers"
 	ghclient "github.com/stacklok/mediator/pkg/providers/github"

diff --git a/internal/engine/executor_test.go b/internal/engine/executor_test.go
@@ -28,9 +28,9 @@ import (
 	"google.golang.org/protobuf/types/known/structpb"
 
 	mockdb "github.com/stacklok/mediator/database/mock"
+	"github.com/stacklok/mediator/internal/db"
 	"github.com/stacklok/mediator/internal/engine"
 	"github.com/stacklok/mediator/pkg/crypto"
-	"github.com/stacklok/mediator/pkg/db"
 	"github.com/stacklok/mediator/pkg/entities"
 	pb "github.com/stacklok/mediator/pkg/generated/protobuf/go/mediator/v1"
 )

diff --git a/internal/engine/pipeline_policy.go b/internal/engine/pipeline_policy.go
@@ -24,8 +24,8 @@ import (
 	"os"
 	"path/filepath"
 
+	"github.com/stacklok/mediator/internal/db"
 	"github.com/stacklok/mediator/internal/util"
-	"github.com/stacklok/mediator/pkg/db"
 	"github.com/stacklok/mediator/pkg/entities"
 	pb "github.com/stacklok/mediator/pkg/generated/protobuf/go/mediator/v1"
 )

diff --git a/internal/engine/rule_types.go b/internal/engine/rule_types.go
@@ -29,11 +29,11 @@ import (
 	"google.golang.org/protobuf/reflect/protoreflect"
 	"google.golang.org/protobuf/types/known/structpb"
 
+	"github.com/stacklok/mediator/internal/db"
 	"github.com/stacklok/mediator/internal/engine/eval"
 	"github.com/stacklok/mediator/internal/engine/ingester"
 	engif "github.com/stacklok/mediator/internal/engine/interfaces"
 	"github.com/stacklok/mediator/internal/util"
-	"github.com/stacklok/mediator/pkg/db"
 	"github.com/stacklok/mediator/pkg/entities"
 	pb "github.com/stacklok/mediator/pkg/generated/protobuf/go/mediator/v1"
 	ghclient "github.com/stacklok/mediator/pkg/providers/github"

diff --git a/internal/gh/queries/sync_repo_db.go b/internal/gh/queries/sync_repo_db.go
@@ -21,7 +21,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/stacklok/mediator/pkg/db"
+	"github.com/stacklok/mediator/internal/db"
 	ghclient "github.com/stacklok/mediator/pkg/providers/github"
 )
 

diff --git a/internal/reconcilers/artifacts.go b/internal/reconcilers/artifacts.go
@@ -31,9 +31,9 @@ import (
 	"google.golang.org/protobuf/encoding/protojson"
 	"google.golang.org/protobuf/types/known/timestamppb"
 
+	"github.com/stacklok/mediator/internal/db"
 	"github.com/stacklok/mediator/internal/engine"
 	"github.com/stacklok/mediator/pkg/container"
-	"github.com/stacklok/mediator/pkg/db"
 	pb "github.com/stacklok/mediator/pkg/generated/protobuf/go/mediator/v1"
 	"github.com/stacklok/mediator/pkg/providers"
 	ghclient "github.com/stacklok/mediator/pkg/providers/github"

diff --git a/internal/reconcilers/reconcilers.go b/internal/reconcilers/reconcilers.go
@@ -17,8 +17,8 @@
 package reconcilers
 
 import (
+	"github.com/stacklok/mediator/internal/db"
 	"github.com/stacklok/mediator/internal/events"
-	"github.com/stacklok/mediator/pkg/db"
 )
 
 const (

diff --git a/internal/reconcilers/run_policy.go b/internal/reconcilers/run_policy.go
@@ -29,8 +29,8 @@ import (
 	"google.golang.org/protobuf/encoding/protojson"
 	"google.golang.org/protobuf/types/known/timestamppb"
 
+	"github.com/stacklok/mediator/internal/db"
 	"github.com/stacklok/mediator/internal/engine"
-	"github.com/stacklok/mediator/pkg/db"
 	pb "github.com/stacklok/mediator/pkg/generated/protobuf/go/mediator/v1"
 	ghclient "github.com/stacklok/mediator/pkg/providers/github"
 )

diff --git a/pkg/auth/jwauth_test.go b/pkg/auth/jwauth_test.go
@@ -31,8 +31,8 @@ import (
 	"github.com/golang/mock/gomock"
 
 	mockdb "github.com/stacklok/mediator/database/mock"
+	"github.com/stacklok/mediator/internal/db"
 	"github.com/stacklok/mediator/internal/util"
-	"github.com/stacklok/mediator/pkg/db"
 )
 
 const (

diff --git a/pkg/auth/jwtauth.go b/pkg/auth/jwtauth.go
@@ -35,7 +35,7 @@ import (
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 
-	"github.com/stacklok/mediator/pkg/db"
+	"github.com/stacklok/mediator/internal/db"
 )
 
 // RoleInfo contains the role information for a user

diff --git a/pkg/controlplane/handlers_artifacts.go b/pkg/controlplane/handlers_artifacts.go
@@ -25,8 +25,8 @@ import (
 	"google.golang.org/protobuf/encoding/protojson"
 	"google.golang.org/protobuf/types/known/timestamppb"
 
+	"github.com/stacklok/mediator/internal/db"
 	"github.com/stacklok/mediator/pkg/auth"
-	"github.com/stacklok/mediator/pkg/db"
 	pb "github.com/stacklok/mediator/pkg/generated/protobuf/go/mediator/v1"
 )
 

diff --git a/pkg/controlplane/handlers_auth.go b/pkg/controlplane/handlers_auth.go
@@ -29,9 +29,9 @@ import (
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/grpc/status"
 
+	"github.com/stacklok/mediator/internal/db"
 	"github.com/stacklok/mediator/pkg/auth"
 	mcrypto "github.com/stacklok/mediator/pkg/crypto"
-	"github.com/stacklok/mediator/pkg/db"
 	pb "github.com/stacklok/mediator/pkg/generated/protobuf/go/mediator/v1"
 )
 

diff --git a/pkg/controlplane/handlers_auth_test.go b/pkg/controlplane/handlers_auth_test.go
@@ -29,10 +29,10 @@ import (
 
 	mockdb "github.com/stacklok/mediator/database/mock"
 	"github.com/stacklok/mediator/internal/config"
+	"github.com/stacklok/mediator/internal/db"
 	"github.com/stacklok/mediator/internal/util"
 	"github.com/stacklok/mediator/pkg/auth"
 	mcrypto "github.com/stacklok/mediator/pkg/crypto"
-	"github.com/stacklok/mediator/pkg/db"
 	pb "github.com/stacklok/mediator/pkg/generated/protobuf/go/mediator/v1"
 )
 

diff --git a/pkg/controlplane/handlers_authz.go b/pkg/controlplane/handlers_authz.go
@@ -29,9 +29,9 @@ import (
 	"google.golang.org/grpc/status"
 	"k8s.io/apimachinery/pkg/util/sets"
 
+	"github.com/stacklok/mediator/internal/db"
 	"github.com/stacklok/mediator/internal/util"
 	"github.com/stacklok/mediator/pkg/auth"
-	"github.com/stacklok/mediator/pkg/db"
 	github "github.com/stacklok/mediator/pkg/providers/github"
 )
 

diff --git a/pkg/controlplane/handlers_githubwebhooks.go b/pkg/controlplane/handlers_githubwebhooks.go
@@ -45,11 +45,10 @@ import (
 	"google.golang.org/protobuf/encoding/protojson"
 	"google.golang.org/protobuf/types/known/timestamppb"
 
+	"github.com/stacklok/mediator/internal/db"
 	"github.com/stacklok/mediator/internal/engine"
 	"github.com/stacklok/mediator/internal/util"
-	// TODO(jaosorior): This should be moved to the provider package
 	"github.com/stacklok/mediator/pkg/container"
-	"github.com/stacklok/mediator/pkg/db"
 	pb "github.com/stacklok/mediator/pkg/generated/protobuf/go/mediator/v1"
 	"github.com/stacklok/mediator/pkg/providers"
 	ghclient "github.com/stacklok/mediator/pkg/providers/github"

diff --git a/pkg/controlplane/handlers_githubwebhooks_test.go b/pkg/controlplane/handlers_githubwebhooks_test.go
@@ -40,9 +40,9 @@ import (
 	"golang.org/x/oauth2"
 
 	mockdb "github.com/stacklok/mediator/database/mock"
+	"github.com/stacklok/mediator/internal/db"
 	"github.com/stacklok/mediator/internal/engine"
 	"github.com/stacklok/mediator/internal/util"
-	"github.com/stacklok/mediator/pkg/db"
 )
 
 // MockClient is a mock implementation of the GitHub client.

diff --git a/pkg/controlplane/handlers_groups.go b/pkg/controlplane/handlers_groups.go
@@ -24,7 +24,7 @@ import (
 	"google.golang.org/grpc/status"
 	"google.golang.org/protobuf/types/known/timestamppb"
 
-	"github.com/stacklok/mediator/pkg/db"
+	"github.com/stacklok/mediator/internal/db"
 	pb "github.com/stacklok/mediator/pkg/generated/protobuf/go/mediator/v1"
 )
 

diff --git a/pkg/controlplane/handlers_groups_test.go b/pkg/controlplane/handlers_groups_test.go
@@ -27,8 +27,8 @@ import (
 	"google.golang.org/protobuf/types/known/timestamppb"
 
 	mockdb "github.com/stacklok/mediator/database/mock"
+	"github.com/stacklok/mediator/internal/db"
 	"github.com/stacklok/mediator/pkg/auth"
-	"github.com/stacklok/mediator/pkg/db"
 	pb "github.com/stacklok/mediator/pkg/generated/protobuf/go/mediator/v1"
 )
 

diff --git a/pkg/controlplane/handlers_keys.go b/pkg/controlplane/handlers_keys.go
@@ -19,13 +19,13 @@ import (
 	// "database/sql"
 	"encoding/base64"
 
-	// "github.com/stacklok/mediator/pkg/db"
+	// "github.com/stacklok/mediator/internal/db"
 	"github.com/google/uuid"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 
+	"github.com/stacklok/mediator/internal/db"
 	mcrypto "github.com/stacklok/mediator/pkg/crypto"
-	"github.com/stacklok/mediator/pkg/db"
 	pb "github.com/stacklok/mediator/pkg/generated/protobuf/go/mediator/v1"
 )
 

diff --git a/pkg/controlplane/handlers_keys_test.go b/pkg/controlplane/handlers_keys_test.go
@@ -25,8 +25,8 @@ import (
 
 	mockdb "github.com/stacklok/mediator/database/mock"
 	"github.com/stacklok/mediator/internal/config"
+	"github.com/stacklok/mediator/internal/db"
 	"github.com/stacklok/mediator/pkg/auth"
-	"github.com/stacklok/mediator/pkg/db"
 	pb "github.com/stacklok/mediator/pkg/generated/protobuf/go/mediator/v1"
 )
 

diff --git a/pkg/controlplane/handlers_oauth.go b/pkg/controlplane/handlers_oauth.go
@@ -31,9 +31,9 @@ import (
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 
+	"github.com/stacklok/mediator/internal/db"
 	"github.com/stacklok/mediator/pkg/auth"
 	mcrypto "github.com/stacklok/mediator/pkg/crypto"
-	"github.com/stacklok/mediator/pkg/db"
 	pb "github.com/stacklok/mediator/pkg/generated/protobuf/go/mediator/v1"
 	ghclient "github.com/stacklok/mediator/pkg/providers/github"
 )

diff --git a/pkg/controlplane/handlers_oauth_test.go b/pkg/controlplane/handlers_oauth_test.go
@@ -26,8 +26,8 @@ import (
 	"google.golang.org/grpc/codes"
 
 	mockdb "github.com/stacklok/mediator/database/mock"
+	"github.com/stacklok/mediator/internal/db"
 	"github.com/stacklok/mediator/pkg/auth"
-	"github.com/stacklok/mediator/pkg/db"
 	pb "github.com/stacklok/mediator/pkg/generated/protobuf/go/mediator/v1"
 	ghclient "github.com/stacklok/mediator/pkg/providers/github"
 )

diff --git a/pkg/controlplane/handlers_organization.go b/pkg/controlplane/handlers_organization.go
@@ -26,9 +26,9 @@ import (
 	"google.golang.org/grpc/status"
 	"google.golang.org/protobuf/types/known/timestamppb"
 
+	"github.com/stacklok/mediator/internal/db"
 	"github.com/stacklok/mediator/internal/util"
 	mcrypto "github.com/stacklok/mediator/pkg/crypto"
-	"github.com/stacklok/mediator/pkg/db"
 	pb "github.com/stacklok/mediator/pkg/generated/protobuf/go/mediator/v1"
 )
 

diff --git a/pkg/controlplane/handlers_organization_test.go b/pkg/controlplane/handlers_organization_test.go
@@ -27,8 +27,8 @@ import (
 	"google.golang.org/protobuf/types/known/timestamppb"
 
 	mockdb "github.com/stacklok/mediator/database/mock"
+	"github.com/stacklok/mediator/internal/db"
 	"github.com/stacklok/mediator/pkg/auth"
-	"github.com/stacklok/mediator/pkg/db"
 	pb "github.com/stacklok/mediator/pkg/generated/protobuf/go/mediator/v1"
 )
 

diff --git a/pkg/controlplane/handlers_policy.go b/pkg/controlplane/handlers_policy.go
@@ -26,11 +26,11 @@ import (
 	"google.golang.org/grpc/status"
 	"google.golang.org/protobuf/types/known/timestamppb"
 
+	"github.com/stacklok/mediator/internal/db"
 	"github.com/stacklok/mediator/internal/engine"
 	"github.com/stacklok/mediator/internal/reconcilers"
 	"github.com/stacklok/mediator/internal/util"
 	"github.com/stacklok/mediator/pkg/auth"
-	"github.com/stacklok/mediator/pkg/db"
 	"github.com/stacklok/mediator/pkg/entities"
 	pb "github.com/stacklok/mediator/pkg/generated/protobuf/go/mediator/v1"
 	ghclient "github.com/stacklok/mediator/pkg/providers/github"

diff --git a/pkg/controlplane/handlers_repositories.go b/pkg/controlplane/handlers_repositories.go
@@ -25,10 +25,10 @@ import (
 	"google.golang.org/grpc/status"
 	"google.golang.org/protobuf/types/known/timestamppb"
 
+	"github.com/stacklok/mediator/internal/db"
 	"github.com/stacklok/mediator/internal/gh/queries"
 	"github.com/stacklok/mediator/internal/reconcilers"
 	"github.com/stacklok/mediator/pkg/auth"
-	"github.com/stacklok/mediator/pkg/db"
 	pb "github.com/stacklok/mediator/pkg/generated/protobuf/go/mediator/v1"
 	github "github.com/stacklok/mediator/pkg/providers/github"
 )

diff --git a/pkg/controlplane/handlers_role.go b/pkg/controlplane/handlers_role.go
@@ -24,7 +24,7 @@ import (
 	"google.golang.org/grpc/status"
 	"google.golang.org/protobuf/types/known/timestamppb"
 
-	"github.com/stacklok/mediator/pkg/db"
+	"github.com/stacklok/mediator/internal/db"
 	pb "github.com/stacklok/mediator/pkg/generated/protobuf/go/mediator/v1"
 )
 

diff --git a/pkg/controlplane/handlers_role_test.go b/pkg/controlplane/handlers_role_test.go
@@ -27,8 +27,8 @@ import (
 	"google.golang.org/protobuf/types/known/timestamppb"
 
 	mockdb "github.com/stacklok/mediator/database/mock"
+	"github.com/stacklok/mediator/internal/db"
 	"github.com/stacklok/mediator/pkg/auth"
-	"github.com/stacklok/mediator/pkg/db"
 	pb "github.com/stacklok/mediator/pkg/generated/protobuf/go/mediator/v1"
 )
 

diff --git a/pkg/controlplane/handlers_user.go b/pkg/controlplane/handlers_user.go
@@ -25,10 +25,10 @@ import (
 	"google.golang.org/grpc/status"
 	"google.golang.org/protobuf/types/known/timestamppb"
 
+	"github.com/stacklok/mediator/internal/db"
 	"github.com/stacklok/mediator/internal/util"
 	"github.com/stacklok/mediator/pkg/auth"
 	mcrypto "github.com/stacklok/mediator/pkg/crypto"
-	"github.com/stacklok/mediator/pkg/db"
 	pb "github.com/stacklok/mediator/pkg/generated/protobuf/go/mediator/v1"
 )