[v10] Refactor teleterm protos to match project conventions#21451
Merged
ravicious merged 3 commits intobranch/v10from Feb 9, 2023
Merged
[v10] Refactor teleterm protos to match project conventions#21451ravicious merged 3 commits intobranch/v10from
ravicious merged 3 commits intobranch/v10from
Conversation
* Moved teleterm's proto files from their respective `lib/` dir to `proto/`.
* Updated `go_package` of `lib/teleterm` protobufs to match conventions
used by `api/proto` and `proto`.
* `lib/teleterm/api/protogen/golang/v1` before
* `gen/proto/go/teleport/lib/teleterm/v1/` now
* proto package name has been updated to match the new location.
* JS protobufs for now live in `gen/proto/js` in the root folder.
* Connect no longer needs to copy protobufs to its own directory.
* Instead it uses protobufs from `gen/proto/js` so that any change
done through `make grpc` is automatically picked up by Connect.
Member
Author
|
The teleport-operator fix (#21362) is not included because v10 doesn't have |
espadolini
approved these changes
Feb 8, 2023
public-teleport-github-review-bot
Bot
removed the request for review
from gzdunek
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Backport #20810.
The small twist here is that instead of actually backporting the commit #20810 merged into master, I backported the v11 backport instead #21394. v11 and v10 have much more things in common than current master and v12 so I figured it'd be easier to deal with merge conflicts this way.
lib/dir toproto/.go_packageoflib/teletermprotobufs to match conventions used byapi/protoandproto.lib/teleterm/api/protogen/golang/v1beforegen/proto/go/teleport/lib/teleterm/v1/nowgen/proto/jsin the root folder.gen/proto/jsso that any change done throughmake grpcis automatically picked up by Connect.