chore: statically extract .proto from Go source

TBD54566975 · Oct 3, 2024 · 5c8e41f · 5c8e41f
1 parent ede3a5a
commit 5c8e41f
Show file tree

Hide file tree

Showing 59 changed files with 2,107 additions and 1,692 deletions.
diff --git a/.go-arch-lint.yml b/.go-arch-lint.yml
@@ -19,7 +19,7 @@ components:
   frontend: { in: frontend/console/** }
   ftl-gen-lsp-cmd: { in: cmd/ftl-gen-lsp/** }
   ftl-initdb-cmd: { in: cmd/ftl-initdb/** }
-  ftl-schema-cmd: { in: cmd/ftl-schema/** }
+  go2proto: { in: cmd/go2proto/** }
   lint-commit-or-rollback-cmd: { in: cmd/lint-commit-or-rollback/** }
   databasetesting: { in: backend/controller/sql/databasetesting/** }
   sql: { in: backend/controller/sql/** }

diff --git a/.golangci.yml b/.golangci.yml
@@ -101,7 +101,6 @@ linters-settings:
   #   ignorePackageGlobs:
   #     - github.com/TBD54566975/ftl/*
   spancheck:
-
     extra-start-span-signatures:
       - "github.com/TBD54566975/ftl/backend/controller/observability.BeginSpan:opentelemetry"
 issues:

diff --git a/Justfile b/Justfile
@@ -129,12 +129,12 @@ pnpm-install:
 
 # Regenerate protos
 build-protos: pnpm-install
-  @mk {{SCHEMA_OUT}} : internal/schema -- "ftl-schema > {{SCHEMA_OUT}} && buf format -w && buf lint"
+  @mk {{SCHEMA_OUT}} : internal/schema -- "go2proto -o "{{SCHEMA_OUT}}" -g 'github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1/schema;schemapb' xyz.block.ftl.v1.schema ./internal/schema.Schema && buf format -w && buf lint"
   @mk {{PROTOS_OUT}} : {{PROTOS_IN}} -- "cd backend/protos && buf generate"
 
 # Unconditionally rebuild protos
 build-protos-unconditionally: pnpm-install
-  ftl-schema > {{SCHEMA_OUT}} && buf format -w && buf lint
+  go2proto -o "{{SCHEMA_OUT}}" -g 'github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1/schema;schemapb' xyz.block.ftl.v1.schema ./internal/schema.Schema && buf format -w && buf lint
   cd backend/protos && buf generate
 
 # Run integration test(s)

diff --git a/backend/controller/ingress/ingress_test.go b/backend/controller/ingress/ingress_test.go
@@ -119,7 +119,7 @@ func TestValidation(t *testing.T) {
 		{name: "IntAlias",
 			schema: `module test {
 			typealias IntAlias Int
-			data Test { intValue test.IntAlias } 
+			data Test { intValue test.IntAlias }
 			}`,
 			request: obj{"intValue": 10.0},
 		},
@@ -245,7 +245,7 @@ func TestResponseBodyForVerb(t *testing.T) {
 					&schema.Data{
 						Name: "Test",
 						Fields: []*schema.Field{
-							{Name: "message", Type: &schema.String{}, Metadata: []schema.Metadata{&schema.MetadataAlias{Kind: schema.AliasKindJSON, Alias: "msg"}}},
+							{Name: "message", Type: &schema.String{}, Metadata: []schema.Metadata{&schema.MetadataAlias{Kind: schema.AliasKindJson, Alias: "msg"}}},
 						},
 					},
 					jsonVerb,

diff --git a/backend/controller/ingress/request.go b/backend/controller/ingress/request.go
@@ -312,7 +312,7 @@ func parseQueryParams(values url.Values, data *schema.Data) (map[string]any, err
 
 		var field *schema.Field
 		for _, f := range data.Fields {
-			if jsonAlias, ok := f.Alias(schema.AliasKindJSON).Get(); (ok && jsonAlias == key) || f.Name == key {
+			if jsonAlias, ok := f.Alias(schema.AliasKindJson).Get(); (ok && jsonAlias == key) || f.Name == key {
 				field = f
 			}
 			for _, typeParam := range data.TypeParameters {

diff --git a/backend/controller/ingress/response.go b/backend/controller/ingress/response.go
@@ -80,7 +80,7 @@ func bodyForType(typ schema.Type, sch *schema.Schema, data []byte) ([]byte, erro
 		}
 
 		err = schema.TransformAliasedFields(sch, t, response, func(obj map[string]any, field *schema.Field) string {
-			if jsonAlias, ok := field.Alias(schema.AliasKindJSON).Get(); ok && field.Name != jsonAlias {
+			if jsonAlias, ok := field.Alias(schema.AliasKindJson).Get(); ok && field.Name != jsonAlias {
 				obj[jsonAlias] = obj[field.Name]
 				delete(obj, field.Name)
 				return jsonAlias