Merge branch 'main' into jonathanj/local-oci

.github/actions/build-cache/action.yml

@@ -26,7 +26,9 @@ runs:
       id: cache-maven
       uses: actions/cache/restore@v4
       with:
-        path: ~/.m2/repository
+        path: |
+          ~/.m2/repository
+          **SNAPSHOT**
         key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
         restore-keys: |
           ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

.gitignore

@@ -23,16 +23,17 @@ testdata/**/go.work
 testdata/**/go.work.sum
 **/testdata/**/ftl-module-schema/
 **/examples/**/ftl-module-schema/**/*
+**/smoketest/**/ftl-module-schema/**/*
 go-runtime/schema/testdata/test/test.go
 .cache
 
 # Leaving old _ftl for now to avoid old stuff getting checked in
 **/testdata/**/_ftl
 **/examples/**/_ftl
-**/types.ftl.go
-!go-runtime/ftl/ftltest/testdata/go/verbtypes/types.ftl.go
+**/smoketest/**/_ftl
 **/testdata/**/.ftl
 **/examples/**/.ftl
+**/smoketest/**/.ftl
 /.ftl
 
 buildengine/.gitignore

CODEOWNERS

@@ -1,3 +1,13 @@
 # Members of ftl-reviewers will be round-robined per the code review settings in the team profile:
 #   https://github.com/orgs/TBD54566975/teams/ftl-reviewers/edit/review_assignment
-*       @TBD54566975/ftl-reviewers @alecthomas
+
+# By default ftl-reviewers will be added to all PRs.
+*                @TBD54566975/ftl-reviewers @alecthomas
+
+# Below are team-specific overrides. These should supercede the default ftl-reviewers team.
+frontend/        @TBD54566975/ftl-frontend-team
+pnpm-*           @TBD54566975/ftl-frontend-team
+rust-runtime/    @gak
+go-runtime/      @TBD54566975/ftl-go-team
+jvm-runtime/     @TBD54566975/ftl-jvm-team
+deployment/      @TBD54566975/ftl-infra-team

backend/controller/admin/local_client.go

@@ -47,9 +47,10 @@ func (s *diskSchemaRetriever) GetActiveSchema(ctx context.Context) (*schema.Sche
 
 	sch := &schema.Schema{}
 	for _, m := range modules {
-		schemaPath := m.Config.Abs().Schema
+		config := m.Abs()
+		schemaPath := config.Schema()
 		if r, ok := s.deployRoot.Get(); ok {
-			schemaPath = filepath.Join(r, m.Config.Module, m.Config.DeployDir, m.Config.Schema)
+			schemaPath = filepath.Join(r, m.Module, m.DeployDir, m.Schema())
 		}
 
 		module, err := schema.ModuleFromProtoFile(schemaPath)

backend/controller/admin/testdata/go/dischema/go.mod

@@ -2,40 +2,48 @@ module ftl/dischema
 
 go 1.23.0
 
-require github.com/TBD54566975/ftl v1.1.5
+require github.com/TBD54566975/ftl v0.0.0-00010101000000-000000000000
 
 require (
-	connectrpc.com/connect v1.16.1 // indirect
+	connectrpc.com/connect v1.16.2 // indirect
 	connectrpc.com/grpcreflect v1.2.0 // indirect
-	connectrpc.com/otelconnect v0.7.0 // indirect
+	connectrpc.com/otelconnect v0.7.1 // indirect
+	github.com/XSAM/otelsql v0.34.0 // indirect
+	github.com/alecthomas/atomic v0.1.0-alpha2 // indirect
 	github.com/alecthomas/concurrency v0.0.2 // indirect
 	github.com/alecthomas/participle/v2 v2.1.1 // indirect
 	github.com/alecthomas/types v0.16.0 // indirect
 	github.com/alessio/shellescape v1.4.2 // indirect
+	github.com/benbjohnson/clock v1.3.5 // indirect
 	github.com/danieljoos/wincred v1.2.0 // indirect
+	github.com/deckarep/golang-set/v2 v2.6.0 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/godbus/dbus/v5 v5.1.0 // indirect
+	github.com/hashicorp/cronexpr v1.1.2 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
-	github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
-	github.com/jackc/pgx/v5 v5.6.0 // indirect
-	github.com/jackc/puddle/v2 v2.2.1 // indirect
+	github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
+	github.com/jackc/pgx/v5 v5.7.1 // indirect
+	github.com/jackc/puddle/v2 v2.2.2 // indirect
 	github.com/jpillora/backoff v1.0.0 // indirect
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/multiformats/go-base36 v0.2.0 // indirect
-	github.com/swaggest/jsonschema-go v0.3.70 // indirect
+	github.com/puzpuzpuz/xsync/v3 v3.4.0 // indirect
+	github.com/swaggest/jsonschema-go v0.3.72 // indirect
 	github.com/swaggest/refl v1.3.0 // indirect
-	github.com/zalando/go-keyring v0.2.4 // indirect
-	go.opentelemetry.io/otel v1.27.0 // indirect
-	go.opentelemetry.io/otel/metric v1.27.0 // indirect
-	go.opentelemetry.io/otel/trace v1.27.0 // indirect
-	golang.org/x/crypto v0.23.0 // indirect
-	golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
-	golang.org/x/mod v0.17.0 // indirect
-	golang.org/x/net v0.25.0 // indirect
-	golang.org/x/sync v0.7.0 // indirect
-	golang.org/x/sys v0.20.0 // indirect
-	golang.org/x/text v0.15.0 // indirect
-	google.golang.org/protobuf v1.34.1 // indirect
+	github.com/zalando/go-keyring v0.2.5 // indirect
+	go.opentelemetry.io/otel v1.30.0 // indirect
+	go.opentelemetry.io/otel/metric v1.30.0 // indirect
+	go.opentelemetry.io/otel/trace v1.30.0 // indirect
+	golang.org/x/crypto v0.27.0 // indirect
+	golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
+	golang.org/x/mod v0.21.0 // indirect
+	golang.org/x/net v0.29.0 // indirect
+	golang.org/x/sync v0.8.0 // indirect
+	golang.org/x/sys v0.25.0 // indirect
+	golang.org/x/text v0.18.0 // indirect
+	google.golang.org/protobuf v1.34.2 // indirect
 )
+
+replace github.com/TBD54566975/ftl => ./../../../../../..