refactor: common/moduleconfig -> internal/moduleconfig

block · Aug 17, 2024 · d848348 · d848348
1 parent f609b92
commit d848348
Show file tree

Hide file tree

Showing 42 changed files with 18 additions and 18 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/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -25,14 +25,14 @@ 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"
 	"github.com/TBD54566975/ftl/internal/exec"
 	"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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 → internal/projectconfig/integration_test.go b/common/projectconfig/integration_test.go → internal/projectconfig/integration_test.go
diff --git a/common/projectconfig/projectconfig.go → internal/projectconfig/projectconfig.go b/common/projectconfig/projectconfig.go → internal/projectconfig/projectconfig.go
diff --git a/common/projectconfig/projectconfig_test.go → internal/projectconfig/projectconfig_test.go b/common/projectconfig/projectconfig_test.go → internal/projectconfig/projectconfig_test.go
diff --git a/...n/projectconfig/testdata/ftl-project.toml → ...l/projectconfig/testdata/ftl-project.toml b/...n/projectconfig/testdata/ftl-project.toml → ...l/projectconfig/testdata/ftl-project.toml
diff --git a/...nfig/testdata/go/configs-ftl-project.toml → ...nfig/testdata/go/configs-ftl-project.toml b/...nfig/testdata/go/configs-ftl-project.toml → ...nfig/testdata/go/configs-ftl-project.toml
diff --git a/...on/projectconfig/testdata/go/echo/echo.go → ...al/projectconfig/testdata/go/echo/echo.go b/...on/projectconfig/testdata/go/echo/echo.go → ...al/projectconfig/testdata/go/echo/echo.go
diff --git a/...n/projectconfig/testdata/go/echo/ftl.toml → ...l/projectconfig/testdata/go/echo/ftl.toml b/...n/projectconfig/testdata/go/echo/ftl.toml → ...l/projectconfig/testdata/go/echo/ftl.toml
diff --git a/common/projectconfig/testdata/go/echo/go.mod → ...nal/projectconfig/testdata/go/echo/go.mod b/common/projectconfig/testdata/go/echo/go.mod → ...nal/projectconfig/testdata/go/echo/go.mod
diff --git a/common/projectconfig/testdata/go/echo/go.sum → ...nal/projectconfig/testdata/go/echo/go.sum b/common/projectconfig/testdata/go/echo/go.sum → ...nal/projectconfig/testdata/go/echo/go.sum
diff --git a/...nfig/testdata/go/findconfig/findconfig.go → ...nfig/testdata/go/findconfig/findconfig.go b/...nfig/testdata/go/findconfig/findconfig.go → ...nfig/testdata/go/findconfig/findconfig.go
diff --git a/...g/testdata/go/findconfig/ftl-project.toml → ...g/testdata/go/findconfig/ftl-project.toml b/...g/testdata/go/findconfig/ftl-project.toml → ...g/testdata/go/findconfig/ftl-project.toml
diff --git a/...ectconfig/testdata/go/findconfig/ftl.toml → ...ectconfig/testdata/go/findconfig/ftl.toml b/...ectconfig/testdata/go/findconfig/ftl.toml → ...ectconfig/testdata/go/findconfig/ftl.toml
diff --git a/...ojectconfig/testdata/go/findconfig/go.mod → ...ojectconfig/testdata/go/findconfig/go.mod b/...ojectconfig/testdata/go/findconfig/go.mod → ...ojectconfig/testdata/go/findconfig/go.mod
diff --git a/...ojectconfig/testdata/go/findconfig/go.sum → ...ojectconfig/testdata/go/findconfig/go.sum b/...ojectconfig/testdata/go/findconfig/go.sum → ...ojectconfig/testdata/go/findconfig/go.sum
diff --git a/...fig/testdata/go/findconfig/subdir/.keepme → ...fig/testdata/go/findconfig/subdir/.keepme b/...fig/testdata/go/findconfig/subdir/.keepme → ...fig/testdata/go/findconfig/subdir/.keepme
diff --git a/...stdata/go/no-module-dirs-ftl-project.toml → ...stdata/go/no-module-dirs-ftl-project.toml b/...stdata/go/no-module-dirs-ftl-project.toml → ...stdata/go/no-module-dirs-ftl-project.toml
diff --git a/...data/go/validate-configs-ftl-project.toml → ...data/go/validate-configs-ftl-project.toml b/...data/go/validate-configs-ftl-project.toml → ...data/go/validate-configs-ftl-project.toml
diff --git a/...stdata/go/validateconfig/ftl-project.toml → ...stdata/go/validateconfig/ftl-project.toml b/...stdata/go/validateconfig/ftl-project.toml → ...stdata/go/validateconfig/ftl-project.toml
diff --git a/...onfig/testdata/go/validateconfig/ftl.toml → ...onfig/testdata/go/validateconfig/ftl.toml b/...onfig/testdata/go/validateconfig/ftl.toml → ...onfig/testdata/go/validateconfig/ftl.toml
diff --git a/...tconfig/testdata/go/validateconfig/go.mod → ...tconfig/testdata/go/validateconfig/go.mod b/...tconfig/testdata/go/validateconfig/go.mod → ...tconfig/testdata/go/validateconfig/go.mod
diff --git a/...tconfig/testdata/go/validateconfig/go.sum → ...tconfig/testdata/go/validateconfig/go.sum b/...tconfig/testdata/go/validateconfig/go.sum → ...tconfig/testdata/go/validateconfig/go.sum
diff --git a/...tdata/go/validateconfig/validateconfig.go → ...tdata/go/validateconfig/validateconfig.go b/...tdata/go/validateconfig/validateconfig.go → ...tdata/go/validateconfig/validateconfig.go
diff --git a/.../testdata/withMinVersion/ftl-project.toml → .../testdata/withMinVersion/ftl-project.toml b/.../testdata/withMinVersion/ftl-project.toml → .../testdata/withMinVersion/ftl-project.toml
diff --git a/common/projectconfig/url.go → internal/projectconfig/url.go b/common/projectconfig/url.go → internal/projectconfig/url.go