github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

go-to-protobuf: actually skip - packages 

If a package is prefixed with -, we are not supposed to be generating
protobuf for it. Make that actually happen :-)
pull/6/head
Andy Goldstein 2017-03-13 12:30:56 -04:00 committed by Andy Goldstein
parent 4e17230345
commit 54b6edc400
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/libs/go2idl/go-to-protobuf/protobuf/cmd.go
View File

@ -137,6 +137,7 @@ func Run(g *Generator) {
protobufNames := NewProtobufNamer()
outputPackages := generator.Packages{}
nonOutputPackages := map[string]struct{}{}
for _, d := range strings.Split(g.Packages, ",") {
generateAllTypes, outputPackage := true, true
switch {
@ -160,6 +161,8 @@ func Run(g *Generator) {
protobufNames.Add(p)
if outputPackage {
outputPackages = append(outputPackages, p)
} else {
nonOutputPackages[name] = struct{}{}
}
}
@ -198,6 +201,10 @@ func Run(g *Generator) {
var vendoredOutputPackages, localOutputPackages generator.Packages
for _, p := range protobufNames.packages {
if _, ok := nonOutputPackages[p.Name()]; ok {
// if we're not outputting the package, don't include it in either package list
continue
}
p.Vendored = strings.Contains(c.Universe[p.PackagePath].SourcePath, "/vendor/")
if p.Vendored {
vendoredOutputPackages = append(vendoredOutputPackages, p)