pkg/components: use NewConfig() when getting default config for tests

So we don't rely on other packages while running unit tests. Refs #992 Signed-off-by: Mateusz Gozdek <mateusz@kinvolk.io>
kinvolk · Dec 3, 2020 · 1015951 · 1015951
1 parent 26d5121
commit 1015951
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 34 deletions.
diff --git a/pkg/components/dex/component_test.go b/pkg/components/dex/component_test.go
@@ -17,7 +17,7 @@ package dex_test
 import (
 	"testing"
 
-	"github.com/kinvolk/lokomotive/pkg/components"
+	"github.com/kinvolk/lokomotive/pkg/components/dex"
 	"github.com/kinvolk/lokomotive/pkg/components/util"
 )
 
@@ -110,10 +110,7 @@ func TestRenderManifest(t *testing.T) {
 			t.Fatalf("%s - Error getting component body: %v", tc.desc, d)
 		}
 
-		c, err := components.Get(name)
-		if err != nil {
-			t.Fatalf("failed getting component: %v", err)
-		}
+		c := dex.NewConfig()
 
 		d = c.LoadConfig(b, nil)
 
@@ -145,10 +142,7 @@ func TestDeploymentAnnotationHashChange(t *testing.T) {
 			t.Fatalf("%s - Error getting component body: %v", tc.desc, d)
 		}
 
-		c, err := components.Get(name)
-		if err != nil {
-			t.Fatalf("failed getting component: %v", err)
-		}
+		c := dex.NewConfig()
 
 		d = c.LoadConfig(b, nil)
 		if !tc.wantErr && d.HasErrors() {

diff --git a/pkg/components/gangway/component_test.go b/pkg/components/gangway/component_test.go
@@ -17,7 +17,7 @@ package gangway_test
 import (
 	"testing"
 
-	"github.com/kinvolk/lokomotive/pkg/components"
+	"github.com/kinvolk/lokomotive/pkg/components/gangway"
 	"github.com/kinvolk/lokomotive/pkg/components/util"
 )
 
@@ -62,10 +62,7 @@ component "gangway" {
 			t.Errorf("%s - Error getting component body: %v", tc.desc, d)
 		}
 
-		c, err := components.Get(name)
-		if err != nil {
-			t.Fatalf("failed getting component: %v", err)
-		}
+		c := gangway.NewConfig()
 
 		d = c.LoadConfig(b, nil)
 

diff --git a/pkg/components/httpbin/component_test.go b/pkg/components/httpbin/component_test.go
@@ -17,7 +17,7 @@ package httpbin_test
 import (
 	"testing"
 
-	"github.com/kinvolk/lokomotive/pkg/components"
+	"github.com/kinvolk/lokomotive/pkg/components/httpbin"
 	"github.com/kinvolk/lokomotive/pkg/components/util"
 )
 
@@ -54,10 +54,7 @@ component "httpbin" {
 			t.Errorf("%s - Error getting component body: %v", tc.desc, d)
 		}
 
-		c, err := components.Get(name)
-		if err != nil {
-			t.Fatalf("failed getting component: %v", err)
-		}
+		c := httpbin.NewConfig()
 
 		d = c.LoadConfig(b, nil)
 

diff --git a/pkg/components/inspektor-gadget/component_test.go b/pkg/components/inspektor-gadget/component_test.go
@@ -23,15 +23,12 @@ import (
 	appsv1 "k8s.io/api/apps/v1"
 	"sigs.k8s.io/yaml"
 
-	"github.com/kinvolk/lokomotive/pkg/components"
+	inspektorgadget "github.com/kinvolk/lokomotive/pkg/components/inspektor-gadget"
 	"github.com/kinvolk/lokomotive/pkg/components/util"
 )
 
 func renderManifests(configHCL string) (map[string]string, error) {
-	component, err := components.Get("inspektor-gadget")
-	if err != nil {
-		return nil, err
-	}
+	component := inspektorgadget.NewConfig()
 
 	body, diagnostics := util.GetComponentBody(configHCL, "inspektor-gadget")
 	if diagnostics != nil {

diff --git a/pkg/components/rook/component_conversion_test.go b/pkg/components/rook/component_conversion_test.go
@@ -23,7 +23,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	"sigs.k8s.io/yaml"
 
-	"github.com/kinvolk/lokomotive/pkg/components"
+	"github.com/kinvolk/lokomotive/pkg/components/rook"
 	"github.com/kinvolk/lokomotive/pkg/components/util"
 )
 
@@ -102,10 +102,7 @@ component "rook" {
 func renderManifests(t *testing.T, configHCL string) map[string]string {
 	name := "rook"
 
-	component, err := components.Get(name)
-	if err != nil {
-		t.Fatalf("Getting component %q: %v", name, err)
-	}
+	component := rook.NewConfig()
 
 	body, diagnostics := util.GetComponentBody(configHCL, name)
 	if diagnostics != nil {

diff --git a/pkg/components/web-ui/component_test.go b/pkg/components/web-ui/component_test.go
@@ -24,15 +24,12 @@ import (
 	networkingv1beta1 "k8s.io/api/networking/v1beta1"
 	"sigs.k8s.io/yaml"
 
-	"github.com/kinvolk/lokomotive/pkg/components"
 	"github.com/kinvolk/lokomotive/pkg/components/util"
+	webui "github.com/kinvolk/lokomotive/pkg/components/web-ui"
 )
 
 func renderManifests(configHCL string) (map[string]string, error) {
-	component, err := components.Get("web-ui")
-	if err != nil {
-		return nil, err
-	}
+	component := webui.NewConfig()
 
 	body, diagnostics := util.GetComponentBody(configHCL, "web-ui")
 	if diagnostics != nil {