diff --git a/.mockery.yml b/.mockery.yml index cd3e9feda1..6defc7f890 100644 --- a/.mockery.yml +++ b/.mockery.yml @@ -94,7 +94,7 @@ packages: interfaces: Interface: DbContainer: - github.com/nucleuscloud/neosync/backend/internal/gcp: + github.com/nucleuscloud/neosync/internal/gcp: interfaces: ManagerInterface: ClientInterface: diff --git a/backend/internal/cmds/mgmt/serve/connect/cmd.go b/backend/internal/cmds/mgmt/serve/connect/cmd.go index 31f30a7b17..bd87b040de 100644 --- a/backend/internal/cmds/mgmt/serve/connect/cmd.go +++ b/backend/internal/cmds/mgmt/serve/connect/cmd.go @@ -46,10 +46,8 @@ 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" accounthooks "github.com/nucleuscloud/neosync/backend/internal/ee/hooks/accounts" jobhooks "github.com/nucleuscloud/neosync/backend/internal/ee/hooks/jobs" - neosync_gcp "github.com/nucleuscloud/neosync/backend/internal/gcp" "github.com/nucleuscloud/neosync/backend/internal/userdata" neosynclogger "github.com/nucleuscloud/neosync/backend/pkg/logger" "github.com/nucleuscloud/neosync/backend/pkg/mongoconnect" @@ -71,12 +69,14 @@ import ( "github.com/nucleuscloud/neosync/internal/authmgmt/keycloak" awsmanager "github.com/nucleuscloud/neosync/internal/aws" "github.com/nucleuscloud/neosync/internal/billing" + "github.com/nucleuscloud/neosync/internal/connectiondata" cloudlicense "github.com/nucleuscloud/neosync/internal/ee/cloud-license" "github.com/nucleuscloud/neosync/internal/ee/license" presidioapi "github.com/nucleuscloud/neosync/internal/ee/presidio" "github.com/nucleuscloud/neosync/internal/ee/rbac" "github.com/nucleuscloud/neosync/internal/ee/rbac/enforcer" ee_slack "github.com/nucleuscloud/neosync/internal/ee/slack" + neosync_gcp "github.com/nucleuscloud/neosync/internal/gcp" neomigrate "github.com/nucleuscloud/neosync/internal/migrate" "github.com/nucleuscloud/neosync/internal/neosyncdb" neosyncotel "github.com/nucleuscloud/neosync/internal/otel" diff --git a/backend/pkg/integration-test/mux.go b/backend/pkg/integration-test/mux.go index a0327b703c..ac828fbafa 100644 --- a/backend/pkg/integration-test/mux.go +++ b/backend/pkg/integration-test/mux.go @@ -15,10 +15,8 @@ import ( auth_apikey "github.com/nucleuscloud/neosync/backend/internal/auth/apikey" auth_jwt "github.com/nucleuscloud/neosync/backend/internal/auth/jwt" auth_interceptor "github.com/nucleuscloud/neosync/backend/internal/connect/interceptors/auth" - "github.com/nucleuscloud/neosync/backend/internal/connectiondata" accounthooks "github.com/nucleuscloud/neosync/backend/internal/ee/hooks/accounts" jobhooks "github.com/nucleuscloud/neosync/backend/internal/ee/hooks/jobs" - neosync_gcp "github.com/nucleuscloud/neosync/backend/internal/gcp" "github.com/nucleuscloud/neosync/backend/internal/userdata" "github.com/nucleuscloud/neosync/backend/internal/utils" "github.com/nucleuscloud/neosync/backend/pkg/mongoconnect" @@ -34,9 +32,11 @@ import ( "github.com/nucleuscloud/neosync/internal/authmgmt" awsmanager "github.com/nucleuscloud/neosync/internal/aws" "github.com/nucleuscloud/neosync/internal/billing" + "github.com/nucleuscloud/neosync/internal/connectiondata" presidioapi "github.com/nucleuscloud/neosync/internal/ee/presidio" "github.com/nucleuscloud/neosync/internal/ee/rbac" "github.com/nucleuscloud/neosync/internal/ee/rbac/enforcer" + neosync_gcp "github.com/nucleuscloud/neosync/internal/gcp" neosynctypes "github.com/nucleuscloud/neosync/internal/neosync-types" "github.com/nucleuscloud/neosync/internal/neosyncdb" "github.com/nucleuscloud/neosync/internal/testutil" diff --git a/backend/services/mgmt/v1alpha1/connection-data-service/service.go b/backend/services/mgmt/v1alpha1/connection-data-service/service.go index 888c84dd1d..1085462662 100644 --- a/backend/services/mgmt/v1alpha1/connection-data-service/service.go +++ b/backend/services/mgmt/v1alpha1/connection-data-service/service.go @@ -2,7 +2,7 @@ package v1alpha1_connectiondataservice import ( "github.com/nucleuscloud/neosync/backend/gen/go/protos/mgmt/v1alpha1/mgmtv1alpha1connect" - "github.com/nucleuscloud/neosync/backend/internal/connectiondata" + "github.com/nucleuscloud/neosync/internal/connectiondata" ) type Service struct { diff --git a/backend/services/mgmt/v1alpha1/job-service/service.go b/backend/services/mgmt/v1alpha1/job-service/service.go index ead094c60e..d049e2a5f8 100644 --- a/backend/services/mgmt/v1alpha1/job-service/service.go +++ b/backend/services/mgmt/v1alpha1/job-service/service.go @@ -2,10 +2,10 @@ package v1alpha1_jobservice import ( "github.com/nucleuscloud/neosync/backend/gen/go/protos/mgmt/v1alpha1/mgmtv1alpha1connect" - "github.com/nucleuscloud/neosync/backend/internal/connectiondata" jobhooks "github.com/nucleuscloud/neosync/backend/internal/ee/hooks/jobs" "github.com/nucleuscloud/neosync/backend/internal/userdata" sql_manager "github.com/nucleuscloud/neosync/backend/pkg/sqlmanager" + "github.com/nucleuscloud/neosync/internal/connectiondata" "github.com/nucleuscloud/neosync/internal/neosyncdb" clientmanager "github.com/nucleuscloud/neosync/internal/temporal/clientmanager" ) diff --git a/backend/internal/connectiondata/aws-s3.go b/internal/connectiondata/aws-s3.go similarity index 100% rename from backend/internal/connectiondata/aws-s3.go rename to internal/connectiondata/aws-s3.go diff --git a/backend/internal/connectiondata/connectiondata.go b/internal/connectiondata/connectiondata.go similarity index 98% rename from backend/internal/connectiondata/connectiondata.go rename to internal/connectiondata/connectiondata.go index fcb535d109..fddd20d57d 100644 --- a/backend/internal/connectiondata/connectiondata.go +++ b/internal/connectiondata/connectiondata.go @@ -9,11 +9,11 @@ import ( 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" - neosync_gcp "github.com/nucleuscloud/neosync/backend/internal/gcp" "github.com/nucleuscloud/neosync/backend/pkg/mongoconnect" "github.com/nucleuscloud/neosync/backend/pkg/sqlconnect" sql_manager "github.com/nucleuscloud/neosync/backend/pkg/sqlmanager" aws_manager "github.com/nucleuscloud/neosync/internal/aws" + neosync_gcp "github.com/nucleuscloud/neosync/internal/gcp" neosynctypes "github.com/nucleuscloud/neosync/internal/neosync-types" ) diff --git a/backend/internal/connectiondata/dynamodb.go b/internal/connectiondata/dynamodb.go similarity index 100% rename from backend/internal/connectiondata/dynamodb.go rename to internal/connectiondata/dynamodb.go diff --git a/backend/internal/connectiondata/gcp.go b/internal/connectiondata/gcp.go similarity index 98% rename from backend/internal/connectiondata/gcp.go rename to internal/connectiondata/gcp.go index 0ec0fe22eb..bc614b1480 100644 --- a/backend/internal/connectiondata/gcp.go +++ b/internal/connectiondata/gcp.go @@ -12,9 +12,9 @@ import ( "connectrpc.com/connect" mgmtv1alpha1 "github.com/nucleuscloud/neosync/backend/gen/go/protos/mgmt/v1alpha1" - neosync_gcp "github.com/nucleuscloud/neosync/backend/internal/gcp" sqlmanager_shared "github.com/nucleuscloud/neosync/backend/pkg/sqlmanager/shared" nucleuserrors "github.com/nucleuscloud/neosync/internal/errors" + neosync_gcp "github.com/nucleuscloud/neosync/internal/gcp" ) type GcpConnectionDataService struct { diff --git a/backend/internal/connectiondata/mongodb.go b/internal/connectiondata/mongodb.go similarity index 100% rename from backend/internal/connectiondata/mongodb.go rename to internal/connectiondata/mongodb.go diff --git a/backend/internal/connectiondata/sql.go b/internal/connectiondata/sql.go similarity index 100% rename from backend/internal/connectiondata/sql.go rename to internal/connectiondata/sql.go diff --git a/backend/internal/gcp/client.go b/internal/gcp/client.go similarity index 100% rename from backend/internal/gcp/client.go rename to internal/gcp/client.go diff --git a/backend/internal/gcp/manager.go b/internal/gcp/manager.go similarity index 100% rename from backend/internal/gcp/manager.go rename to internal/gcp/manager.go diff --git a/backend/internal/gcp/mock_ClientInterface.go b/internal/gcp/mock_ClientInterface.go similarity index 100% rename from backend/internal/gcp/mock_ClientInterface.go rename to internal/gcp/mock_ClientInterface.go diff --git a/backend/internal/gcp/mock_ManagerInterface.go b/internal/gcp/mock_ManagerInterface.go similarity index 100% rename from backend/internal/gcp/mock_ManagerInterface.go rename to internal/gcp/mock_ManagerInterface.go