Refactors connection data service (#3090)

nucleuscloud · Jan 7, 2025 · 79b11fd · 79b11fd
1 parent 755cef4
commit 79b11fd
Show file tree

Hide file tree

Showing 60 changed files with 3,527 additions and 3,626 deletions.
diff --git a/backend/gen/go/db/dbschemas/mysql/system.sql.go b/backend/gen/go/db/dbschemas/mysql/system.sql.go
diff --git a/backend/internal/auth/jwt/mock_JwtValidator.go b/backend/internal/auth/jwt/mock_JwtValidator.go
diff --git a/backend/internal/cmds/mgmt/serve/connect/cmd.go b/backend/internal/cmds/mgmt/serve/connect/cmd.go
@@ -44,6 +44,7 @@ import (
 	authlogging_interceptor "github.com/nucleuscloud/neosync/backend/internal/connect/interceptors/auth_logging"
 	bookend_logging_interceptor "github.com/nucleuscloud/neosync/backend/internal/connect/interceptors/bookend"
 	logger_interceptor "github.com/nucleuscloud/neosync/backend/internal/connect/interceptors/logger"
+	"github.com/nucleuscloud/neosync/backend/internal/connectiondata"
 	jobhooks "github.com/nucleuscloud/neosync/backend/internal/ee/hooks/jobs"
 	"github.com/nucleuscloud/neosync/backend/internal/ee/rbac"
 	"github.com/nucleuscloud/neosync/backend/internal/ee/rbac/enforcer"
@@ -637,18 +638,21 @@ func serve(ctx context.Context) error {
 
 	neosynctyperegistry := neosynctypes.NewTypeRegistry(slogger)
 	gcpmanager := neosync_gcp.NewManager()
-	connectionDataService := v1alpha1_connectiondataservice.New(
-		&v1alpha1_connectiondataservice.Config{},
-		connectionService,
-		jobService,
-		awsManager,
+	connectiondatabuilder := connectiondata.NewConnectionDataBuilder(
 		sqlConnector,
+		sqlmanager,
 		pgquerier,
 		mysqlquerier,
-		mongoconnector,
-		sqlmanager,
+		awsManager,
 		gcpmanager,
+		mongoconnector,
 		neosynctyperegistry,
+		jobService,
+	)
+	connectionDataService := v1alpha1_connectiondataservice.New(
+		&v1alpha1_connectiondataservice.Config{},
+		connectionService,
+		connectiondatabuilder,
 	)
 	api.Handle(
 		mgmtv1alpha1connect.NewConnectionDataServiceHandler(