Fix linting issues in new tests

Author: ilanRosenbaum

test/e2e/separate_nodes_test.go

@@ -12,14 +12,14 @@ import (
 	"github.com/gruntwork-io/terratest/modules/helm"
 	"github.com/gruntwork-io/terratest/modules/k8s"
 	"github.com/gruntwork-io/terratest/modules/random"
-	digest_auth "github.com/xinsnake/go-http-digest-auth-client"
 	"github.com/tidwall/gjson"
+	digestAuth "github.com/xinsnake/go-http-digest-auth-client"
 )
 
 func TestSeparateEDnode(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"
@@ -33,14 +33,14 @@ func TestSeparateEDnode(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",
-			"auth.adminUsername":  username,
-			"auth.adminPassword":  password,
-			"group.name": 		   "dnode",
-			"logCollection.enabled":    "false",
+			"persistence.enabled":   "false",
+			"replicaCount":          "1",
+			"image.repository":      "marklogic-centos/marklogic-server-centos",
+			"image.tag":             "10-internal",
+			"auth.adminUsername":    username,
+			"auth.adminPassword":    password,
+			"group.name":            "dnode",
+			"logCollection.enabled": "false",
 		},
 	}
 
@@ -49,7 +49,7 @@ func TestSeparateEDnode(t *testing.T) {
 
 	defer t.Logf("====Deleting namespace: " + namespaceName)
 	defer k8s.DeleteNamespace(t, kubectlOptions, namespaceName)
-	
+
 	dnodeReleaseName := "test-dnode-group"
 	t.Logf("====Installing Helm Chart" + dnodeReleaseName)
 	helm.Install(t, options, helmChartPath, dnodeReleaseName)
@@ -64,10 +64,10 @@ func TestSeparateEDnode(t *testing.T) {
 		kubectlOptions, k8s.ResourceTypePod, podName, 8002, 8002)
 	defer tunnel.Close()
 	tunnel.ForwardPort(t)
-	hosts_endpoint := fmt.Sprintf("http://%s/manage/v2/hosts?format=json", tunnel.Endpoint())
-	t.Logf(`Endpoint: %s`, hosts_endpoint)
+	hostsEndpoint := fmt.Sprintf("http://%s/manage/v2/hosts?format=json", tunnel.Endpoint())
+	t.Logf(`Endpoint: %s`, hostsEndpoint)
 
-	dr := digest_auth.NewRequest(username, password, "GET", hosts_endpoint, "")
+	dr := digestAuth.NewRequest(username, password, "GET", hostsEndpoint, "")
 
 	if resp, err = dr.Execute(); err != nil {
 		t.Fatalf(err.Error())
@@ -79,7 +79,7 @@ func TestSeparateEDnode(t *testing.T) {
 	}
 	t.Logf("Response:\n" + string(body))
 	bootstrapHost := gjson.Get(string(body), `host-default-list.list-items.list-item.#(roleref="bootstrap").nameref`)
-	t.Logf(`BootstrapHost: = %s` , bootstrapHost)
+	t.Logf(`BootstrapHost: = %s`, bootstrapHost)
 
 	// verify bootstrap host exists on the cluster
 	if bootstrapHost.String() == "" {
@@ -89,32 +89,32 @@ func TestSeparateEDnode(t *testing.T) {
 	enodeOptions := &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,
-			"group.name": 		   "enode",
-			"bootstrapHostName":   bootstrapHost.String(),
-			"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,
+			"group.name":            "enode",
+			"bootstrapHostName":     bootstrapHost.String(),
+			"logCollection.enabled": "false",
 		},
 	}
 	enodeReleaseName := "test-enode-group"
 	t.Logf("====Installing Helm Chart " + enodeReleaseName)
 	helm.Install(t, enodeOptions, helmChartPath, enodeReleaseName)
 
-	enodePodName-0 := enodeReleaseName + "-marklogic-0"
+	enodePodName0 := enodeReleaseName + "-marklogic-0"
 
 	// wait until the first enode pod is in Ready status
-	k8s.WaitUntilPodAvailable(t, kubectlOptions, enodePodName-0, 15, 20*time.Second)
+	k8s.WaitUntilPodAvailable(t, kubectlOptions, enodePodName0, 15, 20*time.Second)
 
-	group_endpoint := fmt.Sprintf("http://%s/manage/v2/groups", tunnel.Endpoint())
-	t.Logf(`Endpoint: %s`, group_endpoint)
+	groupEndpoint := fmt.Sprintf("http://%s/manage/v2/groups", tunnel.Endpoint())
+	t.Logf(`Endpoint: %s`, groupEndpoint)
 
-	dr_groups := digest_auth.NewRequest(username, password, "GET", group_endpoint, "")
+	drGroups := digestAuth.NewRequest(username, password, "GET", groupEndpoint, "")
 
-	if resp, err = dr_groups.Execute(); err != nil {
+	if resp, err = drGroups.Execute(); err != nil {
 		t.Fatalf(err.Error())
 	}
 	defer resp.Body.Close()
@@ -129,17 +129,17 @@ func TestSeparateEDnode(t *testing.T) {
 		t.Errorf("Groups does not exists on cluster")
 	}
 
-	enodePodName-1 := enodeReleaseName + "-marklogic-1"
+	enodePodName1 := enodeReleaseName + "-marklogic-1"
 
 	// wait until the second enode pod is in Ready status
-	k8s.WaitUntilPodAvailable(t, kubectlOptions, enodePodName-1, 15, 20*time.Second)
+	k8s.WaitUntilPodAvailable(t, kubectlOptions, enodePodName1, 15, 20*time.Second)
 
-	enode_endpoint := fmt.Sprintf("http://%s/manage/v2/groups/enode?format=json", tunnel.Endpoint())
-	t.Logf(`Endpoint: %s`, enode_endpoint)
+	enodeEndpoint := fmt.Sprintf("http://%s/manage/v2/groups/enode?format=json", tunnel.Endpoint())
+	t.Logf(`Endpoint: %s`, enodeEndpoint)
 
-	dr_enode := digest_auth.NewRequest(username, password, "GET", enode_endpoint, "")
+	drEnode := digestAuth.NewRequest(username, password, "GET", enodeEndpoint, "")
 
-	if resp, err = dr_enode.Execute(); err != nil {
+	if resp, err = drEnode.Execute(); err != nil {
 		t.Fatalf(err.Error())
 	}
 	defer resp.Body.Close()
@@ -149,11 +149,11 @@ func TestSeparateEDnode(t *testing.T) {
 	}
 	t.Logf("Response:\n" + string(body))
 
-	enode_host_count := gjson.Get(string(body), `group-default.relations.relation-group.#(typeref="hosts").relation-count.value`)
-	t.Logf(`enode_host_count: = %s` , enode_host_count)
+	enodeHostCount := gjson.Get(string(body), `group-default.relations.relation-group.#(typeref="hosts").relation-count.value`)
+	t.Logf(`enodeHostCount: = %s`, enodeHostCount)
 
 	// verify bootstrap host exists on the cluster
-	if !strings.Contains(enode_host_count.String(),"2") {
+	if !strings.Contains(enodeHostCount.String(), "2") {
 		t.Errorf("enode hosts does not exists on cluster")
 	}
-}
+}