fix build refs to backend/schema

block · Oct 2, 2024 · 7784ab8 · 7784ab8
1 parent e0f4ef3
commit 7784ab8
Show file tree

Hide file tree

Showing 13 changed files with 15 additions and 15 deletions.
diff --git a/.go-arch-lint.yml b/.go-arch-lint.yml
@@ -8,7 +8,7 @@ components:
   internal: { in: internal/** }
   dal: { in: backend/dal/** }
   protos: { in: backend/protos/** }
-  schema: { in: backend/schema/** }
+  schema: { in: internal/schema/** }
   ftl: { in: . }
   ftl-cmd: { in: frontend/cli/ftl/** }
   go-runtime: { in: go-runtime/** }

diff --git a/Justfile b/Justfile
@@ -47,7 +47,7 @@ generate-kube-migrations:
 
 # Run "go generate" on all packages
 build-generate:
-  @mk backend/schema/aliaskind_enumer.go : backend/schema/metadataalias.go -- go generate -x ./backend/schema
+  @mk internal/schema/aliaskind_enumer.go : internal/schema/metadataalias.go -- go generate -x ./internal/schema
   @mk internal/log/log_level_string.go : internal/log/api.go -- go generate -x ./internal/log
 
 # Build command-line tools
@@ -129,7 +129,7 @@ pnpm-install:
 
 # Regenerate protos
 build-protos: pnpm-install
-  @mk {{SCHEMA_OUT}} : backend/schema -- "ftl-schema > {{SCHEMA_OUT}} && buf format -w && buf lint"
+  @mk {{SCHEMA_OUT}} : internal/schema -- "ftl-schema > {{SCHEMA_OUT}} && buf format -w && buf lint"
   @mk {{PROTOS_OUT}} : {{PROTOS_IN}} -- "cd backend/protos && buf generate"
 
 # Unconditionally rebuild protos

diff --git a/backend/controller/cronjobs/internal/sql/models.go b/backend/controller/cronjobs/internal/sql/models.go
diff --git a/backend/controller/dal/internal/sql/models.go b/backend/controller/dal/internal/sql/models.go
diff --git a/backend/controller/dal/internal/sql/querier.go b/backend/controller/dal/internal/sql/querier.go
diff --git a/backend/controller/dal/internal/sql/queries.sql.go b/backend/controller/dal/internal/sql/queries.sql.go
diff --git a/backend/controller/pubsub/internal/sql/queries.sql.go b/backend/controller/pubsub/internal/sql/queries.sql.go
diff --git a/backend/protos/xyz/block/ftl/v1/schema/schema.pb.go b/backend/protos/xyz/block/ftl/v1/schema/schema.pb.go
diff --git a/backend/protos/xyz/block/ftl/v1/schema/schema.proto b/backend/protos/xyz/block/ftl/v1/schema/schema.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-// This file is generated by github.com/TBD54566975/ftl/backend/schema/protobuf.go, DO NOT MODIFY
+// This file is generated by github.com/TBD54566975/ftl/internal/schema/protobuf.go, DO NOT MODIFY
 package xyz.block.ftl.v1.schema;
 
 import "xyz/block/ftl/v1/schema/runtime.proto";

diff --git a/frontend/console/src/features/modules/schema/schema.utils.ts b/frontend/console/src/features/modules/schema/schema.utils.ts
@@ -50,7 +50,7 @@ export const declTypeMultiselectOpts = [
   },
 ]
 
-// Keep these in sync with backend/schema/module.go#L86-L95
+// Keep these in sync with internal/schema/module.go#L86-L95
 const skipNewLineDeclTypes = ['config', 'secret', 'database', 'topic', 'subscription', 'typealias']
 const skipGapAfterTypes: { [key: string]: string[] } = {
   secret: ['config'],

diff --git a/frontend/console/src/protos/xyz/block/ftl/v1/schema/schema_pb.ts b/frontend/console/src/protos/xyz/block/ftl/v1/schema/schema_pb.ts
diff --git a/internal/schema/protobuf.go b/internal/schema/protobuf.go
@@ -27,7 +27,7 @@ func ProtobufSchema() string {
 	w := &strings.Builder{}
 	fmt.Fprintf(w, `syntax = "proto3";
 
-// This file is generated by github.com/TBD54566975/ftl/backend/schema/protobuf.go, DO NOT MODIFY
+// This file is generated by github.com/TBD54566975/ftl/internal/schema/protobuf.go, DO NOT MODIFY
 package xyz.block.ftl.v1.schema;
 
 import "xyz/block/ftl/v1/schema/runtime.proto";

diff --git a/sqlc.yaml b/sqlc.yaml
@@ -36,7 +36,7 @@ sql:
             go_type:
               type: "optional.Option[sqltypes.Duration]"
           - db_type: "module_schema_pb"
-            go_type: "*github.com/TBD54566975/ftl/backend/schema.Module"
+            go_type: "*github.com/TBD54566975/ftl/internal/schema.Module"
           - db_type: "timestamptz"
             nullable: true
             go_type: "github.com/TBD54566975/ftl/backend/controller/sql/sqltypes.OptionalTime"
@@ -50,7 +50,7 @@ sql:
             go_type:
               type: "optional.Option[model.RunnerKey]"
           - db_type: "schema_ref"
-            go_type: "github.com/TBD54566975/ftl/backend/schema.RefKey"
+            go_type: "github.com/TBD54566975/ftl/internal/schema.RefKey"
           - db_type: "schema_ref"
             nullable: true
             go_type: