From f9d1251ca18fa557e8201f62724016b427695980 Mon Sep 17 00:00:00 2001
From: Sean Sullivan <seans@google.com>
Date: Fri, 13 Mar 2020 14:12:11 -0700
Subject: [PATCH] Fixes grouping object namespace calculation

---
 pkg/config/initoptions.go      | 30 +++++++++++++++++-------------
 pkg/config/initoptions_test.go |  6 +++---
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/pkg/config/initoptions.go b/pkg/config/initoptions.go
index 6a14707..bd85258 100644
--- a/pkg/config/initoptions.go
+++ b/pkg/config/initoptions.go
@@ -60,11 +60,11 @@ metadata:
 // grouping object template ConfigMap.
 type InitOptions struct {
 	ioStreams genericclioptions.IOStreams
-	// Package directory argument
+	// Package directory argument; must be valid directory.
 	Dir string
-	// Namespace for grouping object
+	// Namespace for grouping object; can not be empty.
 	Namespace string
-	// Grouping object label value
+	// Grouping object label value; must be a valid k8s label value.
 	GroupName string
 	// Random seed
 	Seed int64
@@ -89,7 +89,8 @@ func (i *InitOptions) Complete(args []string) error {
 		return fmt.Errorf("invalid directory argument: %s", i.Dir)
 	}
 	if len(i.Namespace) == 0 {
-		namespace, err := packageNamespace(i.Dir)
+		// Returns default namespace if no namespace found.
+		namespace, err := calcPackageNamespace(i.Dir)
 		if err != nil {
 			return err
 		}
@@ -115,34 +116,37 @@ func isDirectory(path string) bool {
 	return false
 }
 
-// packageNamespace returns the namespace of the package
-// config files.
-func packageNamespace(packageDir string) (string, error) {
+// calcPackageNamespace returns the namespace of the package
+// config files. Assumes all namespaced resources are in the
+// same namespace. Returns the default namespace if none of the
+// config files has a namespace.
+func calcPackageNamespace(packageDir string) (string, error) {
 	r := kio.LocalPackageReader{PackagePath: packageDir}
 	nodes, err := r.Read()
 	if err != nil {
 		return "", err
 	}
-	namespace := metav1.NamespaceDefault
+	// Return the first non-empty namespace found. Cluster-scoped
+	// resources do not have namespace set.
 	for _, node := range nodes {
 		rm, err := node.GetMeta()
 		if err != nil {
 			continue
 		}
 		if len(rm.ObjectMeta.Namespace) > 0 {
-			namespace = rm.ObjectMeta.Namespace
+			return rm.ObjectMeta.Namespace, nil
 		}
-		break
 	}
-	return namespace, nil
+	// Return the default namespace if none found.
+	return metav1.NamespaceDefault, nil
 }
 
 // defaultGroupName returns a string of the package name (directory)
 // with a random number suffix.
 func (i *InitOptions) defaultGroupName() string {
 	rand.Seed(i.Seed)
-	r := rand.Intn(1000000)
-	return fmt.Sprintf("%s-%06d", filepath.Base(i.Dir), r)
+	r := rand.Intn(1000000000)
+	return fmt.Sprintf("%s-%09d", filepath.Base(i.Dir), r)
 }
 
 const groupNameRegexp = `^[a-zA-Z0-9-_\.]+$`
diff --git a/pkg/config/initoptions_test.go b/pkg/config/initoptions_test.go
index 5a5680a..6b96051 100644
--- a/pkg/config/initoptions_test.go
+++ b/pkg/config/initoptions_test.go
@@ -52,17 +52,17 @@ func TestDefaultGroupName(t *testing.T) {
 		"Basic Seed/Dir": {
 			seed:     31,
 			dir:      "bar",
-			expected: "bar-851636",
+			expected: "bar-720851636",
 		},
 		"Hierarchical directory": {
 			seed:     31,
 			dir:      "foo/bar",
-			expected: "bar-851636",
+			expected: "bar-720851636",
 		},
 		"Absolute directory": {
 			seed:     31,
 			dir:      "/tmp/foo/bar",
-			expected: "bar-851636",
+			expected: "bar-720851636",
 		},
 	}