fix: test and namespace isolation

Author: lkingland

cmd/build_test.go

@@ -6,6 +6,7 @@ import (
 
 	fn "knative.dev/func/pkg/functions"
 	"knative.dev/func/pkg/mock"
+	. "knative.dev/func/pkg/testing"
 )
 
 // TestBuild_BuilderPersists ensures that the builder chosen is read from
@@ -94,7 +95,7 @@ func TestBuild_RegistryOrImageRequired(t *testing.T) {
 // - Push not triggered after an unsuccessful build
 // - Push can be disabled
 func TestBuild_Push(t *testing.T) {
-	root := fromTempDirectory(t)
+	root := FromTempDirectory(t)
 
 	f := fn.Function{
 		Root:     root,

cmd/client.go

@@ -62,7 +62,7 @@ func NewClient(cfg ClientConfig, options ...fn.Option) (*fn.Client, func()) {
 	var (
 		t  = newTransport(cfg.InsecureSkipVerify)    // may provide a custom impl which proxies
 		c  = newCredentialsProvider(config.Dir(), t) // for accessing registries
-		d  = newKnativeDeployer(cfg.Namespace, cfg.Verbose)
+		d  = newKnativeDeployer(cfg.Verbose)
 		pp = newTektonPipelinesProvider(cfg.Namespace, c, cfg.Verbose)
 		o  = []fn.Option{ // standard (shared) options for all commands
 			fn.WithVerbose(cfg.Verbose),
@@ -128,9 +128,8 @@ func newTektonPipelinesProvider(namespace string, creds docker.CredentialsProvid
 	return tekton.NewPipelinesProvider(options...)
 }
 
-func newKnativeDeployer(namespace string, verbose bool) fn.Deployer {
+func newKnativeDeployer(verbose bool) fn.Deployer {
 	options := []knative.DeployerOpt{
-		knative.WithDeployerNamespace(namespace),
 		knative.WithDeployerVerbose(verbose),
 		knative.WithDeployerDecorator(deployDecorator{}),
 	}

cmd/create_test.go

@@ -4,13 +4,14 @@ import (
 	"errors"
 	"testing"
 
+	. "knative.dev/func/pkg/testing"
 	"knative.dev/func/pkg/utils"
 )
 
 // TestCreate_Execute ensures that an invocation of create with minimal settings
 // and valid input completes without error; degenerate case.
 func TestCreate_Execute(t *testing.T) {
-	_ = fromTempDirectory(t)
+	_ = FromTempDirectory(t)
 
 	cmd := NewCreateCmd(NewClient)
 	cmd.SetArgs([]string{"--language", "go", "myfunc"})
@@ -23,7 +24,7 @@ func TestCreate_Execute(t *testing.T) {
 // TestCreate_NoRuntime ensures that an invocation of create must be
 // done with a runtime.
 func TestCreate_NoRuntime(t *testing.T) {
-	_ = fromTempDirectory(t)
+	_ = FromTempDirectory(t)
 
 	cmd := NewCreateCmd(NewClient)
 	cmd.SetArgs([]string{"myfunc"}) // Do not use test command args
@@ -38,7 +39,7 @@ func TestCreate_NoRuntime(t *testing.T) {
 // TestCreate_WithNoRuntime ensures that an invocation of create must be
 // done with one of the valid runtimes only.
 func TestCreate_WithInvalidRuntime(t *testing.T) {
-	_ = fromTempDirectory(t)
+	_ = FromTempDirectory(t)
 
 	cmd := NewCreateCmd(NewClient)
 	cmd.SetArgs([]string{"--language", "invalid", "myfunc"})
@@ -53,7 +54,7 @@ func TestCreate_WithInvalidRuntime(t *testing.T) {
 // TestCreate_InvalidTemplate ensures that an invocation of create must be
 // done with one of the valid templates only.
 func TestCreate_InvalidTemplate(t *testing.T) {
-	_ = fromTempDirectory(t)
+	_ = FromTempDirectory(t)
 
 	cmd := NewCreateCmd(NewClient)
 	cmd.SetArgs([]string{"--language", "go", "--template", "invalid", "myfunc"})
@@ -68,7 +69,7 @@ func TestCreate_InvalidTemplate(t *testing.T) {
 // TestCreate_ValidatesName ensures that the create command only accepts
 // DNS-1123 labels for function name.
 func TestCreate_ValidatesName(t *testing.T) {
-	_ = fromTempDirectory(t)
+	_ = FromTempDirectory(t)
 
 	// Execute the command with a function name containing invalid characters and
 	// confirm the expected error is returned
@@ -84,7 +85,7 @@ func TestCreate_ValidatesName(t *testing.T) {
 // TestCreate_ConfigOptional ensures that the system can be used without
 // any additional configuration being required.
 func TestCreate_ConfigOptional(t *testing.T) {
-	_ = fromTempDirectory(t)
+	_ = FromTempDirectory(t)
 
 	t.Setenv("XDG_CONFIG_HOME", t.TempDir())
 

cmd/delete_test.go

@@ -7,13 +7,14 @@ import (
 
 	fn "knative.dev/func/pkg/functions"
 	"knative.dev/func/pkg/mock"
+	. "knative.dev/func/pkg/testing"
 )
 
 // TestDelete_Default ensures that the deployed function is deleted correctly
 // with default options
 func TestDelete_Default(t *testing.T) {
 	var (
-		root      = fromTempDirectory(t)
+		root      = FromTempDirectory(t)
 		namespace = "myns"
 		remover   = mock.NewRemover()
 		err       error
@@ -61,7 +62,7 @@ func TestDelete_Default(t *testing.T) {
 // function explicitly as an argument invokes the remover appropriately.
 func TestDelete_ByName(t *testing.T) {
 	var (
-		root          = fromTempDirectory(t)
+		root          = FromTempDirectory(t)
 		testname      = "testname"        // explicit name for the function
 		testnamespace = "testnamespace"   // explicit namespace for the function
 		remover       = mock.NewRemover() // with a mock remover
@@ -141,7 +142,7 @@ func TestDelete_Namespace(t *testing.T) {
 // ignores the the function on disk
 func TestDelete_NamespaceFlagPriority(t *testing.T) {
 	var (
-		root       = fromTempDirectory(t)
+		root       = FromTempDirectory(t)
 		namespace  = "myns"
 		namespace2 = "myns2"
 		remover    = mock.NewRemover()
@@ -184,7 +185,7 @@ func TestDelete_NamespaceFlagPriority(t *testing.T) {
 // TestDelete_NamespaceWithoutNameFails ensures that providing wrong argument
 // combination fails nice and fast (no name of the Function)
 func TestDelete_NamespaceWithoutNameFails(t *testing.T) {
-	_ = fromTempDirectory(t)
+	_ = FromTempDirectory(t)
 
 	cmd := NewDeleteCmd(NewTestClient())
 	cmd.SetArgs([]string{"--namespace=myns"})
@@ -196,7 +197,7 @@ func TestDelete_NamespaceWithoutNameFails(t *testing.T) {
 // TestDelete_ByProject ensures that running delete with a valid project as its
 // context invokes remove and with the correct name (reads name from func.yaml)
 func TestDelete_ByProject(t *testing.T) {
-	_ = fromTempDirectory(t)
+	_ = FromTempDirectory(t)
 
 	// Write a func.yaml config which specifies a name
 	funcYaml := `name: bar
@@ -248,7 +249,7 @@ func TestDelete_ByPath(t *testing.T) {
 
 		// A mock remover which will be sampled to ensure it is not invoked.
 		remover   = mock.NewRemover()
-		root      = fromTempDirectory(t)
+		root      = FromTempDirectory(t)
 		err       error
 		namespace = "func"
 	)