Skip to content

[v12] Refactor prehog & teleterm protos to match project conventions#21298

Merged
ravicious merged 1 commit intobranch/v12from
ravicious/v12/backport-20810
Feb 6, 2023
Merged

[v12] Refactor prehog & teleterm protos to match project conventions#21298
ravicious merged 1 commit intobranch/v12from
ravicious/v12/backport-20810

Conversation

@ravicious
Copy link
Copy Markdown
Member

Backport #20810.

Pretty much a clean merge, the backport bot failed because #21233 wasn't yet merged.

* Adjust go_package of lib/prehog Go protobufs

This makes them follow the pattern set out by api/proto and proto.

* Adjust go_package of lib/teleterm Go protobufs

* Use single buf.gen.yaml to generate JS protos

This also entailed changing the location of lib/teleterm protos and changing
the value of their package specifier to match the conventions in other parts
of the codebase. This is a breaking change but that is fine for Connect
as the protos are used locally only and each build ships with matching
protobufs.

* Make web/packages/teleterm use protobufs from gen-proto-js

We used to copy protobufs over to web/packages/teleterm/src/services/tshd
since webapps used to be in a separate repo.

This is no longer the case, so we can just make teleterm use protobufs
from gen-proto-js.

* Move prehog & teleterm protos into proto/teleport/lib

* Generate JS protos to gen/proto/js

* Move lib/teleterm Go protobufs to gen/proto/go

* Move lib/prehog Go protobufs to gen/proto/go

* Rename lib/teleterm proto package

* Re-enable linter rules for teleterm & prehog

* Update prehogv1 path in usagereporter_test.go

* Use except instead of ignore_only to allow Google API-style responses

* Add UNARY_RPC to api/proto & proto

* Ignore gen/ when running addlicense

* buf-js.gen.yaml: Remove comment about lack of go_package for JS

* Move prehog protos to proto/prehog/v1alpha

* Adjust prehog's go_package to match proto package
@public-teleport-github-review-bot public-teleport-github-review-bot Bot removed the request for review from espadolini February 6, 2023 15:27
@ravicious ravicious enabled auto-merge (squash) February 6, 2023 15:36
@ravicious ravicious merged commit 892052f into branch/v12 Feb 6, 2023
@ravicious ravicious deleted the ravicious/v12/backport-20810 branch February 6, 2023 15:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants