From c45ebc2f464c888cb27c8534f5b5d1ab366f7f76 Mon Sep 17 00:00:00 2001 From: Andrew Wilkins Date: Wed, 30 Aug 2023 09:14:47 +0800 Subject: [PATCH] Revert to planetscale/vtprotobuf Now that https://github.com/planetscale/vtprotobuf/pull/84 is merged, revert to using the upstream project. We should update again when there's a new release. --- aggregationpb/aggregation_vtproto.pb.go | 2 +- aggregationpb/labels_vtproto.pb.go | 2 +- tools/go.mod | 4 +--- tools/go.sum | 2 ++ 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/aggregationpb/aggregation_vtproto.pb.go b/aggregationpb/aggregation_vtproto.pb.go index 4732099..f0cdfdd 100644 --- a/aggregationpb/aggregation_vtproto.pb.go +++ b/aggregationpb/aggregation_vtproto.pb.go @@ -3,7 +3,7 @@ // you may not use this file except in compliance with the Elastic License 2.0. // Code generated by protoc-gen-go-vtproto. DO NOT EDIT. -// protoc-gen-go-vtproto version: v0.4.0 +// protoc-gen-go-vtproto version: v0.4.1-0.20230829082524-cb44ee83ff7f // source: proto/aggregation.proto package aggregationpb diff --git a/aggregationpb/labels_vtproto.pb.go b/aggregationpb/labels_vtproto.pb.go index f437efa..71651ed 100644 --- a/aggregationpb/labels_vtproto.pb.go +++ b/aggregationpb/labels_vtproto.pb.go @@ -3,7 +3,7 @@ // you may not use this file except in compliance with the Elastic License 2.0. // Code generated by protoc-gen-go-vtproto. DO NOT EDIT. -// protoc-gen-go-vtproto version: v0.4.0 +// protoc-gen-go-vtproto version: v0.4.1-0.20230829082524-cb44ee83ff7f // source: proto/labels.proto package aggregationpb diff --git a/tools/go.mod b/tools/go.mod index c6de336..337b3bf 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -4,7 +4,7 @@ go 1.19 require ( github.com/elastic/go-licenser v0.4.1 - github.com/planetscale/vtprotobuf v0.4.0 + github.com/planetscale/vtprotobuf v0.4.1-0.20230829082524-cb44ee83ff7f golang.org/x/tools v0.12.0 honnef.co/go/tools v0.4.5 ) @@ -16,5 +16,3 @@ require ( golang.org/x/sys v0.11.0 // indirect google.golang.org/protobuf v1.28.1 // indirect ) - -replace github.com/planetscale/vtprotobuf => github.com/grafana/vtprotobuf v0.0.0-20230722075033-e8044ca07485 diff --git a/tools/go.sum b/tools/go.sum index ce57ae5..7d99db5 100644 --- a/tools/go.sum +++ b/tools/go.sum @@ -8,6 +8,8 @@ github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/grafana/vtprotobuf v0.0.0-20230722075033-e8044ca07485 h1:gJYcsZJneV9DVvrcmmvGJLiuM/p+tcJ4cYu9oWvES2s= github.com/grafana/vtprotobuf v0.0.0-20230722075033-e8044ca07485/go.mod h1:wm1N3qk9G/4+VM1WhpkLbvY/d8+0PbwYYpP5P5VhTks= +github.com/planetscale/vtprotobuf v0.4.1-0.20230829082524-cb44ee83ff7f h1:MtJqAXx9wXV/EppVKvLsjALDl3NzODAq3yHOAAHwFoU= +github.com/planetscale/vtprotobuf v0.4.1-0.20230829082524-cb44ee83ff7f/go.mod h1:wm1N3qk9G/4+VM1WhpkLbvY/d8+0PbwYYpP5P5VhTks= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=