Skip to content

Remove plugins and import_path#48

Merged
estesp merged 2 commits intocontainerd:mainfrom
kzys:upgrade-proto
Oct 25, 2021
Merged

Remove plugins and import_path#48
estesp merged 2 commits intocontainerd:mainfrom
kzys:upgrade-proto

Conversation

@kzys
Copy link
Copy Markdown
Member

@kzys kzys commented Oct 19, 2021

Signed-off-by: Kazuyoshi Kato katokazu@amazon.com

@kzys kzys force-pushed the upgrade-proto branch 10 times, most recently from 3a56327 to c6279f7 Compare October 20, 2021 00:25
Comment thread protoc.go Outdated
{{- end -}},{{- end -}}
import_path={{$.ImportPath}}
{{- end -}}
{{- range $index, $name := .Names }} --{{- $name -}}_out={{- $.OutputDir }}{{- end -}}
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now we need to think about either

  1. Versioning (e.g. make this version as 2 and reject Protobuild.toml file that has version=unstable.
  2. Check unsupported fields (e.g. Plugins) and error out
  3. Keep 2 code paths and switch based on version.

What do you think? I'm currently inclined to do 1 since it makes code simpler for us.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Synced-up offline. Did 3.

@kzys kzys force-pushed the upgrade-proto branch 15 times, most recently from f22d463 to 45e2637 Compare October 20, 2021 22:11
Comment thread protoc_test.go
expected: "protoc -I --go_out=import_path= --go-grpc_out=import_path=:",
name: "use protoc-gen-go-grpc instead of plugins",
cmd: protocCmd{Names: []string{"go", "go-grpc"}},
expectedV1: "protoc -I --go_out=import_path=: --go-grpc_out=import_path=:",
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems the previous test was wrong. --go_out=import_path= must have :.

@kzys kzys marked this pull request as ready for review October 20, 2021 22:19
@kzys kzys force-pushed the upgrade-proto branch 5 times, most recently from c21ad6f to e0c0e3a Compare October 20, 2021 23:07
Copy link
Copy Markdown
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM; one minor spelling nit in a comment.

A follow-up PR that updates the README overall might be good; looks like a few comments there may no longer be valid or just simply outdated

Comment thread protoc.go Outdated
Kazuyoshi Kato added 2 commits October 21, 2021 09:53
This change introduces version=2 that supports latest protoc,
protoc-gen-go and protoc-gen-go-grpc.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
This change extends GitHub Actions to test Protobuild against
multiple protoc-gen-go versions.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
@estesp estesp merged commit 7e5ee24 into containerd:main Oct 25, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants