From 70c0271a283bda3d9058f9ca681ced88ce5f264b Mon Sep 17 00:00:00 2001 From: Alec Thomas Date: Fri, 27 Oct 2023 09:44:33 +1100 Subject: [PATCH] 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. --- Bitfile | 10 ++++++++-- bin/{.buf-1.26.1.pkg => .buf-1.27.1.pkg} | 0 ...go-1.11.1.pkg => .protoc-gen-connect-go-1.12.0.pkg} | 0 bin/.protoc-gen-go-grpc-1.1.0.pkg | 1 - bin/buf | 2 +- bin/protoc-gen-buf-breaking | 2 +- bin/protoc-gen-buf-lint | 2 +- bin/protoc-gen-connect-go | 2 +- bin/protoc-gen-go-grpc | 1 - .../client/src/protos/google/protobuf/timestamp_pb.ts | 2 +- .../proto/collector/metrics/v1/metrics_service_pb.ts | 2 +- .../protos/opentelemetry/proto/common/v1/common_pb.ts | 2 +- .../opentelemetry/proto/metrics/v1/metrics_pb.ts | 2 +- .../opentelemetry/proto/resource/v1/resource_pb.ts | 2 +- .../protos/opentelemetry/proto/trace/v1/trace_pb.ts | 2 +- .../protos/xyz/block/ftl/v1/console/console_connect.ts | 2 +- .../client/src/protos/xyz/block/ftl/v1/ftl_connect.ts | 2 +- protos/buf.gen.yaml | 4 ++-- 18 files changed, 22 insertions(+), 18 deletions(-) rename bin/{.buf-1.26.1.pkg => .buf-1.27.1.pkg} (100%) rename bin/{.protoc-gen-connect-go-1.11.1.pkg => .protoc-gen-connect-go-1.12.0.pkg} (100%) delete mode 120000 bin/.protoc-gen-go-grpc-1.1.0.pkg delete mode 120000 bin/protoc-gen-go-grpc diff --git a/Bitfile b/Bitfile index a58ab26804..86416c1888 100644 --- 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 b/bin/.buf-1.27.1.pkg similarity index 100% rename from bin/.buf-1.26.1.pkg rename to bin/.buf-1.27.1.pkg diff --git a/bin/.protoc-gen-connect-go-1.11.1.pkg b/bin/.protoc-gen-connect-go-1.12.0.pkg similarity index 100% rename from bin/.protoc-gen-connect-go-1.11.1.pkg rename to 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 deleted file mode 120000 index 383f4511d4..0000000000 --- a/bin/.protoc-gen-go-grpc-1.1.0.pkg +++ /dev/null @@ -1 +0,0 @@ -hermit \ No newline at end of file diff --git a/bin/buf b/bin/buf index a53b857e83..8353d9532f 120000 --- a/bin/buf +++ b/bin/buf @@ -1 +1 @@ -.buf-1.26.1.pkg \ No newline at end of file +.buf-1.27.1.pkg \ No newline at end of file diff --git a/bin/protoc-gen-buf-breaking b/bin/protoc-gen-buf-breaking index a53b857e83..8353d9532f 120000 --- a/bin/protoc-gen-buf-breaking +++ b/bin/protoc-gen-buf-breaking @@ -1 +1 @@ -.buf-1.26.1.pkg \ No newline at end of file +.buf-1.27.1.pkg \ No newline at end of file diff --git a/bin/protoc-gen-buf-lint b/bin/protoc-gen-buf-lint index a53b857e83..8353d9532f 120000 --- a/bin/protoc-gen-buf-lint +++ b/bin/protoc-gen-buf-lint @@ -1 +1 @@ -.buf-1.26.1.pkg \ No newline at end of file +.buf-1.27.1.pkg \ No newline at end of file diff --git a/bin/protoc-gen-connect-go b/bin/protoc-gen-connect-go index b8231055b2..d58574cb0e 120000 --- a/bin/protoc-gen-connect-go +++ b/bin/protoc-gen-connect-go @@ -1 +1 @@ -.protoc-gen-connect-go-1.11.1.pkg \ No newline at end of file +.protoc-gen-connect-go-1.12.0.pkg \ No newline at end of file diff --git a/bin/protoc-gen-go-grpc b/bin/protoc-gen-go-grpc deleted file mode 120000 index 8c22ed2826..0000000000 --- a/bin/protoc-gen-go-grpc +++ /dev/null @@ -1 +0,0 @@ -.protoc-gen-go-grpc-1.1.0.pkg \ No newline at end of file diff --git a/console/client/src/protos/google/protobuf/timestamp_pb.ts b/console/client/src/protos/google/protobuf/timestamp_pb.ts index a5f92d1f89..46b95d3edf 100644 --- a/console/client/src/protos/google/protobuf/timestamp_pb.ts +++ b/console/client/src/protos/google/protobuf/timestamp_pb.ts @@ -28,7 +28,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// @generated by protoc-gen-es v1.3.3 with parameter "target=ts" +// @generated by protoc-gen-es v1.4.0 with parameter "target=ts" // @generated from file google/protobuf/timestamp.proto (package google.protobuf, syntax proto3) /* eslint-disable */ // @ts-nocheck 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 index 871838a12a..fc56ee2e98 100644 --- 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 @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -// @generated by protoc-gen-es v1.3.3 with parameter "target=ts" +// @generated by protoc-gen-es v1.4.0 with parameter "target=ts" // @generated from file opentelemetry/proto/collector/metrics/v1/metrics_service.proto (package opentelemetry.proto.collector.metrics.v1, syntax proto3) /* eslint-disable */ // @ts-nocheck 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 index 13bd0ad399..47dfa7d98e 100644 --- a/console/client/src/protos/opentelemetry/proto/common/v1/common_pb.ts +++ b/console/client/src/protos/opentelemetry/proto/common/v1/common_pb.ts @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -// @generated by protoc-gen-es v1.3.3 with parameter "target=ts" +// @generated by protoc-gen-es v1.4.0 with parameter "target=ts" // @generated from file opentelemetry/proto/common/v1/common.proto (package opentelemetry.proto.common.v1, syntax proto3) /* eslint-disable */ // @ts-nocheck 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 index faf07d4b19..e51d907ee2 100644 --- a/console/client/src/protos/opentelemetry/proto/metrics/v1/metrics_pb.ts +++ b/console/client/src/protos/opentelemetry/proto/metrics/v1/metrics_pb.ts @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -// @generated by protoc-gen-es v1.3.3 with parameter "target=ts" +// @generated by protoc-gen-es v1.4.0 with parameter "target=ts" // @generated from file opentelemetry/proto/metrics/v1/metrics.proto (package opentelemetry.proto.metrics.v1, syntax proto3) /* eslint-disable */ // @ts-nocheck 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 index cabc2cf014..0558232d38 100644 --- a/console/client/src/protos/opentelemetry/proto/resource/v1/resource_pb.ts +++ b/console/client/src/protos/opentelemetry/proto/resource/v1/resource_pb.ts @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -// @generated by protoc-gen-es v1.3.3 with parameter "target=ts" +// @generated by protoc-gen-es v1.4.0 with parameter "target=ts" // @generated from file opentelemetry/proto/resource/v1/resource.proto (package opentelemetry.proto.resource.v1, syntax proto3) /* eslint-disable */ // @ts-nocheck 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 index 2c4207d474..a93e886a33 100644 --- a/console/client/src/protos/opentelemetry/proto/trace/v1/trace_pb.ts +++ b/console/client/src/protos/opentelemetry/proto/trace/v1/trace_pb.ts @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -// @generated by protoc-gen-es v1.3.3 with parameter "target=ts" +// @generated by protoc-gen-es v1.4.0 with parameter "target=ts" // @generated from file opentelemetry/proto/trace/v1/trace.proto (package opentelemetry.proto.trace.v1, syntax proto3) /* eslint-disable */ // @ts-nocheck 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 index 240fcd4102..45d20194f8 100644 --- 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 @@ -1,4 +1,4 @@ -// @generated by protoc-gen-connect-es v0.13.0 with parameter "target=ts" +// @generated by protoc-gen-connect-es v1.1.2 with parameter "target=ts" // @generated from file xyz/block/ftl/v1/console/console.proto (package xyz.block.ftl.v1.console, syntax proto3) /* eslint-disable */ // @ts-nocheck 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 index b3a3a69e17..71f49d5776 100644 --- a/console/client/src/protos/xyz/block/ftl/v1/ftl_connect.ts +++ b/console/client/src/protos/xyz/block/ftl/v1/ftl_connect.ts @@ -1,4 +1,4 @@ -// @generated by protoc-gen-connect-es v0.13.0 with parameter "target=ts" +// @generated by protoc-gen-connect-es v1.1.2 with parameter "target=ts" // @generated from file xyz/block/ftl/v1/ftl.proto (package xyz.block.ftl.v1, syntax proto3) /* eslint-disable */ // @ts-nocheck diff --git a/protos/buf.gen.yaml b/protos/buf.gen.yaml index 884d1a5e53..e68bf7a850 100644 --- 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