Skip to content

Commit

Permalink
Add --omit_package_doc flag
Browse files Browse the repository at this point in the history
Makes it possible to omit the package comment from generated code. This
is useful if the generated code is added to an existing package that
already has package documentation (the generated package comment might
be misleading in that case).
  • Loading branch information
Rob Percival committed Dec 19, 2019
1 parent 50c55a9 commit 4179579
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 2 deletions.
13 changes: 13 additions & 0 deletions protoc-gen-grpc-gateway/descriptor/registry.go
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,9 @@ type Registry struct {
// useGoTemplate determines whether you want to use GO templates
// in your protofile comments
useGoTemplate bool

// omitPackageDoc, if false, causes a package comment to be included in the generated code.
omitPackageDoc bool
}

type repeatedFieldSeparator struct {
Expand Down Expand Up @@ -460,6 +463,16 @@ func (r *Registry) GetUseGoTemplate() bool {
return r.useGoTemplate
}

// SetOmitPackageDoc controls whether the generated code contains a package comment (if set to false, it will contain one)
func (r *Registry) SetOmitPackageDoc(omit bool) {
r.omitPackageDoc = omit
}

// GetOmitPackageDoc returns whether a package comment will be omitted from the generated code
func (r *Registry) GetOmitPackageDoc() bool {
return r.omitPackageDoc
}

// sanitizePackageName replaces unallowed character in package name
// with allowed character.
func sanitizePackageName(pkgName string) string {
Expand Down
3 changes: 3 additions & 0 deletions protoc-gen-grpc-gateway/gengateway/generator.go
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,9 @@ func (g *generator) generate(file *descriptor.File) (string, error) {
RegisterFuncSuffix: g.registerFuncSuffix,
AllowPatchFeature: g.allowPatchFeature,
}
if g.reg != nil {
params.OmitPackageDoc = g.reg.GetOmitPackageDoc()
}
return applyTemplate(params, g.reg)
}

Expand Down
5 changes: 3 additions & 2 deletions protoc-gen-grpc-gateway/gengateway/template.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ type param struct {
UseRequestContext bool
RegisterFuncSuffix string
AllowPatchFeature bool
OmitPackageDoc bool
}

type binding struct {
Expand Down Expand Up @@ -221,11 +222,11 @@ var (
// Code generated by protoc-gen-grpc-gateway. DO NOT EDIT.
// source: {{.GetName}}
/*
{{if not .OmitPackageDoc}}/*
Package {{.GoPkg.Name}} is a reverse proxy.
It translates gRPC into RESTful JSON APIs.
*/
*/{{end}}
package {{.GoPkg.Name}}
import (
{{range $i := .Imports}}{{if $i.Standard}}{{$i | printf "%s\n"}}{{end}}{{end}}
Expand Down
2 changes: 2 additions & 0 deletions protoc-gen-grpc-gateway/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ var (
repeatedPathParamSeparator = flag.String("repeated_path_param_separator", "csv", "configures how repeated fields should be split. Allowed values are `csv`, `pipes`, `ssv` and `tsv`.")
allowPatchFeature = flag.Bool("allow_patch_feature", true, "determines whether to use PATCH feature involving update masks (using google.protobuf.FieldMask).")
allowColonFinalSegments = flag.Bool("allow_colon_final_segments", false, "determines whether colons are permitted in the final segment of a path")
omitPackageDoc = flag.Bool("omit_package_doc", false, "if true, no package comment will be included in the generated code")
versionFlag = flag.Bool("version", false, "print the current verison")
)

Expand Down Expand Up @@ -95,6 +96,7 @@ func main() {
reg.SetAllowDeleteBody(*allowDeleteBody)
reg.SetAllowRepeatedFieldsInBody(*allowRepeatedFieldsInBody)
reg.SetAllowColonFinalSegments(*allowColonFinalSegments)
reg.SetOmitPackageDoc(*omitPackageDoc)
if err := reg.SetRepeatedPathParamSeparator(*repeatedPathParamSeparator); err != nil {
emitError(err)
return
Expand Down

0 comments on commit 4179579

Please sign in to comment.