[v11] Refactor teleterm protos to match project conventions#21394
Merged
ravicious merged 4 commits intobranch/v11from Feb 14, 2023
Merged
[v11] Refactor teleterm protos to match project conventions#21394ravicious merged 4 commits intobranch/v11from
ravicious merged 4 commits intobranch/v11from
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.
ravicious
requested review from
klizhentas,
r0mant,
russjones and
zmb3
as code owners
espadolini
approved these changes
Feb 7, 2023
gzdunek
approved these changes
Feb 7, 2023
public-teleport-github-review-bot
Bot
removed the request for review
from codingllama
ravicious
changed the title
codingllama
approved these changes
Feb 7, 2023
This was referenced Feb 8, 2023
zmb3
approved these changes
Feb 14, 2023
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
6 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 & #21362.
Compared to the original PR and v12 backport, I didn't touch lib/prehog protos as #19631 was not backported to v11 so on v11 those are still generated manually. Fortunately though, the main reason for which I undertook this refactoring, that is lib/teleterm importing lib/prehog protos, doesn't take place on v11.
The rest of the changes is similar to those from the original PR:
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.This PR also includes a backport for #21362 which fixes teleport-operator build broken by #20810.