Follow up weaveworks/common update to fix protobuf definitions

New weaveworks common explicitly includes gogo protobuf on a more generic location. See weaveworks/common#265 Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
grafana · Dec 12, 2022 · da05c26 · da05c26
1 parent 5d2d6d5
commit da05c26
Show file tree

Hide file tree

Showing 8 changed files with 124 additions and 125 deletions.
diff --git a/pkg/frontend/v1/frontendv1pb/frontend.pb.go b/pkg/frontend/v1/frontendv1pb/frontend.pb.go
diff --git a/pkg/frontend/v1/frontendv1pb/frontend.proto b/pkg/frontend/v1/frontendv1pb/frontend.proto
@@ -11,7 +11,7 @@ package frontend;
 
 option go_package = "frontendv1pb";
 
-import "github.com/gogo/protobuf/gogoproto/gogo.proto";
+import "gogoproto/gogo.proto";
 import "github.com/weaveworks/common/httpgrpc/httpgrpc.proto";
 import "github.com/grafana/mimir/pkg/querier/stats/stats.proto";
 

diff --git a/pkg/frontend/v2/frontendv2pb/frontend.pb.go b/pkg/frontend/v2/frontendv2pb/frontend.pb.go
diff --git a/pkg/frontend/v2/frontendv2pb/frontend.proto b/pkg/frontend/v2/frontendv2pb/frontend.proto
@@ -9,7 +9,7 @@ package frontendv2pb;
 
 option go_package = "frontendv2pb";
 
-import "github.com/gogo/protobuf/gogoproto/gogo.proto";
+import "gogoproto/gogo.proto";
 import "github.com/weaveworks/common/httpgrpc/httpgrpc.proto";
 import "github.com/grafana/mimir/pkg/querier/stats/stats.proto";
 

diff --git a/pkg/querier/stats/stats.pb.go b/pkg/querier/stats/stats.pb.go
diff --git a/pkg/querier/stats/stats.proto b/pkg/querier/stats/stats.proto
@@ -9,7 +9,7 @@ package stats;
 
 option go_package = "stats";
 
-import "github.com/gogo/protobuf/gogoproto/gogo.proto";
+import "gogoproto/gogo.proto";
 import "google/protobuf/duration.proto";
 
 option (gogoproto.marshaler_all) = true;