Print Krmfile data for cfg tree

cmd/config/internal/commands/grep.go

@@ -29,8 +29,6 @@ func GetGrepRunner(name string) *GrepRunner {
 		Args:    cobra.MaximumNArgs(2),
 	}
 	fixDocs(name, c)
-	c.Flags().BoolVar(&r.IncludeSubpackages, "include-subpackages", true,
-		"also print resources from subpackages.")
 	c.Flags().BoolVar(&r.KeepAnnotations, "annotate", true,
 		"annotate resources with their file origins.")
 	c.Flags().BoolVarP(&r.InvertMatch, "invert-match", "", false,
@@ -47,9 +45,8 @@ func GrepCommand(name string) *cobra.Command {
 
 // GrepRunner contains the run function
 type GrepRunner struct {
-	IncludeSubpackages bool
-	KeepAnnotations    bool
-	Command            *cobra.Command
+	KeepAnnotations bool
+	Command         *cobra.Command
 	filters.GrepFilter
 	Format             bool
 	RecurseSubPackages bool

cmd/config/internal/commands/tree.go

@@ -7,6 +7,7 @@ import (
 	"path/filepath"
 	"strings"
 
+	"sigs.k8s.io/kustomize/cmd/config/ext"
 	"sigs.k8s.io/kustomize/cmd/config/internal/generateddocs/commands"
 	"sigs.k8s.io/kustomize/kyaml/kio/filters"
 
@@ -26,8 +27,6 @@ func GetTreeRunner(name string) *TreeRunner {
 		Args:    cobra.MaximumNArgs(1),
 	}
 	fixDocs(name, c)
-	c.Flags().BoolVar(&r.IncludeSubpackages, "include-subpackages", true,
-		"also print resources from subpackages.")
 
 	// TODO(pwittrock): Figure out if these are the right things to expose, and consider making it
 	// a list of options instead of individual flags
@@ -59,29 +58,33 @@ func TreeCommand(name string) *cobra.Command {
 
 // TreeRunner contains the run function
 type TreeRunner struct {
-	IncludeSubpackages bool
-	Command            *cobra.Command
-	name               bool
-	resources          bool
-	ports              bool
-	images             bool
-	replicas           bool
-	all                bool
-	env                bool
-	args               bool
-	cmd                bool
-	fields             []string
-	includeLocal       bool
-	excludeNonLocal    bool
-	structure          string
+	Command         *cobra.Command
+	name            bool
+	resources       bool
+	ports           bool
+	images          bool
+	replicas        bool
+	all             bool
+	env             bool
+	args            bool
+	cmd             bool
+	fields          []string
+	includeLocal    bool
+	excludeNonLocal bool
+	structure       string
 }
 
 func (r *TreeRunner) runE(c *cobra.Command, args []string) error {
 	var input kio.Reader
 	var root = "."
+	openAPIFileName, err := ext.OpenAPIFileName()
+	if err != nil {
+		return err
+	}
+	matchFilesGlob := append([]string{openAPIFileName}, kio.DefaultMatch...)
 	if len(args) == 1 {
 		root = filepath.Clean(args[0])
-		input = kio.LocalPackageReader{PackagePath: args[0]}
+		input = kio.LocalPackageReader{PackagePath: args[0], MatchFilesGlob: matchFilesGlob}
 	} else {
 		input = &kio.ByteReader{Reader: c.InOrStdin()}
 	}
@@ -159,7 +162,9 @@ func (r *TreeRunner) runE(c *cobra.Command, args []string) error {
 			Root:      root,
 			Writer:    c.OutOrStdout(),
 			Fields:    fields,
-			Structure: kio.TreeStructure(r.structure)}},
+			Structure: kio.TreeStructure(r.structure),
+			OpenAPIFileName: openAPIFileName,
+		}},
 	}.Execute())
 }
 

cmd/config/internal/commands/tree_test.go

@@ -90,6 +90,109 @@ spec:
 	}
 }
 
+func TestTreeCommand_subpkgs(t *testing.T) {
+	d, err := ioutil.TempDir("", "kustomize-tree-test")
+	defer os.RemoveAll(d)
+	if !assert.NoError(t, err) {
+		t.FailNow()
+	}
+
+	err = os.MkdirAll(filepath.Join(d, "subpkg"), 0700)
+	if !assert.NoError(t, err) {
+		t.FailNow()
+	}
+
+	err = ioutil.WriteFile(filepath.Join(d, "f1.yaml"), []byte(`
+apiVersion: v1
+kind: Abstraction
+metadata:
+  name: foo
+  configFn:
+    container:
+      image: gcr.io/example/reconciler:v1
+  annotations:
+    config.kubernetes.io/local-config: "true"
+spec:
+  replicas: 1
+---
+kind: Deployment
+metadata:
+  labels:
+    app: nginx2
+  name: foo
+  annotations:
+    app: nginx2
+spec:
+  replicas: 1
+---
+kind: Service
+metadata:
+  name: foo
+  annotations:
+    app: nginx
+spec:
+  selector:
+    app: nginx
+`), 0600)
+	if !assert.NoError(t, err) {
+		return
+	}
+	err = ioutil.WriteFile(filepath.Join(d, "subpkg", "f2.yaml"), []byte(`kind: Deployment
+metadata:
+  labels:
+    app: nginx
+  name: bar
+  annotations:
+    app: nginx
+spec:
+  replicas: 3
+`), 0600)
+	if !assert.NoError(t, err) {
+		return
+	}
+
+	err = ioutil.WriteFile(filepath.Join(d, "Krmfile"), []byte(`apiVersion: kpt.dev/v1alpha1
+kind: Krmfile
+metadata:
+  name: mainpkg
+openAPI:
+  definitions:
+`), 0600)
+	if !assert.NoError(t, err) {
+		return
+	}
+	err = ioutil.WriteFile(filepath.Join(d, "subpkg", "Krmfile"), []byte(`apiVersion: kpt.dev/v1alpha1
+kind: Krmfile
+metadata:
+  name: subpkg
+openAPI:
+  definitions:
+`), 0600)
+	if !assert.NoError(t, err) {
+		return
+	}
+
+	// fmt the files
+	b := &bytes.Buffer{}
+	r := commands.GetTreeRunner("")
+	r.Command.SetArgs([]string{d})
+	r.Command.SetOut(b)
+	if !assert.NoError(t, r.Command.Execute()) {
+		return
+	}
+
+	if !assert.Equal(t, fmt.Sprintf(`%s
+├── [Krmfile]  Krmfile mainpkg
+├── [f1.yaml]  Deployment foo
+├── [f1.yaml]  Service foo
+└── Pkg: subpkg
+    ├── [Krmfile]  Krmfile subpkg
+    └── [f2.yaml]  Deployment bar
+`, d), b.String()) {
+		return
+	}
+}
+
 func TestTreeCommand_stdin(t *testing.T) {
 	// fmt the files
 	b := &bytes.Buffer{}