fix: pin buf protoc plugins (#523)

Because we were not pinning, when a new version of a plugin was released our builds would break because the git tree wasn't clean after a regen. This fixes that.
TBD54566975 · Oct 26, 2023 · 70c0271 · 70c0271
1 parent 41e4cd8
commit 70c0271
Show file tree

Hide file tree

Showing 18 changed files with 22 additions and 18 deletions.
diff --git a/Bitfile b/Bitfile
@@ -8,7 +8,7 @@ SCHEMA_IN = backend/schema/schema.go backend/schema/protobuf.go \
     cmd/ftl/cmd_schema.go
 SCHEMA_OUT = protos/xyz/block/ftl/v1/schema/schema.proto
 
-PROTO_IN = **/*.proto **/buf.*
+PROTO_IN = **/*.proto **/buf.* bin/protoc* bin/buf
 # There's no real way to mechanically generate the list of outputs, so we just
 # explicitly list them here.
 PROTO_OUT = protos/xyz/block/ftl/v1/ftlv1connect/ftl.connect.go \
@@ -20,7 +20,13 @@ PROTO_OUT = protos/xyz/block/ftl/v1/ftlv1connect/ftl.connect.go \
     console/client/src/protos/xyz/block/ftl/v1/schema/schema_pb.ts \
     console/client/src/protos/xyz/block/ftl/v1/schema/runtime_pb.ts \
     console/client/src/protos/xyz/block/ftl/v1/ftl_pb.ts \
-    console/client/src/protos/xyz/block/ftl/v1/console/console_pb.ts
+    console/client/src/protos/xyz/block/ftl/v1/console/console_pb.ts \
+    console/client/src/protos/google/protobuf/timestamp_pb.ts \
+    console/client/src/protos/opentelemetry/proto/collector/metrics/v1/metrics_service_pb.ts \
+    console/client/src/protos/opentelemetry/proto/common/v1/common_pb.ts \
+    console/client/src/protos/opentelemetry/proto/metrics/v1/metrics_pb.ts \
+    console/client/src/protos/opentelemetry/proto/resource/v1/resource_pb.ts \
+    console/client/src/protos/opentelemetry/proto/trace/v1/trace_pb.ts
 
 COMMON_LOG_IN = backend/common/log/api.go
 COMMON_LOG_OUT = backend/common/log/log_level_string.go

diff --git a/bin/.buf-1.26.1.pkg → bin/.buf-1.27.1.pkg b/bin/.buf-1.26.1.pkg → bin/.buf-1.27.1.pkg
diff --git a/bin/.protoc-gen-connect-go-1.11.1.pkg → bin/.protoc-gen-connect-go-1.12.0.pkg b/bin/.protoc-gen-connect-go-1.11.1.pkg → bin/.protoc-gen-connect-go-1.12.0.pkg
diff --git a/bin/.protoc-gen-go-grpc-1.1.0.pkg b/bin/.protoc-gen-go-grpc-1.1.0.pkg
diff --git a/bin/buf b/bin/buf
@@ -1 +1 @@
-.buf-1.26.1.pkg
+.buf-1.27.1.pkg
diff --git a/bin/protoc-gen-buf-breaking b/bin/protoc-gen-buf-breaking
@@ -1 +1 @@
-.buf-1.26.1.pkg
+.buf-1.27.1.pkg
diff --git a/bin/protoc-gen-buf-lint b/bin/protoc-gen-buf-lint
@@ -1 +1 @@
-.buf-1.26.1.pkg
+.buf-1.27.1.pkg
diff --git a/bin/protoc-gen-connect-go b/bin/protoc-gen-connect-go
@@ -1 +1 @@
-.protoc-gen-connect-go-1.11.1.pkg
+.protoc-gen-connect-go-1.12.0.pkg
diff --git a/bin/protoc-gen-go-grpc b/bin/protoc-gen-go-grpc
diff --git a/console/client/src/protos/google/protobuf/timestamp_pb.ts b/console/client/src/protos/google/protobuf/timestamp_pb.ts
diff --git a/console/client/src/protos/opentelemetry/proto/collector/metrics/v1/metrics_service_pb.ts b/console/client/src/protos/opentelemetry/proto/collector/metrics/v1/metrics_service_pb.ts
diff --git a/console/client/src/protos/opentelemetry/proto/common/v1/common_pb.ts b/console/client/src/protos/opentelemetry/proto/common/v1/common_pb.ts
diff --git a/console/client/src/protos/opentelemetry/proto/metrics/v1/metrics_pb.ts b/console/client/src/protos/opentelemetry/proto/metrics/v1/metrics_pb.ts
diff --git a/console/client/src/protos/opentelemetry/proto/resource/v1/resource_pb.ts b/console/client/src/protos/opentelemetry/proto/resource/v1/resource_pb.ts
diff --git a/console/client/src/protos/opentelemetry/proto/trace/v1/trace_pb.ts b/console/client/src/protos/opentelemetry/proto/trace/v1/trace_pb.ts
diff --git a/console/client/src/protos/xyz/block/ftl/v1/console/console_connect.ts b/console/client/src/protos/xyz/block/ftl/v1/console/console_connect.ts
diff --git a/console/client/src/protos/xyz/block/ftl/v1/ftl_connect.ts b/console/client/src/protos/xyz/block/ftl/v1/ftl_connect.ts
diff --git a/protos/buf.gen.yaml b/protos/buf.gen.yaml
@@ -6,9 +6,9 @@ plugins:
   - plugin: connect-go
     out: .
     opt: paths=source_relative
-  - plugin: buf.build/bufbuild/es
+  - plugin: buf.build/bufbuild/es:v1.4.0
     out: ../console/client/src/protos
     opt: target=ts
-  - plugin: buf.build/bufbuild/connect-es
+  - plugin: buf.build/connectrpc/es:v1.1.2
     out: ../console/client/src/protos
     opt: target=ts
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		.protoc-gen-connect-go-1.11.1.pkg
		.protoc-gen-connect-go-1.12.0.pkg