Make gogo.proto import vendoring agnostic #265
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
prometheus/alertmanager imports gogo.proto as gogoproto/gogo.proto This is because it does not use vendoring and needs to look up gogoproto in the module cache, which results in a path like /home/user/go/pkg/mod/github.com/gogo/protobuf@v1.3.2 To avoid having @v1.3.2 in the proto definition it then sets this as an include path and import only gogoproto/gogo.proto. Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
|
Testing mimir build in grafana/mimir#3524 |
krajorama
added a commit
to grafana/mimir
that referenced
this pull request
Nov 28, 2022
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>
krajorama
added a commit
to grafana/mimir
that referenced
this pull request
Nov 30, 2022
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>
zenador
pushed a commit
to grafana/mimir
that referenced
this pull request
Dec 1, 2022
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>
bboreham
pushed a commit
to grafana/mimir
that referenced
this pull request
Dec 8, 2022
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>
bboreham
pushed a commit
to grafana/mimir
that referenced
this pull request
Dec 9, 2022
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>
bboreham
pushed a commit
to grafana/mimir
that referenced
this pull request
Dec 9, 2022
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>
bboreham
pushed a commit
to grafana/mimir
that referenced
this pull request
Dec 12, 2022
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>
bboreham
added a commit
to grafana/mimir
that referenced
this pull request
Dec 12, 2022
More details at https://github.com/grafana/mimir/security/dependabot/12 Many other libraries have updates forced by this change: github.com/prometheus/alertmanager c60fafa6025c github.com/prometheus/client_golang v1.14.0 github.com/spf13/afero v1.8.2 github.com/weaveworks/common 7c2720a9024d golang.org/x/crypto v0.1.0 golang.org/x/net v0.1.0 golang.org/x/sync v0.1.0 go.opentelemetry.io/otel v1.11.1 go.opentelemetry.io/otel/trace v1.11.1 golang.org/x/sys v0.1.0 (Indirect dependencies) github.com/coreos/go-systemd/v22 v22.4.0 github.com/go-openapi/runtime v0.25.0 github.com/gofrs/uuid v4.3.1 github.com/hashicorp/go-hclog v1.2.0 github.com/matttproud/golang_protobuf_extensions v1.0.4 go.mongodb.org/mongo-driver v1.11.0 golang.org/x/mod v0.6.0 golang.org/x/text v0.4.0 golang.org/x/tools v0.2.0 gopkg.in/ini.v1 v1.67.0 gopkg.in/telebot.v3 v3.1.2 * 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 Co-authored-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
masonmei
pushed a commit
to udmire/mimir
that referenced
this pull request
Dec 16, 2022
…ana#3675) More details at https://github.com/grafana/mimir/security/dependabot/12 Many other libraries have updates forced by this change: github.com/prometheus/alertmanager c60fafa6025c github.com/prometheus/client_golang v1.14.0 github.com/spf13/afero v1.8.2 github.com/weaveworks/common 7c2720a9024d golang.org/x/crypto v0.1.0 golang.org/x/net v0.1.0 golang.org/x/sync v0.1.0 go.opentelemetry.io/otel v1.11.1 go.opentelemetry.io/otel/trace v1.11.1 golang.org/x/sys v0.1.0 (Indirect dependencies) github.com/coreos/go-systemd/v22 v22.4.0 github.com/go-openapi/runtime v0.25.0 github.com/gofrs/uuid v4.3.1 github.com/hashicorp/go-hclog v1.2.0 github.com/matttproud/golang_protobuf_extensions v1.0.4 go.mongodb.org/mongo-driver v1.11.0 golang.org/x/mod v0.6.0 golang.org/x/text v0.4.0 golang.org/x/tools v0.2.0 gopkg.in/ini.v1 v1.67.0 gopkg.in/telebot.v3 v3.1.2 * 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 Co-authored-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
prometheus/alertmanager imports gogo.proto as gogoproto/gogo.proto
This is because it does not use vendoring and needs to look up gogoproto in the module cache, which results in a path like
/home/user/go/pkg/mod/github.com/gogo/protobuf@v1.3.2.
To avoid having @v1.3.2 in the proto definition it then sets this as an include path and import only gogoproto/gogo.proto.
This is an issue because protoc is not smart enough to recognize that github.com/gogo/protobuf/gogoproto/gogo.proto and gogoproto/gogo.proto are the same.
Signed-off-by: György Krajcsovits gyorgy.krajcsovits@grafana.com