Rename test fixture dirs to testdata

.gitignore

@@ -14,7 +14,6 @@ maesh
 /dist/
 .vscode
 vendor
-integration/resources/compose/images
 pages/
 maesh-gh-pages*
 *.zip

integration/acl_disabled_test.go

@@ -19,17 +19,17 @@ func (s *ACLDisabledSuite) SetUpSuite(c *check.C) {
 	}
 	s.startk3s(c, requiredImages)
 	s.startAndWaitForCoreDNS(c)
-	s.createResources(c, "resources/state-table/")
-	s.createResources(c, "resources/smi/crds/")
+	s.createResources(c, "testdata/state-table/")
+	s.createResources(c, "testdata/smi/crds/")
 }
 
 func (s *ACLDisabledSuite) TearDownSuite(c *check.C) {
 	s.stopK3s()
 }
 
 func (s *ACLDisabledSuite) TestHTTPService(c *check.C) {
-	s.createResources(c, "resources/acl/disabled/http")
-	defer s.deleteResources(c, "resources/acl/disabled/http")
+	s.createResources(c, "testdata/acl/disabled/http")
+	defer s.deleteResources(c, "testdata/acl/disabled/http")
 	defer s.deleteShadowServices(c)
 
 	s.waitForPods(c, []string{"server"})
@@ -40,7 +40,7 @@ func (s *ACLDisabledSuite) TestHTTPService(c *check.C) {
 	c.Assert(err, checker.IsNil)
 	defer s.stopMaeshBinary(c, cmd.Process)
 
-	config := s.testConfigurationWithReturn(c, "resources/acl/disabled/http.json")
+	config := s.testConfigurationWithReturn(c, "testdata/acl/disabled/http.json")
 
 	serverSvc := s.getService(c, "server")
 	serverPod := s.getPod(c, "server")
@@ -51,8 +51,8 @@ func (s *ACLDisabledSuite) TestHTTPService(c *check.C) {
 }
 
 func (s *ACLDisabledSuite) TestTCPService(c *check.C) {
-	s.createResources(c, "resources/acl/disabled/tcp")
-	defer s.deleteResources(c, "resources/acl/disabled/tcp")
+	s.createResources(c, "testdata/acl/disabled/tcp")
+	defer s.deleteResources(c, "testdata/acl/disabled/tcp")
 	defer s.deleteShadowServices(c)
 
 	s.waitForPods(c, []string{"server"})
@@ -63,7 +63,7 @@ func (s *ACLDisabledSuite) TestTCPService(c *check.C) {
 	c.Assert(err, checker.IsNil)
 	defer s.stopMaeshBinary(c, cmd.Process)
 
-	config := s.testConfigurationWithReturn(c, "resources/acl/disabled/tcp.json")
+	config := s.testConfigurationWithReturn(c, "testdata/acl/disabled/tcp.json")
 
 	serverSvc := s.getService(c, "server")
 	serverPod := s.getPod(c, "server")
@@ -73,8 +73,8 @@ func (s *ACLDisabledSuite) TestTCPService(c *check.C) {
 }
 
 func (s *ACLDisabledSuite) TestUDPService(c *check.C) {
-	s.createResources(c, "resources/acl/disabled/udp")
-	defer s.deleteResources(c, "resources/acl/disabled/udp")
+	s.createResources(c, "testdata/acl/disabled/udp")
+	defer s.deleteResources(c, "testdata/acl/disabled/udp")
 	defer s.deleteShadowServices(c)
 
 	s.waitForPods(c, []string{"server"})
@@ -85,7 +85,7 @@ func (s *ACLDisabledSuite) TestUDPService(c *check.C) {
 	c.Assert(err, checker.IsNil)
 	defer s.stopMaeshBinary(c, cmd.Process)
 
-	config := s.testConfigurationWithReturn(c, "resources/acl/disabled/udp.json")
+	config := s.testConfigurationWithReturn(c, "testdata/acl/disabled/udp.json")
 
 	serverSvc := s.getService(c, "server")
 	serverPod := s.getPod(c, "server")
@@ -95,8 +95,8 @@ func (s *ACLDisabledSuite) TestUDPService(c *check.C) {
 }
 
 func (s *ACLDisabledSuite) TestSplitTraffic(c *check.C) {
-	s.createResources(c, "resources/acl/disabled/traffic-split")
-	defer s.deleteResources(c, "resources/acl/disabled/traffic-split")
+	s.createResources(c, "testdata/acl/disabled/traffic-split")
+	defer s.deleteResources(c, "testdata/acl/disabled/traffic-split")
 	defer s.deleteShadowServices(c)
 
 	s.waitForPods(c, []string{"server-v1", "server-v2"})
@@ -107,7 +107,7 @@ func (s *ACLDisabledSuite) TestSplitTraffic(c *check.C) {
 	c.Assert(err, checker.IsNil)
 	defer s.stopMaeshBinary(c, cmd.Process)
 
-	config := s.testConfigurationWithReturn(c, "resources/acl/disabled/traffic-split.json")
+	config := s.testConfigurationWithReturn(c, "testdata/acl/disabled/traffic-split.json")
 
 	s.checkBlockAllMiddleware(c, config)
 	s.checkHTTPReadinessService(c, config)

integration/acl_enabled_test.go

@@ -19,8 +19,8 @@ func (s *ACLEnabledSuite) SetUpSuite(c *check.C) {
 	}
 	s.startk3s(c, requiredImages)
 	s.startAndWaitForCoreDNS(c)
-	s.createResources(c, "resources/state-table/")
-	s.createResources(c, "resources/smi/crds/")
+	s.createResources(c, "testdata/state-table/")
+	s.createResources(c, "testdata/smi/crds/")
 }
 
 func (s *ACLEnabledSuite) TearDownSuite(c *check.C) {
@@ -37,8 +37,8 @@ func (s *ACLEnabledSuite) TestTrafficTargetWithSMI(c *check.C) {
 }
 
 func (s *ACLEnabledSuite) testTrafficTarget(smi, acl bool, c *check.C) {
-	s.createResources(c, "resources/acl/enabled/traffic-target")
-	defer s.deleteResources(c, "resources/acl/enabled/traffic-target")
+	s.createResources(c, "testdata/acl/enabled/traffic-target")
+	defer s.deleteResources(c, "testdata/acl/enabled/traffic-target")
 	defer s.deleteShadowServices(c)
 
 	s.waitForPods(c, []string{"client-a", "client-b", "server"})
@@ -49,7 +49,7 @@ func (s *ACLEnabledSuite) testTrafficTarget(smi, acl bool, c *check.C) {
 	c.Assert(err, checker.IsNil)
 	defer s.stopMaeshBinary(c, cmd.Process)
 
-	config := s.testConfigurationWithReturn(c, "resources/acl/enabled/traffic-target.json")
+	config := s.testConfigurationWithReturn(c, "testdata/acl/enabled/traffic-target.json")
 
 	svc := s.getService(c, "server")
 	tt := s.getTrafficTarget(c, "traffic-target")
@@ -72,8 +72,8 @@ func (s *ACLEnabledSuite) TestTrafficSplitSMIEnable(c *check.C) {
 }
 
 func (s *ACLEnabledSuite) testTrafficSplit(smi, acl bool, c *check.C) {
-	s.createResources(c, "resources/acl/enabled/traffic-split")
-	defer s.deleteResources(c, "resources/acl/enabled/traffic-split")
+	s.createResources(c, "testdata/acl/enabled/traffic-split")
+	defer s.deleteResources(c, "testdata/acl/enabled/traffic-split")
 	defer s.deleteShadowServices(c)
 
 	s.waitForPods(c, []string{"client-a", "client-b", "server-v1", "server-v2"})
@@ -84,7 +84,7 @@ func (s *ACLEnabledSuite) testTrafficSplit(smi, acl bool, c *check.C) {
 	c.Assert(err, checker.IsNil)
 	defer s.stopMaeshBinary(c, cmd.Process)
 
-	config := s.testConfigurationWithReturn(c, "resources/acl/enabled/traffic-split.json")
+	config := s.testConfigurationWithReturn(c, "testdata/acl/enabled/traffic-split.json")
 
 	s.checkBlockAllMiddleware(c, config)
 	s.checkHTTPReadinessService(c, config)

integration/coredns_test.go

@@ -23,8 +23,8 @@ func (s *CoreDNSSuite) SetUpSuite(c *check.C) {
 	s.startk3s(c, requiredImages)
 	s.startWhoami(c)
 	s.installTinyToolsMaesh(c)
-	s.createResources(c, "resources/state-table/")
-	s.createResources(c, "resources/smi/crds/")
+	s.createResources(c, "testdata/state-table/")
+	s.createResources(c, "testdata/smi/crds/")
 }
 
 func (s *CoreDNSSuite) TearDownSuite(c *check.C) {
@@ -54,8 +54,8 @@ func (s *CoreDNSSuite) TestCoreDNSVersionSafe(c *check.C) {
 		},
 	}
 
-	s.createResources(c, "resources/coredns/corednssafe.yaml")
-	defer s.deleteResources(c, "resources/coredns/corednssafe.yaml")
+	s.createResources(c, "testdata/coredns/corednssafe.yaml")
+	defer s.deleteResources(c, "testdata/coredns/corednssafe.yaml")
 
 	for _, test := range testCases {
 		s.WaitForCoreDNS(c)
@@ -91,8 +91,8 @@ func (s *CoreDNSSuite) TestCoreDNSVersion(c *check.C) {
 		},
 	}
 
-	s.createResources(c, "resources/coredns/coredns.yaml")
-	defer s.deleteResources(c, "resources/coredns/coredns.yaml")
+	s.createResources(c, "testdata/coredns/coredns.yaml")
+	defer s.deleteResources(c, "testdata/coredns/coredns.yaml")
 
 	for _, test := range testCases {
 		s.WaitForCoreDNS(c)
@@ -109,8 +109,8 @@ func (s *CoreDNSSuite) TestCoreDNSVersion(c *check.C) {
 }
 
 func (s *CoreDNSSuite) TestCoreDNSDig(c *check.C) {
-	s.createResources(c, "resources/coredns/coredns.yaml")
-	defer s.deleteResources(c, "resources/coredns/coredns.yaml")
+	s.createResources(c, "testdata/coredns/coredns.yaml")
+	defer s.deleteResources(c, "testdata/coredns/coredns.yaml")
 	s.WaitForCoreDNS(c)
 
 	cmd := s.startMaeshBinaryCmd(c, false, false)

integration/helm_test.go

@@ -16,7 +16,7 @@ func (s *HelmSuite) SetUpSuite(c *check.C) {
 	s.startk3s(c, requiredImages)
 	s.startAndWaitForCoreDNS(c)
 	s.startWhoami(c)
-	s.createResources(c, "resources/smi/crds/")
+	s.createResources(c, "testdata/smi/crds/")
 }
 
 func (s *HelmSuite) TearDownSuite(c *check.C) {

integration/integration_test.go

@@ -294,7 +294,7 @@ func (s *BaseSuite) waitForPods(c *check.C, pods []string) {
 }
 
 func (s *BaseSuite) startAndWaitForCoreDNS(c *check.C) {
-	s.createResources(c, "resources/coredns/coredns.yaml")
+	s.createResources(c, "testdata/coredns/coredns.yaml")
 	s.WaitForCoreDNS(c)
 }
 
@@ -303,7 +303,7 @@ func (s *BaseSuite) WaitForCoreDNS(c *check.C) {
 }
 
 func (s *BaseSuite) startAndWaitForKubeDNS(c *check.C) {
-	s.createResources(c, "resources/kubedns")
+	s.createResources(c, "testdata/kubedns")
 	c.Assert(s.try.WaitReadyDeployment("kube-dns", metav1.NamespaceSystem, 60*time.Second), checker.IsNil)
 }
 
@@ -328,7 +328,7 @@ func (s *BaseSuite) waitKubectlExecCommandReturn(_ *check.C, argSlice []string)
 }
 
 func (s *BaseSuite) startWhoami(c *check.C) {
-	s.createResources(c, "resources/whoami")
+	s.createResources(c, "testdata/whoami")
 	c.Assert(s.try.WaitReadyDeployment("whoami", "whoami", 30*time.Second), checker.IsNil)
 }
 
@@ -344,7 +344,7 @@ func (s *BaseSuite) createRequiredNamespaces(c *check.C) {
 func (s *BaseSuite) installHelmMaesh(c *check.C, acl bool, kubeDNS bool) error {
 	c.Log("Installing Maesh via helm...")
 	// Install the helm chart.
-	argSlice := []string{"install", "powpow", "../helm/chart/maesh", "--values", "resources/values.yaml", "--namespace", maeshNamespace}
+	argSlice := []string{"install", "powpow", "../helm/chart/maesh", "--values", "testdata/values.yaml", "--namespace", maeshNamespace}
 
 	if kubeDNS {
 		argSlice = append(argSlice, "--set", "kubedns=true")
@@ -389,7 +389,7 @@ func (s *BaseSuite) setCoreDNSVersion(c *check.C, version string) {
 
 func (s *BaseSuite) installTinyToolsMaesh(c *check.C) {
 	// Create new tiny tools deployment.
-	s.kubectlCommand(c, "apply", "-f", path.Join(s.dir, "resources/tools/deployment.yaml"))
+	s.kubectlCommand(c, "apply", "-f", path.Join(s.dir, "testdata/tools/deployment.yaml"))
 
 	// Wait for tools to be initialized.
 	s.waitForTools(c)

pkg/k8s/client_mock.go

@@ -82,7 +82,7 @@ type ClientMock struct {
 
 // NewClientMock create a new client mock.
 func NewClientMock(stopCh <-chan struct{}, path string, smi bool) *ClientMock {
-	yamlContent, err := ioutil.ReadFile(filepath.FromSlash("./fixtures/" + path))
+	yamlContent, err := ioutil.ReadFile(filepath.FromSlash("./testdata/" + path))
 	if err != nil {
 		panic(err)
 	}

pkg/provider/provider_test.go

@@ -40,22 +40,22 @@ func TestProvider_BuildConfig(t *testing.T) {
 			udpStateTable: map[mk8s.ServiceWithPort]int32{
 				{Namespace: "my-ns", Name: "svc-b", Port: 8080}: 15000,
 			},
-			topology:   "fixtures/annotations-traffic-type-topology.json",
-			wantConfig: "fixtures/annotations-traffic-type-config.json",
+			topology:   "testdata/annotations-traffic-type-topology.json",
+			wantConfig: "testdata/annotations-traffic-type-config.json",
 		},
 		{
 			desc:               "Annotations: scheme",
 			acl:                false,
 			defaultTrafficType: "http",
-			topology:           "fixtures/annotations-scheme-topology.json",
-			wantConfig:         "fixtures/annotations-scheme-config.json",
+			topology:           "testdata/annotations-scheme-topology.json",
+			wantConfig:         "testdata/annotations-scheme-config.json",
 		},
 		{
 			desc:               "ACL disabled: basic HTTP service",
 			acl:                false,
 			defaultTrafficType: "http",
-			topology:           "fixtures/acl-disabled-http-basic-topology.json",
-			wantConfig:         "fixtures/acl-disabled-http-basic-config.json",
+			topology:           "testdata/acl-disabled-http-basic-topology.json",
+			wantConfig:         "testdata/acl-disabled-http-basic-config.json",
 		},
 		{
 			desc:               "ACL disabled: basic TCP service",
@@ -64,8 +64,8 @@ func TestProvider_BuildConfig(t *testing.T) {
 			tcpStateTable: map[mk8s.ServiceWithPort]int32{
 				{Namespace: "my-ns", Name: "svc-a", Port: 8080}: 5000,
 			},
-			topology:   "fixtures/acl-disabled-tcp-basic-topology.json",
-			wantConfig: "fixtures/acl-disabled-tcp-basic-config.json",
+			topology:   "testdata/acl-disabled-tcp-basic-topology.json",
+			wantConfig: "testdata/acl-disabled-tcp-basic-config.json",
 		},
 		{
 			desc:               "ACL disabled: basic UDP service",
@@ -74,22 +74,22 @@ func TestProvider_BuildConfig(t *testing.T) {
 			udpStateTable: map[mk8s.ServiceWithPort]int32{
 				{Namespace: "my-ns", Name: "svc-a", Port: 8080}: 15000,
 			},
-			topology:   "fixtures/acl-disabled-udp-basic-topology.json",
-			wantConfig: "fixtures/acl-disabled-udp-basic-config.json",
+			topology:   "testdata/acl-disabled-udp-basic-topology.json",
+			wantConfig: "testdata/acl-disabled-udp-basic-config.json",
 		},
 		{
 			desc:               "ACL disabled: HTTP service with traffic-split",
 			acl:                false,
 			defaultTrafficType: "http",
-			topology:           "fixtures/acl-disabled-http-traffic-split-topology.json",
-			wantConfig:         "fixtures/acl-disabled-http-traffic-split-config.json",
+			topology:           "testdata/acl-disabled-http-traffic-split-topology.json",
+			wantConfig:         "testdata/acl-disabled-http-traffic-split-config.json",
 		},
 		{
 			desc:               "ACL enabled: basic HTTP service",
 			acl:                true,
 			defaultTrafficType: "http",
-			topology:           "fixtures/acl-enabled-http-basic-topology.json",
-			wantConfig:         "fixtures/acl-enabled-http-basic-config.json",
+			topology:           "testdata/acl-enabled-http-basic-topology.json",
+			wantConfig:         "testdata/acl-enabled-http-basic-config.json",
 		},
 		{
 			desc:               "ACL enabled: basic TCP service",
@@ -98,15 +98,15 @@ func TestProvider_BuildConfig(t *testing.T) {
 			tcpStateTable: map[mk8s.ServiceWithPort]int32{
 				{Namespace: "my-ns", Name: "svc-b", Port: 8080}: 5000,
 			},
-			topology:   "fixtures/acl-enabled-tcp-basic-topology.json",
-			wantConfig: "fixtures/acl-enabled-tcp-basic-config.json",
+			topology:   "testdata/acl-enabled-tcp-basic-topology.json",
+			wantConfig: "testdata/acl-enabled-tcp-basic-config.json",
 		},
 		{
 			desc:               "ACL enabled: HTTP service with traffic-split",
 			acl:                true,
 			defaultTrafficType: "http",
-			topology:           "fixtures/acl-enabled-http-traffic-split-topology.json",
-			wantConfig:         "fixtures/acl-enabled-http-traffic-split-config.json",
+			topology:           "testdata/acl-enabled-http-traffic-split-topology.json",
+			wantConfig:         "testdata/acl-enabled-http-traffic-split-config.json",
 		},
 	}
 

pkg/topology/builder_test.go

@@ -350,7 +350,7 @@ func TestTopologyBuilder_BuildWithTrafficTargetAndTrafficSplit(t *testing.T) {
 	got, err := builder.Build(ignoredResources)
 	require.NoError(t, err)
 
-	assertTopology(t, "fixtures/topology-basic.json", got)
+	assertTopology(t, "testdata/topology-basic.json", got)
 }
 
 // TestTopologyBuilder_BuildWithTrafficTargetSpecEmptyMatch makes sure that when TrafficTarget.Spec.Matches is empty,
@@ -389,7 +389,7 @@ func TestTopologyBuilder_BuildWithTrafficTargetSpecEmptyMatch(t *testing.T) {
 	got, err := builder.Build(ignoredResources)
 	require.NoError(t, err)
 
-	assertTopology(t, "fixtures/topology-spec-with-empty-match.json", got)
+	assertTopology(t, "testdata/topology-spec-with-empty-match.json", got)
 }
 
 // TestTopologyBuilder_BuildWithTrafficTargetEmptyDestinationPort makes sure that when a TrafficTarget.Destination.Port
@@ -431,7 +431,7 @@ func TestTopologyBuilder_BuildWithTrafficTargetEmptyDestinationPort(t *testing.T
 	got, err := builder.Build(ignoredResources)
 	require.NoError(t, err)
 
-	assertTopology(t, "fixtures/topology-empty-destination-port.json", got)
+	assertTopology(t, "testdata/topology-empty-destination-port.json", got)
 }
 
 // TestTopologyBuilder_BuildTrafficTargetMultipleSourcesAndDestinations makes sure we can build a topology with
@@ -470,7 +470,7 @@ func TestTopologyBuilder_BuildTrafficTargetMultipleSourcesAndDestinations(t *tes
 	got, err := builder.Build(ignoredResources)
 	require.NoError(t, err)
 
-	assertTopology(t, "fixtures/topology-multi-sources-destinations.json", got)
+	assertTopology(t, "testdata/topology-multi-sources-destinations.json", got)
 }
 
 // createBuilder initializes the different k8s factories and start them, initializes listers and create