Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -966,21 +966,17 @@ protos/all: protos/build protos/lint protos/format
.PHONY: protos/build
protos/build: buf/installed
$(BUF) build
cd lib/teleterm && $(BUF) build
cd lib/prehog && $(BUF) build

.PHONY: protos/format
protos/format: buf/installed
$(BUF) format -w
cd lib/teleterm && $(BUF) format -w
cd lib/prehog && $(BUF) format -w

.PHONY: protos/lint
protos/lint: buf/installed
$(BUF) lint
cd api/proto && $(BUF) lint --config=buf-legacy.yaml
cd lib/teleterm && $(BUF) lint
cd lib/prehog && $(BUF) lint
$(BUF) lint proto
$(BUF) lint lib/teleterm/api/proto
$(BUF) lint lib/prehog/proto
$(BUF) lint --config=api/proto/buf-legacy.yaml api/proto

.PHONY: lint-protos
lint-protos: protos/lint
Expand Down Expand Up @@ -1024,7 +1020,8 @@ grpc-teleterm:
# Unlike grpc-teleterm, this target runs locally.
.PHONY: grpc-teleterm/host
grpc-teleterm/host: protos/all
cd lib/teleterm && $(BUF) generate
$(BUF) generate --template lib/prehog/buf-teleterm.gen.yaml lib/prehog/proto
$(BUF) generate --template lib/teleterm/buf.gen.yaml lib/teleterm/api/proto

.PHONY: goinstall
goinstall:
Expand Down
2 changes: 2 additions & 0 deletions buf.work.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
version: v1
directories:
- api/proto
- lib/prehog/proto
- lib/teleterm/api/proto
- proto
6 changes: 5 additions & 1 deletion build.assets/genproto.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ main() {
rm -fr api/gen/proto gen/proto # cleanup gen/proto folders

# Generate Gogo protos (default).
buf generate --template=buf-gogo.gen.yaml
buf generate --template=buf-gogo.gen.yaml api/proto
buf generate --template=buf-gogo.gen.yaml proto

# Generate protoc-gen-go protos (preferred).
# Add your protos to the list if you can.
Expand All @@ -24,6 +25,9 @@ main() {
--path=proto/teleport/lib/multiplexer/

cp -r github.com/gravitational/teleport/* .

# Generate prehog protos.
buf generate --template lib/prehog/buf.gen.yaml lib/prehog/proto
}

main "$@"
30 changes: 30 additions & 0 deletions lib/prehog/buf-teleterm.gen.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# buf-teleterm.gen.yaml is identical to buf.gen.yaml,
# with the exception of three addidiotal JS plugins.
version: v1
managed:
enabled: true
go_package_prefix:
default: github.com/gravitational/teleport/lib/prehog/gen
plugins:
- name: go
path: lib/prehog/bin/protoc-gen-go
out: lib/prehog/gen
opt:
- paths=source_relative
- name: connect-go
path: lib/prehog/bin/protoc-gen-connect-go
out: lib/prehog/gen
opt:
- paths=source_relative

- name: js
out: lib/prehog/gen-js
opt:
- import_style=commonjs,binary
- name: grpc
out: lib/prehog/gen-js
opt: grpc_js
path: grpc_tools_node_protoc_plugin
- name: ts
out: lib/prehog/gen-js
opt: "service=grpc-node"
8 changes: 4 additions & 4 deletions lib/prehog/buf.gen.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ managed:
default: github.com/gravitational/teleport/lib/prehog/gen
plugins:
- name: go
path: bin/protoc-gen-go
out: gen
path: lib/prehog/bin/protoc-gen-go
out: lib/prehog/gen
opt:
- paths=source_relative
- name: connect-go
path: bin/protoc-gen-connect-go
out: gen
path: lib/prehog/bin/protoc-gen-connect-go
out: lib/prehog/gen
opt:
- paths=source_relative
3 changes: 0 additions & 3 deletions lib/prehog/buf.work.yaml

This file was deleted.

42 changes: 42 additions & 0 deletions lib/prehog/gen-js/prehog/v1alpha/connect_grpc_pb.d.ts

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

60 changes: 60 additions & 0 deletions lib/prehog/gen-js/prehog/v1alpha/connect_grpc_pb.js

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

Loading