Nick/neos 675 Moves sql-connector to pkg folder to be shared by worker (

#1187)
nucleuscloud · Jan 26, 2024 · 8368867 · 8368867
1 parent a694c16
commit 8368867
Show file tree

Hide file tree

Showing 11 changed files with 35 additions and 30 deletions.
diff --git a/.mockery.yml b/.mockery.yml
@@ -50,7 +50,7 @@ packages:
   github.com/nucleuscloud/neosync/backend/internal/authmgmt/auth0:
     interfaces:
       Auth0MgmtClientInterface:
-  github.com/nucleuscloud/neosync/backend/internal/sqlconnect:
+  github.com/nucleuscloud/neosync/backend/pkg/sqlconnect:
     interfaces:
       SqlConnector:
       SqlDbContainer:

diff --git a/backend/internal/cmds/mgmt/serve/connect/cmd.go b/backend/internal/cmds/mgmt/serve/connect/cmd.go
@@ -32,8 +32,8 @@ import (
 	logging_interceptor "github.com/nucleuscloud/neosync/backend/internal/connect/interceptors/logging"
 	neosynclogger "github.com/nucleuscloud/neosync/backend/internal/logger"
 	"github.com/nucleuscloud/neosync/backend/internal/nucleusdb"
-	"github.com/nucleuscloud/neosync/backend/internal/sqlconnect"
 	clientmanager "github.com/nucleuscloud/neosync/backend/internal/temporal/client-manager"
+	"github.com/nucleuscloud/neosync/backend/pkg/sqlconnect"
 	v1alpha1_apikeyservice "github.com/nucleuscloud/neosync/backend/services/mgmt/v1alpha1/api-key-service"
 	v1alpha1_authservice "github.com/nucleuscloud/neosync/backend/services/mgmt/v1alpha1/auth-service"
 	v1alpha1_connectiondataservice "github.com/nucleuscloud/neosync/backend/services/mgmt/v1alpha1/connection-data-service"

diff --git a/...ternal/sqlconnect/mock_PgPoolContainer.go → ...nd/pkg/sqlconnect/mock_PgPoolContainer.go b/...ternal/sqlconnect/mock_PgPoolContainer.go → ...nd/pkg/sqlconnect/mock_PgPoolContainer.go
diff --git a/.../internal/sqlconnect/mock_SqlConnector.go → backend/pkg/sqlconnect/mock_SqlConnector.go b/.../internal/sqlconnect/mock_SqlConnector.go → backend/pkg/sqlconnect/mock_SqlConnector.go
diff --git a/...nternal/sqlconnect/mock_SqlDbContainer.go → ...end/pkg/sqlconnect/mock_SqlDbContainer.go b/...nternal/sqlconnect/mock_SqlDbContainer.go → ...end/pkg/sqlconnect/mock_SqlDbContainer.go
diff --git a/backend/internal/sqlconnect/sql-connector.go → backend/pkg/sqlconnect/sql-connector.go b/backend/internal/sqlconnect/sql-connector.go → backend/pkg/sqlconnect/sql-connector.go
@@ -11,19 +11,28 @@ import (
 	"strings"
 
 	"github.com/jackc/pgx/v5/pgxpool"
+	mysql_queries "github.com/nucleuscloud/neosync/backend/gen/go/db/dbschemas/mysql"
+	pg_queries "github.com/nucleuscloud/neosync/backend/gen/go/db/dbschemas/postgresql"
 	mgmtv1alpha1 "github.com/nucleuscloud/neosync/backend/gen/go/protos/mgmt/v1alpha1"
 	nucleuserrors "github.com/nucleuscloud/neosync/backend/internal/errors"
 	"github.com/nucleuscloud/neosync/backend/pkg/sshtunnel"
 	"golang.org/x/crypto/ssh"
 )
 
+type SqlDBTX interface {
+	mysql_queries.DBTX
+
+	PingContext(context.Context) error
+	BeginTx(context.Context, *sql.TxOptions) (*sql.Tx, error)
+}
+
 type SqlDbContainer interface {
-	Open() (*sql.DB, error)
+	Open() (SqlDBTX, error)
 	Close() error
 }
 
 type PgPoolContainer interface {
-	Open(context.Context) (*pgxpool.Pool, error)
+	Open(context.Context) (pg_queries.DBTX, error)
 	Close()
 }
 
@@ -60,7 +69,7 @@ type PgPool struct {
 	connectionTimeout *uint32
 }
 
-func (s *PgPool) Open(ctx context.Context) (*pgxpool.Pool, error) {
+func (s *PgPool) Open(ctx context.Context) (pg_queries.DBTX, error) {
 	details, err := getConnectionDetails(&mgmtv1alpha1.ConnectionConfig{
 		Config: &mgmtv1alpha1.ConnectionConfig_PgConfig{
 			PgConfig: s.connectionConfig,
@@ -118,7 +127,7 @@ type SqlDb struct {
 	connectionTimeout *uint32
 }
 
-func (s *SqlDb) Open() (*sql.DB, error) {
+func (s *SqlDb) Open() (SqlDBTX, error) {
 	details, err := getConnectionDetails(s.connectionConfig, s.connectionTimeout, s.logger)
 	if err != nil {
 		return nil, err

diff --git a/...internal/sqlconnect/sql-connector_test.go → backend/pkg/sqlconnect/sql-connector_test.go b/...internal/sqlconnect/sql-connector_test.go → backend/pkg/sqlconnect/sql-connector_test.go
diff --git a/backend/services/mgmt/v1alpha1/connection-data-service/connection-data_test.go b/backend/services/mgmt/v1alpha1/connection-data-service/connection-data_test.go
@@ -26,7 +26,7 @@ import (
 	pg_queries "github.com/nucleuscloud/neosync/backend/gen/go/db/dbschemas/postgresql"
 	awsmanager "github.com/nucleuscloud/neosync/backend/internal/aws"
 	"github.com/nucleuscloud/neosync/backend/internal/nucleusdb"
-	"github.com/nucleuscloud/neosync/backend/internal/sqlconnect"
+	"github.com/nucleuscloud/neosync/backend/pkg/sqlconnect"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 )

diff --git a/backend/services/mgmt/v1alpha1/connection-data-service/service.go b/backend/services/mgmt/v1alpha1/connection-data-service/service.go
@@ -5,7 +5,7 @@ import (
 	pg_queries "github.com/nucleuscloud/neosync/backend/gen/go/db/dbschemas/postgresql"
 	"github.com/nucleuscloud/neosync/backend/gen/go/protos/mgmt/v1alpha1/mgmtv1alpha1connect"
 	awsmanager "github.com/nucleuscloud/neosync/backend/internal/aws"
-	"github.com/nucleuscloud/neosync/backend/internal/sqlconnect"
+	"github.com/nucleuscloud/neosync/backend/pkg/sqlconnect"
 )
 
 type Service struct {

diff --git a/backend/services/mgmt/v1alpha1/connection-service/connection_test.go b/backend/services/mgmt/v1alpha1/connection-service/connection_test.go
@@ -17,7 +17,7 @@ import (
 	"github.com/nucleuscloud/neosync/backend/internal/apikey"
 	auth_apikey "github.com/nucleuscloud/neosync/backend/internal/auth/apikey"
 	"github.com/nucleuscloud/neosync/backend/internal/nucleusdb"
-	"github.com/nucleuscloud/neosync/backend/internal/sqlconnect"
+	"github.com/nucleuscloud/neosync/backend/pkg/sqlconnect"
 	pg_models "github.com/nucleuscloud/neosync/backend/sql/postgresql/models"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"

diff --git a/backend/services/mgmt/v1alpha1/connection-service/service.go b/backend/services/mgmt/v1alpha1/connection-service/service.go
@@ -3,7 +3,7 @@ package v1alpha1_connectionservice
 import (
 	"github.com/nucleuscloud/neosync/backend/gen/go/protos/mgmt/v1alpha1/mgmtv1alpha1connect"
 	"github.com/nucleuscloud/neosync/backend/internal/nucleusdb"
-	"github.com/nucleuscloud/neosync/backend/internal/sqlconnect"
+	"github.com/nucleuscloud/neosync/backend/pkg/sqlconnect"
 )
 
 type Service struct {