diff --git a/backend/controller/admin/local_client.go b/backend/controller/admin/local_client.go index af012e6682..b5780b399a 100644 --- a/backend/controller/admin/local_client.go +++ b/backend/controller/admin/local_client.go @@ -8,9 +8,9 @@ import ( "github.com/alecthomas/types/optional" "github.com/TBD54566975/ftl/backend/schema" - "github.com/TBD54566975/ftl/common/projectconfig" "github.com/TBD54566975/ftl/internal/buildengine" cf "github.com/TBD54566975/ftl/internal/configuration" + "github.com/TBD54566975/ftl/internal/projectconfig" ) // localClient reads and writes to local projectconfig files without making any network diff --git a/cmd/ftl/cmd_box.go b/cmd/ftl/cmd_box.go index fbbb4e001b..4c1ef92e23 100644 --- a/cmd/ftl/cmd_box.go +++ b/cmd/ftl/cmd_box.go @@ -14,10 +14,10 @@ import ( "github.com/TBD54566975/ftl" "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1/ftlv1connect" - "github.com/TBD54566975/ftl/common/projectconfig" "github.com/TBD54566975/ftl/internal/buildengine" "github.com/TBD54566975/ftl/internal/exec" "github.com/TBD54566975/ftl/internal/log" + "github.com/TBD54566975/ftl/internal/projectconfig" ) // Test locally by running: diff --git a/cmd/ftl/cmd_box_run.go b/cmd/ftl/cmd_box_run.go index 75f465f87e..c247750179 100644 --- a/cmd/ftl/cmd_box_run.go +++ b/cmd/ftl/cmd_box_run.go @@ -16,11 +16,11 @@ import ( "github.com/TBD54566975/ftl/backend/controller/sql/databasetesting" "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1/ftlv1connect" "github.com/TBD54566975/ftl/backend/schema" - "github.com/TBD54566975/ftl/common/projectconfig" "github.com/TBD54566975/ftl/internal/bind" "github.com/TBD54566975/ftl/internal/buildengine" "github.com/TBD54566975/ftl/internal/log" "github.com/TBD54566975/ftl/internal/model" + "github.com/TBD54566975/ftl/internal/projectconfig" "github.com/TBD54566975/ftl/internal/rpc" ) diff --git a/cmd/ftl/cmd_build.go b/cmd/ftl/cmd_build.go index 2f71ca4828..58ee325f7f 100644 --- a/cmd/ftl/cmd_build.go +++ b/cmd/ftl/cmd_build.go @@ -6,8 +6,8 @@ import ( "fmt" "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1/ftlv1connect" - "github.com/TBD54566975/ftl/common/projectconfig" "github.com/TBD54566975/ftl/internal/buildengine" + "github.com/TBD54566975/ftl/internal/projectconfig" ) type buildCmd struct { diff --git a/cmd/ftl/cmd_config.go b/cmd/ftl/cmd_config.go index 7f992be322..95c3e33c6c 100644 --- a/cmd/ftl/cmd_config.go +++ b/cmd/ftl/cmd_config.go @@ -13,9 +13,9 @@ import ( "github.com/TBD54566975/ftl/backend/controller/admin" ftlv1 "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1" "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1/ftlv1connect" - "github.com/TBD54566975/ftl/common/projectconfig" cf "github.com/TBD54566975/ftl/internal/configuration" "github.com/TBD54566975/ftl/internal/log" + "github.com/TBD54566975/ftl/internal/projectconfig" "github.com/TBD54566975/ftl/internal/rpc" ) diff --git a/cmd/ftl/cmd_deploy.go b/cmd/ftl/cmd_deploy.go index ca870bdbc6..a2d4981b3a 100644 --- a/cmd/ftl/cmd_deploy.go +++ b/cmd/ftl/cmd_deploy.go @@ -4,8 +4,8 @@ import ( "context" "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1/ftlv1connect" - "github.com/TBD54566975/ftl/common/projectconfig" "github.com/TBD54566975/ftl/internal/buildengine" + "github.com/TBD54566975/ftl/internal/projectconfig" "github.com/TBD54566975/ftl/internal/rpc" ) diff --git a/cmd/ftl/cmd_dev.go b/cmd/ftl/cmd_dev.go index ef491d1b1d..c106578ab4 100644 --- a/cmd/ftl/cmd_dev.go +++ b/cmd/ftl/cmd_dev.go @@ -10,10 +10,10 @@ import ( "golang.org/x/sync/errgroup" "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1/ftlv1connect" - "github.com/TBD54566975/ftl/common/projectconfig" "github.com/TBD54566975/ftl/internal/buildengine" "github.com/TBD54566975/ftl/internal/log" "github.com/TBD54566975/ftl/internal/lsp" + "github.com/TBD54566975/ftl/internal/projectconfig" "github.com/TBD54566975/ftl/internal/rpc" ) diff --git a/cmd/ftl/cmd_init.go b/cmd/ftl/cmd_init.go index be1be9e7ec..3577f9d056 100644 --- a/cmd/ftl/cmd_init.go +++ b/cmd/ftl/cmd_init.go @@ -9,10 +9,10 @@ import ( "strings" "github.com/TBD54566975/ftl" - "github.com/TBD54566975/ftl/common/projectconfig" "github.com/TBD54566975/ftl/internal" "github.com/TBD54566975/ftl/internal/exec" "github.com/TBD54566975/ftl/internal/log" + "github.com/TBD54566975/ftl/internal/projectconfig" "github.com/TBD54566975/ftl/internal/projectinit" ) diff --git a/cmd/ftl/cmd_new.go b/cmd/ftl/cmd_new.go index e5eddc5a92..82dde183e4 100644 --- a/cmd/ftl/cmd_new.go +++ b/cmd/ftl/cmd_new.go @@ -16,11 +16,11 @@ import ( "github.com/TBD54566975/ftl/backend/schema" "github.com/TBD54566975/ftl/backend/schema/strcase" - "github.com/TBD54566975/ftl/common/projectconfig" goruntime "github.com/TBD54566975/ftl/go-runtime" "github.com/TBD54566975/ftl/internal" "github.com/TBD54566975/ftl/internal/exec" "github.com/TBD54566975/ftl/internal/log" + "github.com/TBD54566975/ftl/internal/projectconfig" ) type newCmd struct { diff --git a/cmd/ftl/cmd_schema_diff.go b/cmd/ftl/cmd_schema_diff.go index 7cee9010ce..fe8cff6ee8 100644 --- a/cmd/ftl/cmd_schema_diff.go +++ b/cmd/ftl/cmd_schema_diff.go @@ -18,9 +18,9 @@ import ( "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1/ftlv1connect" schemapb "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1/schema" "github.com/TBD54566975/ftl/backend/schema" - "github.com/TBD54566975/ftl/common/projectconfig" "github.com/TBD54566975/ftl/internal/buildengine" "github.com/TBD54566975/ftl/internal/log" + "github.com/TBD54566975/ftl/internal/projectconfig" "github.com/TBD54566975/ftl/internal/rpc" ) diff --git a/cmd/ftl/cmd_secret.go b/cmd/ftl/cmd_secret.go index 57184e002e..4fa777a7f1 100644 --- a/cmd/ftl/cmd_secret.go +++ b/cmd/ftl/cmd_secret.go @@ -13,8 +13,8 @@ import ( "golang.org/x/term" ftlv1 "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1" - "github.com/TBD54566975/ftl/common/projectconfig" cf "github.com/TBD54566975/ftl/internal/configuration" + "github.com/TBD54566975/ftl/internal/projectconfig" ) type secretCmd struct { diff --git a/cmd/ftl/cmd_serve.go b/cmd/ftl/cmd_serve.go index 031e503576..60f32316fc 100644 --- a/cmd/ftl/cmd_serve.go +++ b/cmd/ftl/cmd_serve.go @@ -25,7 +25,6 @@ import ( "github.com/TBD54566975/ftl/backend/controller/sql/databasetesting" ftlv1 "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1" "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1/ftlv1connect" - "github.com/TBD54566975/ftl/common/projectconfig" "github.com/TBD54566975/ftl/internal/bind" cf "github.com/TBD54566975/ftl/internal/configuration" "github.com/TBD54566975/ftl/internal/container" @@ -33,6 +32,7 @@ import ( "github.com/TBD54566975/ftl/internal/log" "github.com/TBD54566975/ftl/internal/model" "github.com/TBD54566975/ftl/internal/observability" + "github.com/TBD54566975/ftl/internal/projectconfig" "github.com/TBD54566975/ftl/internal/rpc" ) diff --git a/cmd/ftl/main.go b/cmd/ftl/main.go index 7b1427a7b1..aef0439b7e 100644 --- a/cmd/ftl/main.go +++ b/cmd/ftl/main.go @@ -15,9 +15,9 @@ import ( "github.com/TBD54566975/ftl" "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1/ftlv1connect" - "github.com/TBD54566975/ftl/common/projectconfig" _ "github.com/TBD54566975/ftl/internal/automaxprocs" // Set GOMAXPROCS to match Linux container CPU quota. "github.com/TBD54566975/ftl/internal/log" + "github.com/TBD54566975/ftl/internal/projectconfig" "github.com/TBD54566975/ftl/internal/rpc" ) diff --git a/go-runtime/compile/build.go b/go-runtime/compile/build.go index 90a540dc8d..5e00e25ac5 100644 --- a/go-runtime/compile/build.go +++ b/go-runtime/compile/build.go @@ -26,12 +26,12 @@ import ( "github.com/TBD54566975/ftl" schemapb "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1/schema" "github.com/TBD54566975/ftl/backend/schema" - "github.com/TBD54566975/ftl/common/projectconfig" extract "github.com/TBD54566975/ftl/go-runtime/schema" "github.com/TBD54566975/ftl/internal" "github.com/TBD54566975/ftl/internal/exec" "github.com/TBD54566975/ftl/internal/log" "github.com/TBD54566975/ftl/internal/moduleconfig" + "github.com/TBD54566975/ftl/internal/projectconfig" "github.com/TBD54566975/ftl/internal/reflect" ) diff --git a/go-runtime/ftl/ftltest/ftltest.go b/go-runtime/ftl/ftltest/ftltest.go index 6fc0ef0c1e..a36bc0cc3d 100644 --- a/go-runtime/ftl/ftltest/ftltest.go +++ b/go-runtime/ftl/ftltest/ftltest.go @@ -15,13 +15,13 @@ import ( _ "github.com/jackc/pgx/v5/stdlib" // SQL driver "github.com/TBD54566975/ftl/backend/schema" - pc "github.com/TBD54566975/ftl/common/projectconfig" "github.com/TBD54566975/ftl/go-runtime/ftl" "github.com/TBD54566975/ftl/go-runtime/ftl/reflection" "github.com/TBD54566975/ftl/go-runtime/internal" cf "github.com/TBD54566975/ftl/internal/configuration" "github.com/TBD54566975/ftl/internal/log" "github.com/TBD54566975/ftl/internal/modulecontext" + pc "github.com/TBD54566975/ftl/internal/projectconfig" mcu "github.com/TBD54566975/ftl/internal/testutils/modulecontext" ) diff --git a/internal/configuration/defaults.go b/internal/configuration/defaults.go index 363f1d9a36..e372fffcce 100644 --- a/internal/configuration/defaults.go +++ b/internal/configuration/defaults.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/TBD54566975/ftl/common/projectconfig" + "github.com/TBD54566975/ftl/internal/projectconfig" ) // NewConfigurationManager creates a new configuration manager with the default configuration providers. diff --git a/internal/configuration/projectconfig_resolver.go b/internal/configuration/projectconfig_resolver.go index 0a84d72bc4..4813227136 100644 --- a/internal/configuration/projectconfig_resolver.go +++ b/internal/configuration/projectconfig_resolver.go @@ -8,7 +8,7 @@ import ( "github.com/alecthomas/types/optional" "golang.org/x/exp/maps" - pc "github.com/TBD54566975/ftl/common/projectconfig" + pc "github.com/TBD54566975/ftl/internal/projectconfig" ) // ProjectConfigResolver is parametric Resolver that loads values from either a diff --git a/internal/configuration/projectconfig_resolver_test.go b/internal/configuration/projectconfig_resolver_test.go index ed9a6f1b6d..f83865e1cc 100644 --- a/internal/configuration/projectconfig_resolver_test.go +++ b/internal/configuration/projectconfig_resolver_test.go @@ -10,8 +10,8 @@ import ( "github.com/alecthomas/assert/v2" "github.com/alecthomas/types/optional" - "github.com/TBD54566975/ftl/common/projectconfig" "github.com/TBD54566975/ftl/internal/log" + "github.com/TBD54566975/ftl/internal/projectconfig" ) func TestSet(t *testing.T) { diff --git a/common/projectconfig/integration_test.go b/internal/projectconfig/integration_test.go similarity index 100% rename from common/projectconfig/integration_test.go rename to internal/projectconfig/integration_test.go diff --git a/common/projectconfig/projectconfig.go b/internal/projectconfig/projectconfig.go similarity index 100% rename from common/projectconfig/projectconfig.go rename to internal/projectconfig/projectconfig.go diff --git a/common/projectconfig/projectconfig_test.go b/internal/projectconfig/projectconfig_test.go similarity index 100% rename from common/projectconfig/projectconfig_test.go rename to internal/projectconfig/projectconfig_test.go diff --git a/common/projectconfig/testdata/ftl-project.toml b/internal/projectconfig/testdata/ftl-project.toml similarity index 100% rename from common/projectconfig/testdata/ftl-project.toml rename to internal/projectconfig/testdata/ftl-project.toml diff --git a/common/projectconfig/testdata/go/configs-ftl-project.toml b/internal/projectconfig/testdata/go/configs-ftl-project.toml similarity index 100% rename from common/projectconfig/testdata/go/configs-ftl-project.toml rename to internal/projectconfig/testdata/go/configs-ftl-project.toml diff --git a/common/projectconfig/testdata/go/echo/echo.go b/internal/projectconfig/testdata/go/echo/echo.go similarity index 100% rename from common/projectconfig/testdata/go/echo/echo.go rename to internal/projectconfig/testdata/go/echo/echo.go diff --git a/common/projectconfig/testdata/go/echo/ftl.toml b/internal/projectconfig/testdata/go/echo/ftl.toml similarity index 100% rename from common/projectconfig/testdata/go/echo/ftl.toml rename to internal/projectconfig/testdata/go/echo/ftl.toml diff --git a/common/projectconfig/testdata/go/echo/go.mod b/internal/projectconfig/testdata/go/echo/go.mod similarity index 100% rename from common/projectconfig/testdata/go/echo/go.mod rename to internal/projectconfig/testdata/go/echo/go.mod diff --git a/common/projectconfig/testdata/go/echo/go.sum b/internal/projectconfig/testdata/go/echo/go.sum similarity index 100% rename from common/projectconfig/testdata/go/echo/go.sum rename to internal/projectconfig/testdata/go/echo/go.sum diff --git a/common/projectconfig/testdata/go/findconfig/findconfig.go b/internal/projectconfig/testdata/go/findconfig/findconfig.go similarity index 100% rename from common/projectconfig/testdata/go/findconfig/findconfig.go rename to internal/projectconfig/testdata/go/findconfig/findconfig.go diff --git a/common/projectconfig/testdata/go/findconfig/ftl-project.toml b/internal/projectconfig/testdata/go/findconfig/ftl-project.toml similarity index 100% rename from common/projectconfig/testdata/go/findconfig/ftl-project.toml rename to internal/projectconfig/testdata/go/findconfig/ftl-project.toml diff --git a/common/projectconfig/testdata/go/findconfig/ftl.toml b/internal/projectconfig/testdata/go/findconfig/ftl.toml similarity index 100% rename from common/projectconfig/testdata/go/findconfig/ftl.toml rename to internal/projectconfig/testdata/go/findconfig/ftl.toml diff --git a/common/projectconfig/testdata/go/findconfig/go.mod b/internal/projectconfig/testdata/go/findconfig/go.mod similarity index 100% rename from common/projectconfig/testdata/go/findconfig/go.mod rename to internal/projectconfig/testdata/go/findconfig/go.mod diff --git a/common/projectconfig/testdata/go/findconfig/go.sum b/internal/projectconfig/testdata/go/findconfig/go.sum similarity index 100% rename from common/projectconfig/testdata/go/findconfig/go.sum rename to internal/projectconfig/testdata/go/findconfig/go.sum diff --git a/common/projectconfig/testdata/go/findconfig/subdir/.keepme b/internal/projectconfig/testdata/go/findconfig/subdir/.keepme similarity index 100% rename from common/projectconfig/testdata/go/findconfig/subdir/.keepme rename to internal/projectconfig/testdata/go/findconfig/subdir/.keepme diff --git a/common/projectconfig/testdata/go/no-module-dirs-ftl-project.toml b/internal/projectconfig/testdata/go/no-module-dirs-ftl-project.toml similarity index 100% rename from common/projectconfig/testdata/go/no-module-dirs-ftl-project.toml rename to internal/projectconfig/testdata/go/no-module-dirs-ftl-project.toml diff --git a/common/projectconfig/testdata/go/validate-configs-ftl-project.toml b/internal/projectconfig/testdata/go/validate-configs-ftl-project.toml similarity index 100% rename from common/projectconfig/testdata/go/validate-configs-ftl-project.toml rename to internal/projectconfig/testdata/go/validate-configs-ftl-project.toml diff --git a/common/projectconfig/testdata/go/validateconfig/ftl-project.toml b/internal/projectconfig/testdata/go/validateconfig/ftl-project.toml similarity index 100% rename from common/projectconfig/testdata/go/validateconfig/ftl-project.toml rename to internal/projectconfig/testdata/go/validateconfig/ftl-project.toml diff --git a/common/projectconfig/testdata/go/validateconfig/ftl.toml b/internal/projectconfig/testdata/go/validateconfig/ftl.toml similarity index 100% rename from common/projectconfig/testdata/go/validateconfig/ftl.toml rename to internal/projectconfig/testdata/go/validateconfig/ftl.toml diff --git a/common/projectconfig/testdata/go/validateconfig/go.mod b/internal/projectconfig/testdata/go/validateconfig/go.mod similarity index 100% rename from common/projectconfig/testdata/go/validateconfig/go.mod rename to internal/projectconfig/testdata/go/validateconfig/go.mod diff --git a/common/projectconfig/testdata/go/validateconfig/go.sum b/internal/projectconfig/testdata/go/validateconfig/go.sum similarity index 100% rename from common/projectconfig/testdata/go/validateconfig/go.sum rename to internal/projectconfig/testdata/go/validateconfig/go.sum diff --git a/common/projectconfig/testdata/go/validateconfig/validateconfig.go b/internal/projectconfig/testdata/go/validateconfig/validateconfig.go similarity index 100% rename from common/projectconfig/testdata/go/validateconfig/validateconfig.go rename to internal/projectconfig/testdata/go/validateconfig/validateconfig.go diff --git a/common/projectconfig/testdata/withMinVersion/ftl-project.toml b/internal/projectconfig/testdata/withMinVersion/ftl-project.toml similarity index 100% rename from common/projectconfig/testdata/withMinVersion/ftl-project.toml rename to internal/projectconfig/testdata/withMinVersion/ftl-project.toml diff --git a/common/projectconfig/url.go b/internal/projectconfig/url.go similarity index 100% rename from common/projectconfig/url.go rename to internal/projectconfig/url.go