go2idl: Allow ... pkg specs

cmd/libs/go2idl/args/args.go

@@ -54,9 +54,6 @@ type GeneratorArgs struct {
 	// Which directories to parse.
 	InputDirs []string
 
-	// If true, recurse into all children of InputDirs
-	Recursive bool
-
 	// Source tree to write results to.
 	OutputBase string
 
@@ -89,7 +86,6 @@ func (g *GeneratorArgs) AddFlags(fs *pflag.FlagSet) {
 	fs.StringVarP(&g.OutputFileBaseName, "output-file-base", "O", g.OutputFileBaseName, "Base name (without .go suffix) for output files.")
 	fs.StringVarP(&g.GoHeaderFilePath, "go-header-file", "h", g.GoHeaderFilePath, "File containing boilerplate header text. The string YEAR will be replaced with the current 4-digit year.")
 	fs.BoolVar(&g.VerifyOnly, "verify-only", g.VerifyOnly, "If true, only verify existing output, do not write anything.")
-	fs.BoolVar(&g.Recursive, "recursive", g.VerifyOnly, "If true, recurse into all children of input directories.")
 	fs.StringVar(&g.GeneratedBuildTag, "build-tag", g.GeneratedBuildTag, "A Go build tag to use to identify files generated by this command. Should be unique.")
 }
 
@@ -111,14 +107,14 @@ func (g *GeneratorArgs) NewBuilder() (*parser.Builder, error) {
 	b.AddBuildTags(g.GeneratedBuildTag)
 
 	for _, d := range g.InputDirs {
-		if g.Recursive {
-			if err := b.AddDirRecursive(d); err != nil {
-				return nil, fmt.Errorf("unable to add directory %q: %v", d, err)
-			}
+		var err error
+		if strings.HasSuffix(d, "/...") {
+			err = b.AddDirRecursive(strings.TrimSuffix(d, "/..."))
 		} else {
-			if err := b.AddDir(d); err != nil {
-				return nil, fmt.Errorf("unable to add directory %q: %v", d, err)
-			}
+			err = b.AddDir(d)
+		}
+		if err != nil {
+			return nil, fmt.Errorf("unable to add directory %q: %v", d, err)
 		}
 	}
 	return b, nil

cmd/libs/go2idl/deepcopy-gen/generators/deepcopy.go

@@ -121,7 +121,7 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat
 		glog.Fatalf("Failed loading boilerplate: %v", err)
 	}
 
-	inputs := sets.NewString(arguments.InputDirs...)
+	inputs := sets.NewString(context.Inputs...)
 	packages := generator.Packages{}
 	header := append([]byte(fmt.Sprintf("// +build !%s\n\n", arguments.GeneratedBuildTag)), boilerplate...)
 	header = append(header, []byte(

cmd/libs/go2idl/generator/generator.go

@@ -152,6 +152,9 @@ type Context struct {
 	// All the types, in case you want to look up something.
 	Universe types.Universe
 
+	// All the user-specified packages.  This is after recursive expansion.
+	Inputs []string
+
 	// The canonical ordering of the types (will be filtered by both the
 	// Package's and Generator's Filter methods).
 	Order []*types.Type
@@ -168,14 +171,15 @@ type Context struct {
 // NewContext generates a context from the given builder, naming systems, and
 // the naming system you wish to construct the canonical ordering from.
 func NewContext(b *parser.Builder, nameSystems namer.NameSystems, canonicalOrderName string) (*Context, error) {
-	u, err := b.FindTypes()
+	universe, err := b.FindTypes()
 	if err != nil {
 		return nil, err
 	}
 
 	c := &Context{
 		Namers:   namer.NameSystems{},
-		Universe: u,
+		Universe: universe,
+		Inputs:   b.FindPackages(),
 		FileTypes: map[string]FileType{
 			GolangFileType: NewGolangFile(),
 		},
@@ -185,7 +189,7 @@ func NewContext(b *parser.Builder, nameSystems namer.NameSystems, canonicalOrder
 		c.Namers[name] = systemNamer
 		if name == canonicalOrderName {
 			orderer := namer.Orderer{Namer: systemNamer}
-			c.Order = orderer.OrderUniverse(u)
+			c.Order = orderer.OrderUniverse(universe)
 		}
 	}
 	return c, nil

cmd/libs/go2idl/import-boss/main.go

@@ -70,11 +70,10 @@ func main() {
 	// Override defaults. These are Kubernetes specific input and output
 	// locations.
 	arguments.InputDirs = []string{
-		"k8s.io/kubernetes/pkg/",
-		"k8s.io/kubernetes/cmd/",
-		"k8s.io/kubernetes/plugin/",
+		"k8s.io/kubernetes/pkg/...",
+		"k8s.io/kubernetes/cmd/...",
+		"k8s.io/kubernetes/plugin/...",
 	}
-	arguments.Recursive = true
 	// arguments.VerifyOnly = true
 
 	if err := arguments.Execute(

cmd/libs/go2idl/parser/parse.go

@@ -129,7 +129,9 @@ func (b *Builder) buildPackage(pkgPath string) (*build.Package, error) {
 	}
 	pkg, err = b.context.Import(pkgPath, cwd, build.ImportComment)
 	if err != nil {
-		return nil, fmt.Errorf("unable to import %q: %v", pkgPath, err)
+		if _, ok := err.(*build.NoGoError); !ok {
+			return nil, fmt.Errorf("unable to import %q: %v", pkgPath, err)
+		}
 	}
 	b.buildInfo[pkgPath] = pkg
 
@@ -350,6 +352,20 @@ func (b *Builder) makePackages() error {
 	return nil
 }
 
+// FindPackages fetches a list of the user-imported packages.
+func (b *Builder) FindPackages() []string {
+	result := []string{}
+	for pkgPath := range b.pkgs {
+		if b.userRequested[pkgPath] {
+			// Since walkType is recursive, all types that are in packages that
+			// were directly mentioned will be included.  We don't need to
+			// include all types in all transitive packages, though.
+			result = append(result, pkgPath)
+		}
+	}
+	return result
+}
+
 // FindTypes finalizes the package imports, and searches through all the
 // packages for types.
 func (b *Builder) FindTypes() (types.Universe, error) {