refactor: move buildengine into internal/buildengine

block · Aug 17, 2024 · 1915ffb · 1915ffb
1 parent 147a1f2
commit 1915ffb
Show file tree

Hide file tree

Showing 74 changed files with 12 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 → internal/buildengine/build.go b/buildengine/build.go → internal/buildengine/build.go
diff --git a/buildengine/build_go.go → internal/buildengine/build_go.go b/buildengine/build_go.go → internal/buildengine/build_go.go
diff --git a/buildengine/build_go_test.go → internal/buildengine/build_go_test.go b/buildengine/build_go_test.go → internal/buildengine/build_go_test.go
diff --git a/buildengine/build_java.go → internal/buildengine/build_java.go b/buildengine/build_java.go → internal/buildengine/build_java.go
diff --git a/buildengine/build_rust.go → internal/buildengine/build_rust.go b/buildengine/build_rust.go → internal/buildengine/build_rust.go
diff --git a/buildengine/build_test.go → internal/buildengine/build_test.go b/buildengine/build_test.go → internal/buildengine/build_test.go
diff --git a/buildengine/deploy.go → internal/buildengine/deploy.go b/buildengine/deploy.go → internal/buildengine/deploy.go
diff --git a/buildengine/deploy_test.go → internal/buildengine/deploy_test.go b/buildengine/deploy_test.go → internal/buildengine/deploy_test.go
diff --git a/buildengine/deps.go → internal/buildengine/deps.go b/buildengine/deps.go → internal/buildengine/deps.go
diff --git a/buildengine/deps_test.go → internal/buildengine/deps_test.go b/buildengine/deps_test.go → internal/buildengine/deps_test.go
diff --git a/buildengine/discover.go → internal/buildengine/discover.go b/buildengine/discover.go → internal/buildengine/discover.go
diff --git a/buildengine/discover_test.go → internal/buildengine/discover_test.go b/buildengine/discover_test.go → internal/buildengine/discover_test.go
diff --git a/buildengine/docs.go → internal/buildengine/docs.go b/buildengine/docs.go → internal/buildengine/docs.go
diff --git a/buildengine/engine.go → internal/buildengine/engine.go b/buildengine/engine.go → internal/buildengine/engine.go
diff --git a/buildengine/engine_test.go → internal/buildengine/engine_test.go b/buildengine/engine_test.go → 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 → internal/buildengine/filehash.go b/buildengine/filehash.go → internal/buildengine/filehash.go
diff --git a/buildengine/filehash_test.go → internal/buildengine/filehash_test.go b/buildengine/filehash_test.go → internal/buildengine/filehash_test.go
diff --git a/buildengine/module.go → internal/buildengine/module.go b/buildengine/module.go → internal/buildengine/module.go
diff --git a/buildengine/stubs.go → internal/buildengine/stubs.go b/buildengine/stubs.go → internal/buildengine/stubs.go
diff --git a/buildengine/stubs_test.go → internal/buildengine/stubs_test.go b/buildengine/stubs_test.go → internal/buildengine/stubs_test.go
diff --git a/buildengine/testdata/alpha/alpha.go → internal/buildengine/testdata/alpha/alpha.go b/buildengine/testdata/alpha/alpha.go → internal/buildengine/testdata/alpha/alpha.go
diff --git a/buildengine/testdata/alpha/ftl.toml → internal/buildengine/testdata/alpha/ftl.toml b/buildengine/testdata/alpha/ftl.toml → internal/buildengine/testdata/alpha/ftl.toml
diff --git a/buildengine/testdata/alpha/go.mod → internal/buildengine/testdata/alpha/go.mod b/buildengine/testdata/alpha/go.mod → internal/buildengine/testdata/alpha/go.mod
diff --git a/buildengine/testdata/alpha/go.sum → internal/buildengine/testdata/alpha/go.sum b/buildengine/testdata/alpha/go.sum → internal/buildengine/testdata/alpha/go.sum
diff --git a/buildengine/testdata/alpha/pkg/pkg.go → ...nal/buildengine/testdata/alpha/pkg/pkg.go b/buildengine/testdata/alpha/pkg/pkg.go → ...nal/buildengine/testdata/alpha/pkg/pkg.go
diff --git a/...kotlin/src/main/kotlin/ftl/alpha/Alpha.kt → ...kotlin/src/main/kotlin/ftl/alpha/Alpha.kt b/...kotlin/src/main/kotlin/ftl/alpha/Alpha.kt → ...kotlin/src/main/kotlin/ftl/alpha/Alpha.kt
diff --git a/buildengine/testdata/another/another.go → ...l/buildengine/testdata/another/another.go b/buildengine/testdata/another/another.go → ...l/buildengine/testdata/another/another.go
diff --git a/buildengine/testdata/another/ftl.toml → ...nal/buildengine/testdata/another/ftl.toml b/buildengine/testdata/another/ftl.toml → ...nal/buildengine/testdata/another/ftl.toml
diff --git a/buildengine/testdata/another/go.mod → internal/buildengine/testdata/another/go.mod b/buildengine/testdata/another/go.mod → internal/buildengine/testdata/another/go.mod
diff --git a/buildengine/testdata/another/go.sum → internal/buildengine/testdata/another/go.sum b/buildengine/testdata/another/go.sum → internal/buildengine/testdata/another/go.sum
diff --git a/buildengine/testdata/depcycle1/depcycle1.go → ...ildengine/testdata/depcycle1/depcycle1.go b/buildengine/testdata/depcycle1/depcycle1.go → ...ildengine/testdata/depcycle1/depcycle1.go
diff --git a/buildengine/testdata/depcycle1/ftl.toml → ...l/buildengine/testdata/depcycle1/ftl.toml b/buildengine/testdata/depcycle1/ftl.toml → ...l/buildengine/testdata/depcycle1/ftl.toml
diff --git a/buildengine/testdata/depcycle1/go.mod → ...nal/buildengine/testdata/depcycle1/go.mod b/buildengine/testdata/depcycle1/go.mod → ...nal/buildengine/testdata/depcycle1/go.mod
diff --git a/buildengine/testdata/depcycle2/depcycle2.go → ...ildengine/testdata/depcycle2/depcycle2.go b/buildengine/testdata/depcycle2/depcycle2.go → ...ildengine/testdata/depcycle2/depcycle2.go
diff --git a/buildengine/testdata/depcycle2/ftl.toml → ...l/buildengine/testdata/depcycle2/ftl.toml b/buildengine/testdata/depcycle2/ftl.toml → ...l/buildengine/testdata/depcycle2/ftl.toml
diff --git a/buildengine/testdata/depcycle2/go.mod → ...nal/buildengine/testdata/depcycle2/go.mod b/buildengine/testdata/depcycle2/go.mod → ...nal/buildengine/testdata/depcycle2/go.mod
diff --git a/buildengine/testdata/echokotlin/ftl.toml → .../buildengine/testdata/echokotlin/ftl.toml b/buildengine/testdata/echokotlin/ftl.toml → .../buildengine/testdata/echokotlin/ftl.toml
diff --git a/buildengine/testdata/echokotlin/pom.xml → ...l/buildengine/testdata/echokotlin/pom.xml b/buildengine/testdata/echokotlin/pom.xml → ...l/buildengine/testdata/echokotlin/pom.xml
diff --git a/...hokotlin/src/main/kotlin/ftl/echo/Echo.kt → ...hokotlin/src/main/kotlin/ftl/echo/Echo.kt b/...hokotlin/src/main/kotlin/ftl/echo/Echo.kt → ...hokotlin/src/main/kotlin/ftl/echo/Echo.kt
diff --git a/buildengine/testdata/external/external.go → ...buildengine/testdata/external/external.go b/buildengine/testdata/external/external.go → ...buildengine/testdata/external/external.go
diff --git a/buildengine/testdata/external/ftl.toml → ...al/buildengine/testdata/external/ftl.toml b/buildengine/testdata/external/ftl.toml → ...al/buildengine/testdata/external/ftl.toml
diff --git a/buildengine/testdata/external/go.mod → ...rnal/buildengine/testdata/external/go.mod b/buildengine/testdata/external/go.mod → ...rnal/buildengine/testdata/external/go.mod
diff --git a/buildengine/testdata/external/go.sum → ...rnal/buildengine/testdata/external/go.sum b/buildengine/testdata/external/go.sum → ...rnal/buildengine/testdata/external/go.sum
diff --git a/buildengine/testdata/externalkotlin/ftl.toml → ...ldengine/testdata/externalkotlin/ftl.toml b/buildengine/testdata/externalkotlin/ftl.toml → ...ldengine/testdata/externalkotlin/ftl.toml
diff --git a/buildengine/testdata/externalkotlin/pom.xml → ...ildengine/testdata/externalkotlin/pom.xml b/buildengine/testdata/externalkotlin/pom.xml → ...ildengine/testdata/externalkotlin/pom.xml
diff --git a/...tlin/ftl/externalkotlin/ExternalKotlin.kt → ...tlin/ftl/externalkotlin/ExternalKotlin.kt b/...tlin/ftl/externalkotlin/ExternalKotlin.kt → ...tlin/ftl/externalkotlin/ExternalKotlin.kt
diff --git a/buildengine/testdata/highgoversion/ftl.toml → ...ildengine/testdata/highgoversion/ftl.toml b/buildengine/testdata/highgoversion/ftl.toml → ...ildengine/testdata/highgoversion/ftl.toml
diff --git a/buildengine/testdata/highgoversion/go.mod → ...buildengine/testdata/highgoversion/go.mod b/buildengine/testdata/highgoversion/go.mod → ...buildengine/testdata/highgoversion/go.mod
diff --git a/buildengine/testdata/highgoversion/go.sum → ...buildengine/testdata/highgoversion/go.sum b/buildengine/testdata/highgoversion/go.sum → ...buildengine/testdata/highgoversion/go.sum
diff --git a/...e/testdata/highgoversion/highgoversion.go → ...e/testdata/highgoversion/highgoversion.go b/...e/testdata/highgoversion/highgoversion.go → ...e/testdata/highgoversion/highgoversion.go
diff --git a/buildengine/testdata/integer/ftl.toml → ...nal/buildengine/testdata/integer/ftl.toml b/buildengine/testdata/integer/ftl.toml → ...nal/buildengine/testdata/integer/ftl.toml
diff --git a/buildengine/testdata/integer/go.mod → internal/buildengine/testdata/integer/go.mod b/buildengine/testdata/integer/go.mod → internal/buildengine/testdata/integer/go.mod
diff --git a/buildengine/testdata/integer/go.sum → internal/buildengine/testdata/integer/go.sum b/buildengine/testdata/integer/go.sum → internal/buildengine/testdata/integer/go.sum
diff --git a/buildengine/testdata/integer/integer.go → ...l/buildengine/testdata/integer/integer.go b/buildengine/testdata/integer/integer.go → ...l/buildengine/testdata/integer/integer.go
diff --git a/buildengine/testdata/other/ftl.toml → internal/buildengine/testdata/other/ftl.toml b/buildengine/testdata/other/ftl.toml → internal/buildengine/testdata/other/ftl.toml
diff --git a/buildengine/testdata/other/go.mod → internal/buildengine/testdata/other/go.mod b/buildengine/testdata/other/go.mod → internal/buildengine/testdata/other/go.mod
diff --git a/buildengine/testdata/other/go.sum → internal/buildengine/testdata/other/go.sum b/buildengine/testdata/other/go.sum → internal/buildengine/testdata/other/go.sum
diff --git a/buildengine/testdata/other/other.go → internal/buildengine/testdata/other/other.go b/buildengine/testdata/other/other.go → internal/buildengine/testdata/other/other.go
diff --git a/buildengine/testdata/type_registry_main.go → ...uildengine/testdata/type_registry_main.go b/buildengine/testdata/type_registry_main.go → ...uildengine/testdata/type_registry_main.go
diff --git a/buildengine/topological.go → internal/buildengine/topological.go b/buildengine/topological.go → internal/buildengine/topological.go
diff --git a/buildengine/topological_test.go → internal/buildengine/topological_test.go b/buildengine/topological_test.go → internal/buildengine/topological_test.go
diff --git a/buildengine/walk.go → internal/buildengine/walk.go b/buildengine/walk.go → internal/buildengine/walk.go
diff --git a/buildengine/watch.go → internal/buildengine/watch.go b/buildengine/watch.go → internal/buildengine/watch.go
diff --git a/buildengine/watch_test.go → internal/buildengine/watch_test.go b/buildengine/watch_test.go → 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
@@ -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"
 )
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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 => ../../../../..