Fix linting issues, remove e2e.sh, move functionality into makefile

Author: ilanRosenbaum

test/e2e/clustering_test.go

@@ -16,9 +16,9 @@ import (
 )
 
 func TestClusterJoin(t *testing.T) {
-	// Path to the helm chart we will test 
+	// Path to the helm chart we will test
 	helmChartPath, e := filepath.Abs("../../charts")
-	if (e != nil) {
+	if e != nil {
 		t.Fatalf(e.Error())
 	}
 	username := "admin"
@@ -31,13 +31,13 @@ func TestClusterJoin(t *testing.T) {
 	options := &helm.Options{
 		KubectlOptions: kubectlOptions,
 		SetValues: map[string]string{
-			"persistence.enabled": "false",
-			"replicaCount":        "2",
-			"image.repository":    "marklogic-centos/marklogic-server-centos",
-			"image.tag":           "10-internal",
-			"auth.adminUsername":  username,
-			"auth.adminPassword":  password,
-			"logCollection.enabled":    "false",
+			"persistence.enabled":   "false",
+			"replicaCount":          "2",
+			"image.repository":      "marklogic-centos/marklogic-server-centos",
+			"image.tag":             "10-internal",
+			"auth.adminUsername":    username,
+			"auth.adminPassword":    password,
+			"logCollection.enabled": "false",
 		},
 	}
 
@@ -46,7 +46,7 @@ func TestClusterJoin(t *testing.T) {
 
 	defer t.Logf("====Deleting namespace: " + namespaceName)
 	defer k8s.DeleteNamespace(t, kubectlOptions, namespaceName)
-	
+
 	t.Logf("====Installing Helm Chart")
 	releaseName := "test-join"
 	helm.Install(t, options, helmChartPath, releaseName)

test/e2e/e2e.sh

@@ -25,11 +25,11 @@ func TestHelmInstall(t *testing.T) {
 	options := &helm.Options{
 		KubectlOptions: kubectlOptions,
 		SetValues: map[string]string{
-			"persistence.enabled": "false",
-			"replicaCount":        "1",
-			"image.repository":    "marklogic-centos/marklogic-server-centos",
-			"image.tag":           "10-internal",
-			"logCollection.enabled":    "false",
+			"persistence.enabled":   "false",
+			"replicaCount":          "1",
+			"image.repository":      "marklogic-centos/marklogic-server-centos",
+			"image.tag":             "10-internal",
+			"logCollection.enabled": "false",
 		},
 	}
 

test/e2e/install_test.go

@@ -15,21 +15,21 @@ import (
 )
 
 func TestHelmUpgrade(t *testing.T) {
-	// Path to the helm chart we will test 
+	// Path to the helm chart we will test
 	helmChartPath, e := filepath.Abs("../../charts")
-	if (e != nil) {
+	if e != nil {
 		t.Fatalf(e.Error())
 	}
 	namespaceName := "marklogic-" + strings.ToLower(random.UniqueId())
 	kubectlOptions := k8s.NewKubectlOptions("", "", namespaceName)
 	options := &helm.Options{
 		KubectlOptions: kubectlOptions,
 		SetValues: map[string]string{
-			"persistence.enabled": "false",
-			"replicaCount":        "1",
-			"image.repository":    "marklogic-centos/marklogic-server-centos",
-			"image.tag":           "10-internal",
-			"logCollection.enabled":    "false",
+			"persistence.enabled":   "false",
+			"replicaCount":          "1",
+			"image.repository":      "marklogic-centos/marklogic-server-centos",
+			"image.tag":             "10-internal",
+			"logCollection.enabled": "false",
 		},
 	}
 
@@ -45,11 +45,11 @@ func TestHelmUpgrade(t *testing.T) {
 	newOptions := &helm.Options{
 		KubectlOptions: kubectlOptions,
 		SetValues: map[string]string{
-			"persistence.enabled": "false",
-			"replicaCount":        "2",
-			"image.repository":    "marklogic-centos/marklogic-server-centos",
-			"image.tag":           "10-internal",
-			"logCollection.enabled":    "false",
+			"persistence.enabled":   "false",
+			"replicaCount":          "2",
+			"image.repository":      "marklogic-centos/marklogic-server-centos",
+			"image.tag":             "10-internal",
+			"logCollection.enabled": "false",
 		},
 	}
 

test/e2e/upgrade_test.go

@@ -29,10 +29,10 @@ func TestChartTemplateNoLogCollection(t *testing.T) {
 	// Setup the args for helm install
 	options := &helm.Options{
 		SetValues: map[string]string{
-			"image.repository":    "marklogicdb/marklogic-db",
-			"image.tag":           "latest",
-			"persistence.enabled": "false",
-			"logCollection.enabled":    "false",
+			"image.repository":      "marklogicdb/marklogic-db",
+			"image.tag":             "latest",
+			"persistence.enabled":   "false",
+			"logCollection.enabled": "false",
 		},
 		KubectlOptions: k8s.NewKubectlOptions("", "", namespaceName),
 	}
@@ -70,10 +70,10 @@ func TestChartTemplateLogCollection(t *testing.T) {
 	// Setup the args for helm install
 	options := &helm.Options{
 		SetValues: map[string]string{
-			"image.repository":    "marklogicdb/marklogic-db",
-			"image.tag":           "latest",
-			"persistence.enabled": "false",
-			"logCollection.enabled":    "true",
+			"image.repository":      "marklogicdb/marklogic-db",
+			"image.tag":             "latest",
+			"persistence.enabled":   "false",
+			"logCollection.enabled": "true",
 		},
 		KubectlOptions: k8s.NewKubectlOptions("", "", namespaceName),
 	}