feat: persist kotlin schemas during deploy (#507)

TBD54566975 · Oct 19, 2023 · 9d0efcc · 9d0efcc
1 parent daaf45c
commit 9d0efcc
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 9 deletions.
diff --git a/cmd/ftl/cmd_deploy.go b/cmd/ftl/cmd_deploy.go
@@ -9,6 +9,7 @@ import (
 	"connectrpc.com/connect"
 	"github.com/alecthomas/errors"
 	"golang.org/x/exp/maps"
+	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/types/known/timestamppb"
 
 	"github.com/TBD54566975/ftl/backend/common/log"
@@ -53,6 +54,31 @@ func (d *deployCmd) Run(ctx context.Context, client ftlv1connect.ControllerServi
 		return errors.WithStack(err)
 	}
 
+	schema, err := findFiles(d.Base, []string{config.Module})
+	if err != nil {
+		return errors.WithStack(err)
+	}
+
+	if len(schema) != 1 {
+		return errors.Errorf("cannot define multiple module schemas")
+	}
+
+	content, err := os.ReadFile(schema[0])
+	if err != nil {
+		return errors.WithStack(err)
+	}
+
+	module := schemapb.Module{}
+	err = proto.Unmarshal(content, &module)
+	if err != nil {
+		return errors.WithStack(err)
+	}
+	module.Runtime = &schemapb.ModuleRuntime{
+		CreateTime:  timestamppb.Now(),
+		Language:    config.Language,
+		MinReplicas: d.Replicas,
+	}
+
 	logger.Infof("Uploading %d/%d files", len(gadResp.Msg.MissingDigests), len(files))
 	for _, missing := range gadResp.Msg.MissingDigests {
 		file := filesByHash[missing]
@@ -71,14 +97,7 @@ func (d *deployCmd) Run(ctx context.Context, client ftlv1connect.ControllerServi
 	}
 	resp, err := client.CreateDeployment(ctx, connect.NewRequest(&ftlv1.CreateDeploymentRequest{
 		// TODO(aat): Use real data for this.
-		Schema: &schemapb.Module{
-			Name: config.Module,
-			Runtime: &schemapb.ModuleRuntime{
-				CreateTime:  timestamppb.Now(),
-				Language:    config.Language,
-				MinReplicas: d.Replicas,
-			},
-		},
+		Schema: &module,
 		Artefacts: slices.Map(maps.Values(filesByHash), func(a deploymentArtefact) *ftlv1.DeploymentArtefact {
 			return a.DeploymentArtefact
 		}),

diff --git a/kotlin-runtime/ftl-runtime/src/main/kotlin/xyz/block/ftl/ksp/SchemaExtractor.kt b/kotlin-runtime/ftl-runtime/src/main/kotlin/xyz/block/ftl/ksp/SchemaExtractor.kt
@@ -153,7 +153,7 @@ class Visitor(val logger: KSPLogger, val modules: MutableMap<String, ModuleData>
 class SchemaExtractor(val logger: KSPLogger, val options: Map<String, String>) : SymbolProcessor {
   override fun process(resolver: Resolver): List<KSAnnotated> {
     val dest = requireNotNull(options["dest"]) { "Must provide output directory for generated schemas" }
-    val outputDirectory = File(dest, "generated-sources/ksp").also { Path.of(it.absolutePath).createDirectories() }
+    val outputDirectory = File(dest).also { Path.of(it.absolutePath).createDirectories() }
     val modules = mutableMapOf<String, ModuleData>()
 
     val symbols = resolver.getSymbolsWithAnnotation("xyz.block.ftl.Verb")