Skip to content

Commit

Permalink
Make imports of gogo.proto consistent
Browse files Browse the repository at this point in the history
So everything compiles and lint errors go away.
  • Loading branch information
bboreham committed Nov 3, 2022
1 parent e398576 commit c4c464d
Show file tree
Hide file tree
Showing 4 changed files with 77 additions and 75 deletions.
45 changes: 23 additions & 22 deletions pkg/storegateway/hintspb/hints.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/storegateway/hintspb/hints.proto
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
syntax = "proto3";
package hintspb;

import "gogoproto/gogo.proto";
import "github.com/gogo/protobuf/gogoproto/gogo.proto";
import "github.com/grafana/mimir/pkg/storegateway/storepb/types.proto";

option go_package = "hintspb";
Expand Down
103 changes: 52 additions & 51 deletions pkg/storegateway/storepb/rpc.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/storegateway/storepb/rpc.proto
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ syntax = "proto3";
package thanos;

import "types.proto";
import "gogoproto/gogo.proto";
import "github.com/gogo/protobuf/gogoproto/gogo.proto";
import "google/protobuf/any.proto";

option go_package = "storepb";
Expand Down

0 comments on commit c4c464d

Please sign in to comment.