commands/.../test/local,pkg/test: add no-setup flag

operator-framework · Nov 21, 2018 · c18d616 · c18d616
1 parent c793226
commit c18d616
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 11 deletions.
diff --git a/commands/operator-sdk/cmd/test/local.go b/commands/operator-sdk/cmd/test/local.go
@@ -39,6 +39,7 @@ type testLocalConfig struct {
 	namespacedManPath string
 	goTestFlags       string
 	namespace         string
+	noSetup           bool
 }
 
 var tlConfig testLocalConfig
@@ -54,6 +55,7 @@ func NewTestLocalCmd() *cobra.Command {
 	testCmd.Flags().StringVar(&tlConfig.namespacedManPath, "namespaced-manifest", "", "Path to manifest for per-test, namespaced resources (e.g. RBAC and Operator manifest)")
 	testCmd.Flags().StringVar(&tlConfig.goTestFlags, "go-test-flags", "", "Additional flags to pass to go test")
 	testCmd.Flags().StringVar(&tlConfig.namespace, "namespace", "", "If non-empty, single namespace to run tests in")
+	testCmd.Flags().BoolVar(&tlConfig.noSetup, "no-setup", false, "Disable test resource creation")
 
 	return testCmd
 }
@@ -62,11 +64,14 @@ func testLocalFunc(cmd *cobra.Command, args []string) {
 	if len(args) != 1 {
 		log.Fatal("operator-sdk test local requires exactly 1 argument")
 	}
+	if (tlConfig.noSetup && tlConfig.globalManPath != "") || (tlConfig.noSetup && tlConfig.namespacedManPath != "") {
+		log.Fatal("the global-manifest and namespaced-manifest flags cannot be enabled at the same time as the no-setup flag")
+	}
 
 	log.Info("Testing operator locally.")
 
 	// if no namespaced manifest path is given, combine deploy/service_account.yaml, deploy/role.yaml, deploy/role_binding.yaml and deploy/operator.yaml
-	if tlConfig.namespacedManPath == "" {
+	if tlConfig.namespacedManPath == "" && !tlConfig.noSetup {
 		err := os.MkdirAll(deployTestDir, os.FileMode(fileutil.DefaultDirFileMode))
 		if err != nil {
 			log.Fatalf("could not create %s: (%v)", deployTestDir, err)
@@ -105,7 +110,7 @@ func testLocalFunc(cmd *cobra.Command, args []string) {
 			}
 		}()
 	}
-	if tlConfig.globalManPath == "" {
+	if tlConfig.globalManPath == "" && !tlConfig.noSetup {
 		err := os.MkdirAll(deployTestDir, os.FileMode(fileutil.DefaultDirFileMode))
 		if err != nil {
 			log.Fatalf("could not create %s: (%v)", deployTestDir, err)
@@ -141,6 +146,25 @@ func testLocalFunc(cmd *cobra.Command, args []string) {
 			}
 		}()
 	}
+	if tlConfig.noSetup {
+		err := os.MkdirAll(deployTestDir, os.FileMode(fileutil.DefaultDirFileMode))
+		if err != nil {
+			log.Fatalf("could not create %s: (%v)", deployTestDir, err)
+		}
+		tlConfig.namespacedManPath = filepath.Join(deployTestDir, "empty.yaml")
+		tlConfig.globalManPath = filepath.Join(deployTestDir, "empty.yaml")
+		emptyBytes := []byte{}
+		err = ioutil.WriteFile(tlConfig.globalManPath, emptyBytes, os.FileMode(fileutil.DefaultFileMode))
+		if err != nil {
+			log.Fatalf("could not create empty manifest file: (%v)", err)
+		}
+		defer func() {
+			err := os.Remove(tlConfig.globalManPath)
+			if err != nil {
+				log.Fatalf("could not delete empty manifest file: (%v)", err)
+			}
+		}()
+	}
 	testArgs := []string{"test", args[0] + "/..."}
 	testArgs = append(testArgs, "-"+test.KubeConfigFlag, tlConfig.kubeconfig)
 	testArgs = append(testArgs, "-"+test.NamespacedManPathFlag, tlConfig.namespacedManPath)
@@ -151,7 +175,7 @@ func testLocalFunc(cmd *cobra.Command, args []string) {
 	if tlConfig.goTestFlags != "" {
 		testArgs = append(testArgs, strings.Split(tlConfig.goTestFlags, " ")...)
 	}
-	if tlConfig.namespace != "" {
+	if tlConfig.namespace != "" || tlConfig.noSetup {
 		testArgs = append(testArgs, "-"+test.SingleNamespaceFlag, "-parallel=1")
 	}
 	dc := exec.Command("go", testArgs...)

diff --git a/pkg/test/framework.go b/pkg/test/framework.go
@@ -57,6 +57,10 @@ type Framework struct {
 }
 
 func setup(kubeconfigPath, namespacedManPath *string) error {
+	namespace := ""
+	if *singleNamespace {
+		namespace = os.Getenv(TestNamespaceEnv)
+	}
 	var err error
 	var kubeconfig *rest.Config
 	if *kubeconfigPath == "incluster" {
@@ -74,7 +78,11 @@ func setup(kubeconfigPath, namespacedManPath *string) error {
 		kubeconfig, err = rest.InClusterConfig()
 		*singleNamespace = true
 	} else {
-		kubeconfig, _, err = k8sInternal.GetKubeconfigAndNamespace(*kubeconfigPath)
+		var kcNamespace string
+		kubeconfig, kcNamespace, err = k8sInternal.GetKubeconfigAndNamespace(*kubeconfigPath)
+		if *singleNamespace && namespace == "" {
+			namespace = kcNamespace
+		}
 	}
 	if err != nil {
 		return fmt.Errorf("failed to build the kubeconfig: %v", err)
@@ -91,13 +99,6 @@ func setup(kubeconfigPath, namespacedManPath *string) error {
 		return fmt.Errorf("failed to build the dynamic client: %v", err)
 	}
 	dynamicDecoder = serializer.NewCodecFactory(scheme).UniversalDeserializer()
-	namespace := ""
-	if *singleNamespace {
-		namespace = os.Getenv(TestNamespaceEnv)
-		if len(namespace) == 0 {
-			return fmt.Errorf("namespace set in %s cannot be empty", TestNamespaceEnv)
-		}
-	}
 	Global = &Framework{
 		Client:            &frameworkClient{Client: dynClient},
 		KubeConfig:        kubeconfig,

diff --git a/pkg/test/resource_creator.go b/pkg/test/resource_creator.go
@@ -66,6 +66,10 @@ func (ctx *TestCtx) createFromYAML(yamlFile []byte, skipIfExists bool, cleanupOp
 	}
 	yamlSplit := bytes.Split(yamlFile, []byte("\n---\n"))
 	for _, yamlSpec := range yamlSplit {
+		// some autogenerated files may include an extra `---` at the end of the file
+		if string(yamlSpec) == "" {
+			continue
+		}
 		yamlSpec, err = setNamespaceYAML(yamlSpec, namespace)
 		if err != nil {
 			return err