diff --git a/backend/controller/admin/local_client.go b/backend/controller/admin/local_client.go index 7142877c2b..648a402247 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/buildengine" cf "github.com/TBD54566975/ftl/common/configuration" "github.com/TBD54566975/ftl/common/projectconfig" + "github.com/TBD54566975/ftl/internal/buildengine" ) // localClient reads and writes to local projectconfig files without making any network diff --git a/backend/controller/console/console.go b/backend/controller/console/console.go index 67d9ea296b..e3c8f3cf2d 100644 --- a/backend/controller/console/console.go +++ b/backend/controller/console/console.go @@ -18,7 +18,7 @@ import ( "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1/console/pbconsoleconnect" schemapb "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1/schema" "github.com/TBD54566975/ftl/backend/schema" - "github.com/TBD54566975/ftl/buildengine" + "github.com/TBD54566975/ftl/internal/buildengine" "github.com/TBD54566975/ftl/internal/log" "github.com/TBD54566975/ftl/internal/model" "github.com/TBD54566975/ftl/internal/slices" diff --git a/cmd/ftl/cmd_box.go b/cmd/ftl/cmd_box.go index 887eefb763..fbbb4e001b 100644 --- a/cmd/ftl/cmd_box.go +++ b/cmd/ftl/cmd_box.go @@ -14,8 +14,8 @@ import ( "github.com/TBD54566975/ftl" "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1/ftlv1connect" - "github.com/TBD54566975/ftl/buildengine" "github.com/TBD54566975/ftl/common/projectconfig" + "github.com/TBD54566975/ftl/internal/buildengine" "github.com/TBD54566975/ftl/internal/exec" "github.com/TBD54566975/ftl/internal/log" ) diff --git a/cmd/ftl/cmd_box_run.go b/cmd/ftl/cmd_box_run.go index 971df8a915..75f465f87e 100644 --- a/cmd/ftl/cmd_box_run.go +++ b/cmd/ftl/cmd_box_run.go @@ -16,9 +16,9 @@ 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/buildengine" "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/rpc" diff --git a/cmd/ftl/cmd_build.go b/cmd/ftl/cmd_build.go index a3f13869b2..2f71ca4828 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/buildengine" "github.com/TBD54566975/ftl/common/projectconfig" + "github.com/TBD54566975/ftl/internal/buildengine" ) type buildCmd struct { diff --git a/cmd/ftl/cmd_deploy.go b/cmd/ftl/cmd_deploy.go index a50c7f25fc..ca870bdbc6 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/buildengine" "github.com/TBD54566975/ftl/common/projectconfig" + "github.com/TBD54566975/ftl/internal/buildengine" "github.com/TBD54566975/ftl/internal/rpc" ) diff --git a/cmd/ftl/cmd_dev.go b/cmd/ftl/cmd_dev.go index 8165017955..035856ff43 100644 --- a/cmd/ftl/cmd_dev.go +++ b/cmd/ftl/cmd_dev.go @@ -10,8 +10,8 @@ import ( "golang.org/x/sync/errgroup" "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1/ftlv1connect" - "github.com/TBD54566975/ftl/buildengine" "github.com/TBD54566975/ftl/common/projectconfig" + "github.com/TBD54566975/ftl/internal/buildengine" "github.com/TBD54566975/ftl/internal/log" "github.com/TBD54566975/ftl/internal/rpc" "github.com/TBD54566975/ftl/lsp" diff --git a/cmd/ftl/cmd_schema_diff.go b/cmd/ftl/cmd_schema_diff.go index 8576eb4356..7cee9010ce 100644 --- a/cmd/ftl/cmd_schema_diff.go +++ b/cmd/ftl/cmd_schema_diff.go @@ -18,8 +18,8 @@ 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/buildengine" "github.com/TBD54566975/ftl/common/projectconfig" + "github.com/TBD54566975/ftl/internal/buildengine" "github.com/TBD54566975/ftl/internal/log" "github.com/TBD54566975/ftl/internal/rpc" ) diff --git a/go-runtime/compile/testdata/go/external/go.mod b/go-runtime/compile/testdata/go/external/go.mod index 18d4ea8be6..1813190f1f 100644 --- a/go-runtime/compile/testdata/go/external/go.mod +++ b/go-runtime/compile/testdata/go/external/go.mod @@ -4,4 +4,4 @@ go 1.22.2 require github.com/TBD54566975/ftl v0.206.1 -replace github.com/TBD54566975/ftl => ../../../.. +replace github.com/TBD54566975/ftl => ../../../../.. diff --git a/buildengine/build.go b/internal/buildengine/build.go similarity index 100% rename from buildengine/build.go rename to internal/buildengine/build.go diff --git a/buildengine/build_go.go b/internal/buildengine/build_go.go similarity index 100% rename from buildengine/build_go.go rename to internal/buildengine/build_go.go diff --git a/buildengine/build_go_test.go b/internal/buildengine/build_go_test.go similarity index 100% rename from buildengine/build_go_test.go rename to internal/buildengine/build_go_test.go diff --git a/buildengine/build_java.go b/internal/buildengine/build_java.go similarity index 100% rename from buildengine/build_java.go rename to internal/buildengine/build_java.go diff --git a/buildengine/build_rust.go b/internal/buildengine/build_rust.go similarity index 100% rename from buildengine/build_rust.go rename to internal/buildengine/build_rust.go diff --git a/buildengine/build_test.go b/internal/buildengine/build_test.go similarity index 100% rename from buildengine/build_test.go rename to internal/buildengine/build_test.go diff --git a/buildengine/deploy.go b/internal/buildengine/deploy.go similarity index 100% rename from buildengine/deploy.go rename to internal/buildengine/deploy.go diff --git a/buildengine/deploy_test.go b/internal/buildengine/deploy_test.go similarity index 100% rename from buildengine/deploy_test.go rename to internal/buildengine/deploy_test.go diff --git a/buildengine/deps.go b/internal/buildengine/deps.go similarity index 100% rename from buildengine/deps.go rename to internal/buildengine/deps.go diff --git a/buildengine/deps_test.go b/internal/buildengine/deps_test.go similarity index 100% rename from buildengine/deps_test.go rename to internal/buildengine/deps_test.go diff --git a/buildengine/discover.go b/internal/buildengine/discover.go similarity index 100% rename from buildengine/discover.go rename to internal/buildengine/discover.go diff --git a/buildengine/discover_test.go b/internal/buildengine/discover_test.go similarity index 100% rename from buildengine/discover_test.go rename to internal/buildengine/discover_test.go diff --git a/buildengine/docs.go b/internal/buildengine/docs.go similarity index 100% rename from buildengine/docs.go rename to internal/buildengine/docs.go diff --git a/buildengine/engine.go b/internal/buildengine/engine.go similarity index 100% rename from buildengine/engine.go rename to internal/buildengine/engine.go diff --git a/buildengine/engine_test.go b/internal/buildengine/engine_test.go similarity index 98% rename from buildengine/engine_test.go rename to internal/buildengine/engine_test.go index 1c0b22bc54..4ab7cd73b4 100644 --- a/buildengine/engine_test.go +++ b/internal/buildengine/engine_test.go @@ -7,7 +7,7 @@ import ( "github.com/alecthomas/assert/v2" "github.com/TBD54566975/ftl/backend/schema" - "github.com/TBD54566975/ftl/buildengine" + "github.com/TBD54566975/ftl/internal/buildengine" "github.com/TBD54566975/ftl/internal/log" ) diff --git a/buildengine/filehash.go b/internal/buildengine/filehash.go similarity index 100% rename from buildengine/filehash.go rename to internal/buildengine/filehash.go diff --git a/buildengine/filehash_test.go b/internal/buildengine/filehash_test.go similarity index 100% rename from buildengine/filehash_test.go rename to internal/buildengine/filehash_test.go diff --git a/buildengine/module.go b/internal/buildengine/module.go similarity index 100% rename from buildengine/module.go rename to internal/buildengine/module.go diff --git a/buildengine/stubs.go b/internal/buildengine/stubs.go similarity index 100% rename from buildengine/stubs.go rename to internal/buildengine/stubs.go diff --git a/buildengine/stubs_test.go b/internal/buildengine/stubs_test.go similarity index 100% rename from buildengine/stubs_test.go rename to internal/buildengine/stubs_test.go diff --git a/buildengine/testdata/alpha/alpha.go b/internal/buildengine/testdata/alpha/alpha.go similarity index 100% rename from buildengine/testdata/alpha/alpha.go rename to internal/buildengine/testdata/alpha/alpha.go diff --git a/buildengine/testdata/alpha/ftl.toml b/internal/buildengine/testdata/alpha/ftl.toml similarity index 100% rename from buildengine/testdata/alpha/ftl.toml rename to internal/buildengine/testdata/alpha/ftl.toml diff --git a/buildengine/testdata/alpha/go.mod b/internal/buildengine/testdata/alpha/go.mod similarity index 100% rename from buildengine/testdata/alpha/go.mod rename to internal/buildengine/testdata/alpha/go.mod diff --git a/buildengine/testdata/alpha/go.sum b/internal/buildengine/testdata/alpha/go.sum similarity index 100% rename from buildengine/testdata/alpha/go.sum rename to internal/buildengine/testdata/alpha/go.sum diff --git a/buildengine/testdata/alpha/pkg/pkg.go b/internal/buildengine/testdata/alpha/pkg/pkg.go similarity index 100% rename from buildengine/testdata/alpha/pkg/pkg.go rename to internal/buildengine/testdata/alpha/pkg/pkg.go diff --git a/buildengine/testdata/alphakotlin/src/main/kotlin/ftl/alpha/Alpha.kt b/internal/buildengine/testdata/alphakotlin/src/main/kotlin/ftl/alpha/Alpha.kt similarity index 100% rename from buildengine/testdata/alphakotlin/src/main/kotlin/ftl/alpha/Alpha.kt rename to internal/buildengine/testdata/alphakotlin/src/main/kotlin/ftl/alpha/Alpha.kt diff --git a/buildengine/testdata/another/another.go b/internal/buildengine/testdata/another/another.go similarity index 100% rename from buildengine/testdata/another/another.go rename to internal/buildengine/testdata/another/another.go diff --git a/buildengine/testdata/another/ftl.toml b/internal/buildengine/testdata/another/ftl.toml similarity index 100% rename from buildengine/testdata/another/ftl.toml rename to internal/buildengine/testdata/another/ftl.toml diff --git a/buildengine/testdata/another/go.mod b/internal/buildengine/testdata/another/go.mod similarity index 100% rename from buildengine/testdata/another/go.mod rename to internal/buildengine/testdata/another/go.mod diff --git a/buildengine/testdata/another/go.sum b/internal/buildengine/testdata/another/go.sum similarity index 100% rename from buildengine/testdata/another/go.sum rename to internal/buildengine/testdata/another/go.sum diff --git a/buildengine/testdata/depcycle1/depcycle1.go b/internal/buildengine/testdata/depcycle1/depcycle1.go similarity index 100% rename from buildengine/testdata/depcycle1/depcycle1.go rename to internal/buildengine/testdata/depcycle1/depcycle1.go diff --git a/buildengine/testdata/depcycle1/ftl.toml b/internal/buildengine/testdata/depcycle1/ftl.toml similarity index 100% rename from buildengine/testdata/depcycle1/ftl.toml rename to internal/buildengine/testdata/depcycle1/ftl.toml diff --git a/buildengine/testdata/depcycle1/go.mod b/internal/buildengine/testdata/depcycle1/go.mod similarity index 100% rename from buildengine/testdata/depcycle1/go.mod rename to internal/buildengine/testdata/depcycle1/go.mod diff --git a/buildengine/testdata/depcycle2/depcycle2.go b/internal/buildengine/testdata/depcycle2/depcycle2.go similarity index 100% rename from buildengine/testdata/depcycle2/depcycle2.go rename to internal/buildengine/testdata/depcycle2/depcycle2.go diff --git a/buildengine/testdata/depcycle2/ftl.toml b/internal/buildengine/testdata/depcycle2/ftl.toml similarity index 100% rename from buildengine/testdata/depcycle2/ftl.toml rename to internal/buildengine/testdata/depcycle2/ftl.toml diff --git a/buildengine/testdata/depcycle2/go.mod b/internal/buildengine/testdata/depcycle2/go.mod similarity index 100% rename from buildengine/testdata/depcycle2/go.mod rename to internal/buildengine/testdata/depcycle2/go.mod diff --git a/buildengine/testdata/echokotlin/ftl.toml b/internal/buildengine/testdata/echokotlin/ftl.toml similarity index 100% rename from buildengine/testdata/echokotlin/ftl.toml rename to internal/buildengine/testdata/echokotlin/ftl.toml diff --git a/buildengine/testdata/echokotlin/pom.xml b/internal/buildengine/testdata/echokotlin/pom.xml similarity index 100% rename from buildengine/testdata/echokotlin/pom.xml rename to internal/buildengine/testdata/echokotlin/pom.xml diff --git a/buildengine/testdata/echokotlin/src/main/kotlin/ftl/echo/Echo.kt b/internal/buildengine/testdata/echokotlin/src/main/kotlin/ftl/echo/Echo.kt similarity index 100% rename from buildengine/testdata/echokotlin/src/main/kotlin/ftl/echo/Echo.kt rename to internal/buildengine/testdata/echokotlin/src/main/kotlin/ftl/echo/Echo.kt diff --git a/buildengine/testdata/external/external.go b/internal/buildengine/testdata/external/external.go similarity index 100% rename from buildengine/testdata/external/external.go rename to internal/buildengine/testdata/external/external.go diff --git a/buildengine/testdata/external/ftl.toml b/internal/buildengine/testdata/external/ftl.toml similarity index 100% rename from buildengine/testdata/external/ftl.toml rename to internal/buildengine/testdata/external/ftl.toml diff --git a/buildengine/testdata/external/go.mod b/internal/buildengine/testdata/external/go.mod similarity index 100% rename from buildengine/testdata/external/go.mod rename to internal/buildengine/testdata/external/go.mod diff --git a/buildengine/testdata/external/go.sum b/internal/buildengine/testdata/external/go.sum similarity index 100% rename from buildengine/testdata/external/go.sum rename to internal/buildengine/testdata/external/go.sum diff --git a/buildengine/testdata/externalkotlin/ftl.toml b/internal/buildengine/testdata/externalkotlin/ftl.toml similarity index 100% rename from buildengine/testdata/externalkotlin/ftl.toml rename to internal/buildengine/testdata/externalkotlin/ftl.toml diff --git a/buildengine/testdata/externalkotlin/pom.xml b/internal/buildengine/testdata/externalkotlin/pom.xml similarity index 100% rename from buildengine/testdata/externalkotlin/pom.xml rename to internal/buildengine/testdata/externalkotlin/pom.xml diff --git a/buildengine/testdata/externalkotlin/src/main/kotlin/ftl/externalkotlin/ExternalKotlin.kt b/internal/buildengine/testdata/externalkotlin/src/main/kotlin/ftl/externalkotlin/ExternalKotlin.kt similarity index 100% rename from buildengine/testdata/externalkotlin/src/main/kotlin/ftl/externalkotlin/ExternalKotlin.kt rename to internal/buildengine/testdata/externalkotlin/src/main/kotlin/ftl/externalkotlin/ExternalKotlin.kt diff --git a/buildengine/testdata/highgoversion/ftl.toml b/internal/buildengine/testdata/highgoversion/ftl.toml similarity index 100% rename from buildengine/testdata/highgoversion/ftl.toml rename to internal/buildengine/testdata/highgoversion/ftl.toml diff --git a/buildengine/testdata/highgoversion/go.mod b/internal/buildengine/testdata/highgoversion/go.mod similarity index 100% rename from buildengine/testdata/highgoversion/go.mod rename to internal/buildengine/testdata/highgoversion/go.mod diff --git a/buildengine/testdata/highgoversion/go.sum b/internal/buildengine/testdata/highgoversion/go.sum similarity index 100% rename from buildengine/testdata/highgoversion/go.sum rename to internal/buildengine/testdata/highgoversion/go.sum diff --git a/buildengine/testdata/highgoversion/highgoversion.go b/internal/buildengine/testdata/highgoversion/highgoversion.go similarity index 100% rename from buildengine/testdata/highgoversion/highgoversion.go rename to internal/buildengine/testdata/highgoversion/highgoversion.go diff --git a/buildengine/testdata/integer/ftl.toml b/internal/buildengine/testdata/integer/ftl.toml similarity index 100% rename from buildengine/testdata/integer/ftl.toml rename to internal/buildengine/testdata/integer/ftl.toml diff --git a/buildengine/testdata/integer/go.mod b/internal/buildengine/testdata/integer/go.mod similarity index 100% rename from buildengine/testdata/integer/go.mod rename to internal/buildengine/testdata/integer/go.mod diff --git a/buildengine/testdata/integer/go.sum b/internal/buildengine/testdata/integer/go.sum similarity index 100% rename from buildengine/testdata/integer/go.sum rename to internal/buildengine/testdata/integer/go.sum diff --git a/buildengine/testdata/integer/integer.go b/internal/buildengine/testdata/integer/integer.go similarity index 100% rename from buildengine/testdata/integer/integer.go rename to internal/buildengine/testdata/integer/integer.go diff --git a/buildengine/testdata/other/ftl.toml b/internal/buildengine/testdata/other/ftl.toml similarity index 100% rename from buildengine/testdata/other/ftl.toml rename to internal/buildengine/testdata/other/ftl.toml diff --git a/buildengine/testdata/other/go.mod b/internal/buildengine/testdata/other/go.mod similarity index 100% rename from buildengine/testdata/other/go.mod rename to internal/buildengine/testdata/other/go.mod diff --git a/buildengine/testdata/other/go.sum b/internal/buildengine/testdata/other/go.sum similarity index 100% rename from buildengine/testdata/other/go.sum rename to internal/buildengine/testdata/other/go.sum diff --git a/buildengine/testdata/other/other.go b/internal/buildengine/testdata/other/other.go similarity index 100% rename from buildengine/testdata/other/other.go rename to internal/buildengine/testdata/other/other.go diff --git a/buildengine/testdata/type_registry_main.go b/internal/buildengine/testdata/type_registry_main.go similarity index 100% rename from buildengine/testdata/type_registry_main.go rename to internal/buildengine/testdata/type_registry_main.go diff --git a/buildengine/topological.go b/internal/buildengine/topological.go similarity index 100% rename from buildengine/topological.go rename to internal/buildengine/topological.go diff --git a/buildengine/topological_test.go b/internal/buildengine/topological_test.go similarity index 100% rename from buildengine/topological_test.go rename to internal/buildengine/topological_test.go diff --git a/buildengine/walk.go b/internal/buildengine/walk.go similarity index 100% rename from buildengine/walk.go rename to internal/buildengine/walk.go diff --git a/buildengine/watch.go b/internal/buildengine/watch.go similarity index 100% rename from buildengine/watch.go rename to internal/buildengine/watch.go diff --git a/buildengine/watch_test.go b/internal/buildengine/watch_test.go similarity index 99% rename from buildengine/watch_test.go rename to internal/buildengine/watch_test.go index c03463e9c6..c9e8f6ad7f 100644 --- a/buildengine/watch_test.go +++ b/internal/buildengine/watch_test.go @@ -11,8 +11,8 @@ import ( "github.com/alecthomas/assert/v2" "github.com/alecthomas/types/pubsub" - . "github.com/TBD54566975/ftl/buildengine" "github.com/TBD54566975/ftl/common/moduleconfig" + . "github.com/TBD54566975/ftl/internal/buildengine" "github.com/TBD54566975/ftl/internal/log" ) diff --git a/lsp/lsp.go b/lsp/lsp.go index f909a3a063..fc1bd995b1 100644 --- a/lsp/lsp.go +++ b/lsp/lsp.go @@ -16,7 +16,7 @@ import ( "github.com/tliron/kutil/version" "github.com/TBD54566975/ftl/backend/schema" - "github.com/TBD54566975/ftl/buildengine" + "github.com/TBD54566975/ftl/internal/buildengine" ftlErrors "github.com/TBD54566975/ftl/internal/errors" "github.com/TBD54566975/ftl/internal/log" )