refactor: attempt to rename grpc so v is trailing

Justfile

@@ -5,13 +5,13 @@ WATCHEXEC_ARGS := "-d 1s -e proto -e go -e sql -f sqlc.yaml --ignore **/types.ft
 RELEASE := "build/release"
 VERSION := `git describe --tags --always | sed -e 's/^v//'`
 TIMESTAMP := `date +%s`
-SCHEMA_OUT := "backend/protos/xyz/block/ftl/v1/schema/schema.proto"
+SCHEMA_OUT := "backend/protos/xyz/block/ftl/schema/v1/schema.proto"
 ZIP_DIRS := "go-runtime/compile/build-template go-runtime/compile/external-module-template go-runtime/compile/main-work-template internal/projectinit/scaffolding go-runtime/scaffolding jvm-runtime/java/scaffolding jvm-runtime/kotlin/scaffolding python-runtime/compile/build-template python-runtime/compile/external-module-template python-runtime/scaffolding"
 CONSOLE_ROOT := "frontend/console"
 FRONTEND_OUT := CONSOLE_ROOT + "/dist/index.html"
 EXTENSION_OUT := "frontend/vscode/dist/extension.js"
-PROTOS_IN := "backend/protos/xyz/block/ftl/v1/schema/schema.proto backend/protos/xyz/block/ftl/v1/console/console.proto backend/protos/xyz/block/ftl/v1/ftl.proto"
-PROTOS_OUT := "backend/protos/xyz/block/ftl/v1/console/console.pb.go backend/protos/xyz/block/ftl/v1/ftl.pb.go backend/protos/xyz/block/ftl/v1/schema/schema.pb.go " + CONSOLE_ROOT + "/src/protos/xyz/block/ftl/v1/console/console_pb.ts " + CONSOLE_ROOT + "/src/protos/xyz/block/ftl/v1/ftl_pb.ts " + CONSOLE_ROOT + "/src/protos/xyz/block/ftl/v1/schema/runtime_pb.ts " + CONSOLE_ROOT + "/src/protos/xyz/block/ftl/v1/schema/schema_pb.ts"
+PROTOS_IN := "backend/protos/xyz/block/ftl/schema/v1/schema.proto backend/protos/xyz/block/ftl/console/v1/console.proto backend/protos/xyz/block/ftl/v1/ftl.proto"
+PROTOS_OUT := "backend/protos/xyz/block/ftl/console/v1/console.pb.go backend/protos/xyz/block/ftl/v1/ftl.pb.go backend/protos/xyz/block/ftl/schema/v1/schema.pb.go " + CONSOLE_ROOT + "/src/protos/xyz/block/ftl/console/v1/console_pb.ts " + CONSOLE_ROOT + "/src/protos/xyz/block/ftl/v1/ftl_pb.ts " + CONSOLE_ROOT + "/src/protos/xyz/block/ftl/schema/v1/runtime_pb.ts " + CONSOLE_ROOT + "/src/protos/xyz/block/ftl/schema/v1/schema_pb.ts"
 
 _help:
   @just -l
@@ -188,9 +188,9 @@ build-protos:
 # Generate .proto files from .go types.
 go2proto:
   go2proto -o "{{SCHEMA_OUT}}" \
-    -O 'go_package="github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1/schema;schemapb"' \
+    -O 'go_package="github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/schema/v1;schemapb"' \
     -O 'java_multiple_files=true' \
-    xyz.block.ftl.v1.schema ./internal/schema.Schema && buf format -w && buf lint
+    xyz.block.ftl.schema.v1 ./internal/schema.Schema && buf format -w && buf lint
 
 # Unconditionally rebuild protos
 build-protos-unconditionally: pnpm-install go2proto

backend/controller/console/console.go

@@ -15,10 +15,10 @@ import (
 	"github.com/TBD54566975/ftl/backend/controller/dal"
 	dalmodel "github.com/TBD54566975/ftl/backend/controller/dal/model"
 	"github.com/TBD54566975/ftl/backend/controller/timeline"
+	pbconsole "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/console/v1"
+	"github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/console/v1/pbconsoleconnect"
+	schemapb "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/schema/v1"
 	ftlv1 "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1"
-	pbconsole "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1/console"
-	"github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1/console/pbconsoleconnect"
-	schemapb "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1/schema"
 	"github.com/TBD54566975/ftl/internal/buildengine"
 	"github.com/TBD54566975/ftl/internal/log"
 	"github.com/TBD54566975/ftl/internal/model"

backend/controller/console/console_integration_test.go

@@ -8,7 +8,7 @@ import (
 	"connectrpc.com/connect"
 	"github.com/alecthomas/assert/v2"
 
-	pbconsole "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1/console"
+	pbconsole "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/console/v1"
 	in "github.com/TBD54566975/ftl/internal/integration"
 )
 

backend/controller/controller.go

@@ -51,10 +51,10 @@ import (
 	"github.com/TBD54566975/ftl/backend/controller/scheduledtask"
 	"github.com/TBD54566975/ftl/backend/controller/timeline"
 	"github.com/TBD54566975/ftl/backend/libdal"
+	"github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/console/v1/pbconsoleconnect"
+	schemapb "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/schema/v1"
 	ftlv1 "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1"
-	"github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1/console/pbconsoleconnect"
 	"github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1/ftlv1connect"
-	schemapb "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1/schema"
 	frontend "github.com/TBD54566975/ftl/frontend/console"
 	"github.com/TBD54566975/ftl/internal/configuration"
 	cf "github.com/TBD54566975/ftl/internal/configuration/manager"

backend/controller/encryption/integration_test.go

@@ -9,7 +9,7 @@ import (
 	"time"
 
 	"github.com/TBD54566975/ftl/backend/controller/encryption/api"
-	pbconsole "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1/console"
+	pbconsole "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/console/v1"
 	in "github.com/TBD54566975/ftl/internal/integration"
 	"github.com/TBD54566975/ftl/internal/log"
 	"github.com/TBD54566975/ftl/internal/slices"

backend/controller/ingress/handler.go

@@ -15,8 +15,8 @@ import (
 	"github.com/TBD54566975/ftl/backend/controller/observability"
 	"github.com/TBD54566975/ftl/backend/controller/timeline"
 	"github.com/TBD54566975/ftl/backend/libdal"
+	schemapb "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/schema/v1"
 	ftlv1 "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1"
-	schemapb "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1/schema"
 	"github.com/TBD54566975/ftl/internal/log"
 	"github.com/TBD54566975/ftl/internal/model"
 	"github.com/TBD54566975/ftl/internal/schema"

backend/controller/leases/lease_integration_test.go

@@ -12,8 +12,8 @@ import (
 	"github.com/alecthomas/assert/v2"
 	"golang.org/x/sync/errgroup"
 
+	schemapb "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/schema/v1"
 	ftlv1 "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1"
-	schemapb "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1/schema"
 	in "github.com/TBD54566975/ftl/internal/integration"
 )
 

backend/controller/observability/calls.go

@@ -12,7 +12,7 @@ import (
 	"go.opentelemetry.io/otel/metric/noop"
 	"go.opentelemetry.io/otel/trace"
 
-	schemapb "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1/schema"
+	schemapb "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/schema/v1"
 	"github.com/TBD54566975/ftl/internal/observability"
 	"github.com/TBD54566975/ftl/internal/schema"
 )

backend/controller/observability/ingress.go

@@ -11,7 +11,7 @@ import (
 	"go.opentelemetry.io/otel/metric"
 	"go.opentelemetry.io/otel/metric/noop"
 
-	schemapb "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1/schema"
+	schemapb "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/schema/v1"
 	"github.com/TBD54566975/ftl/internal/observability"
 	"github.com/TBD54566975/ftl/internal/schema"
 )

backend/controller/scaling/k8sscaling/deployment_provisioner.go

@@ -36,8 +36,8 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/serializer"
 	"k8s.io/client-go/kubernetes"
 
+	schemapb "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/schema/v1"
 	ftlv1 "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1"
-	schemapb "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1/schema"
 	"github.com/TBD54566975/ftl/internal/log"
 )
 

backend/controller/sql/sqltypes/sqltypes.go

@@ -9,7 +9,7 @@ import (
 	"github.com/alecthomas/types/optional"
 	"google.golang.org/protobuf/proto"
 
-	schemapb "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1/schema"
+	schemapb "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/schema/v1"
 	"github.com/TBD54566975/ftl/internal/schema"
 )
 

backend/protos/buf.yaml

@@ -1,7 +1,7 @@
 version: v1
 breaking:
   ignore:
-    - xyz/block/ftl/v1beta1
+    - xyz/block/ftl/provisioning/v1beta1
   use:
     - FILE
 lint:

backend/protos/xyz/block/ftl/v1/console/console.proto → backend/protos/xyz/block/ftl/console/v1/console.proto

@@ -1,13 +1,13 @@
 syntax = "proto3";
 
-package xyz.block.ftl.v1.console;
+package xyz.block.ftl.console.v1;
 
 import "google/protobuf/duration.proto";
 import "google/protobuf/timestamp.proto";
+import "xyz/block/ftl/schema/v1/schema.proto";
 import "xyz/block/ftl/v1/ftl.proto";
-import "xyz/block/ftl/v1/schema/schema.proto";
 
-option go_package = "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1/console;pbconsole";
+option go_package = "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/console/v1;pbconsole";
 option java_multiple_files = true;
 
 enum EventType {

backend/protos/xyz/block/ftl/v1/language/language.proto → backend/protos/xyz/block/ftl/language/v1/language.proto

@@ -1,12 +1,12 @@
 syntax = "proto3";
 
-package xyz.block.ftl.v1.language;
+package xyz.block.ftl.language.v1;
 
 import "google/protobuf/struct.proto";
+import "xyz/block/ftl/schema/v1/schema.proto";
 import "xyz/block/ftl/v1/ftl.proto";
-import "xyz/block/ftl/v1/schema/schema.proto";
 
-option go_package = "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1/language;languagepb";
+option go_package = "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/language/v1;languagepb";
 option java_multiple_files = true;
 
 // ModuleConfig contains the configuration for a module, found in the module's ftl.toml file.

backend/protos/xyz/block/ftl/v1beta1/provisioner/plugin.proto → backend/protos/xyz/block/ftl/provisioner/v1beta1/plugin.proto

@@ -1,11 +1,11 @@
 syntax = "proto3";
 
-package xyz.block.ftl.v1beta1.provisioner;
+package xyz.block.ftl.provisioner.v1beta1;
 
+import "xyz/block/ftl/provisioner/v1beta1/resource.proto";
 import "xyz/block/ftl/v1/ftl.proto";
-import "xyz/block/ftl/v1beta1/provisioner/resource.proto";
 
-option go_package = "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1beta1/provisioner;provisioner";
+option go_package = "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/provisioner/v1beta1;provisioner";
 option java_multiple_files = true;
 
 // ResourceContext is the context used to create a new resource

backend/protos/xyz/block/ftl/v1beta1/provisioner/resource.proto → backend/protos/xyz/block/ftl/provisioner/v1beta1/resource.proto

@@ -1,12 +1,12 @@
 syntax = "proto3";
 
-package xyz.block.ftl.v1beta1.provisioner;
+package xyz.block.ftl.provisioner.v1beta1;
 
 import "google/protobuf/struct.proto";
+import "xyz/block/ftl/schema/v1/schema.proto";
 import "xyz/block/ftl/v1/controller.proto";
-import "xyz/block/ftl/v1/schema/schema.proto";
 
-option go_package = "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1beta1/provisioner;provisioner";
+option go_package = "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/provisioner/v1beta1;provisioner";
 option java_multiple_files = true;
 
 // Resource is an abstract resource extracted from FTL Schema.

backend/protos/xyz/block/ftl/v1beta1/provisioner/service.proto → backend/protos/xyz/block/ftl/provisioner/v1beta1/service.proto

@@ -5,7 +5,7 @@ package xyz.block.ftl.v1beta1.provisioner;
 import "xyz/block/ftl/v1/controller.proto";
 import "xyz/block/ftl/v1/ftl.proto";
 
-option go_package = "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1beta1/provisioner;provisioner";
+option go_package = "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/provisioner/v1beta1;provisioner";
 option java_multiple_files = true;
 
 service ProvisionerService {

backend/protos/xyz/block/ftl/v1/schema/schema.proto → backend/protos/xyz/block/ftl/schema/v1/schema.proto

@@ -1,11 +1,11 @@
 // THIS FILE IS GENERATED; DO NOT MODIFY
 syntax = "proto3";
 
-package xyz.block.ftl.v1.schema;
+package xyz.block.ftl.schema.v1;
 
 import "google/protobuf/timestamp.proto";
 
-option go_package = "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1/schema;schemapb";
+option go_package = "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/schema/v1;schemapb";
 option java_multiple_files = true;
 
 enum AliasKind {

backend/protos/xyz/block/ftl/v1/controller.proto

@@ -4,8 +4,8 @@ package xyz.block.ftl.v1;
 
 import "google/protobuf/struct.proto";
 import "google/protobuf/timestamp.proto";
+import "xyz/block/ftl/schema/v1/schema.proto";
 import "xyz/block/ftl/v1/ftl.proto";
-import "xyz/block/ftl/v1/schema/schema.proto";
 
 option go_package = "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1;ftlv1";
 option java_multiple_files = true;