Changes based on PR comments

Author: ilanRosenbaum

test/e2e/install_test.go

@@ -3,6 +3,8 @@ package e2e
 import (
 	"crypto/tls"
 	"fmt"
+	"io/ioutil"
+	"net/http"
 	"os"
 	"path/filepath"
 	"strings"
@@ -13,6 +15,8 @@ import (
 	http_helper "github.com/gruntwork-io/terratest/modules/http-helper"
 	"github.com/gruntwork-io/terratest/modules/k8s"
 	"github.com/gruntwork-io/terratest/modules/random"
+	"github.com/tidwall/gjson"
+	digestAuth "github.com/xinsnake/go-http-digest-auth-client"
 )
 
 func TestHelmInstall(t *testing.T) {
@@ -23,6 +27,11 @@ func TestHelmInstall(t *testing.T) {
 	}
 	imageRepo, repoPres := os.LookupEnv("dockerRepository")
 	imageTag, tagPres := os.LookupEnv("dockerVersion")
+	username := "admin"
+	password := "admin"
+	var resp *http.Response
+	var body []byte
+	var err error
 
 	if !repoPres {
 		imageRepo = "marklogic-centos/marklogic-server-centos"
@@ -40,9 +49,11 @@ func TestHelmInstall(t *testing.T) {
 		KubectlOptions: kubectlOptions,
 		SetValues: map[string]string{
 			"persistence.enabled":   "false",
-			"replicaCount":          "1",
+			"replicaCount":          "2",
 			"image.repository":      imageRepo,
 			"image.tag":             imageTag,
+			"auth.adminUsername":    username,
+			"auth.adminPassword":    password,
 			"logCollection.enabled": "false",
 		},
 	}
@@ -78,4 +89,27 @@ func TestHelmInstall(t *testing.T) {
 			return statusCode == 200
 		},
 	)
+
+	tunnel_8002 := k8s.NewTunnel(
+		kubectlOptions, k8s.ResourceTypePod, podName, 8002, 8002)
+	defer tunnel_8002.Close()
+	tunnel_8002.ForwardPort(t)
+
+	// Verify no groups beyond enode were created/modified
+	groupStatusEndpoint := fmt.Sprintf("http://%s/manage/v2/groups?format=json", tunnel_8002.Endpoint())
+	groupStatus := digestAuth.NewRequest(username, password, "GET", groupStatusEndpoint, "")
+	t.Logf(`groupStatusEndpoint: %s`, groupStatusEndpoint)
+	if resp, err = groupStatus.Execute(); err != nil {
+		t.Fatalf(err.Error())
+	}
+	if body, err = ioutil.ReadAll(resp.Body); err != nil {
+		t.Fatalf(err.Error())
+	}
+	groupQuantityJSON := gjson.Get(string(body), "group-default-list.list-items.list-count.value")
+
+	if groupQuantityJSON.Num != 1 {
+		t.Errorf("Only one group should exist, instead %v groups exist", groupQuantityJSON.Num)
+	}
+
+	t.Logf("Groups status response:\n" + string(body))
 }

test/e2e/separate_nodes_test.go

@@ -306,167 +306,4 @@ func TestIncorrectBootsrapHostname(t *testing.T) {
 	t.Logf("Enode group status response:\n" + string(body))
 }
 
-func TestDefaultGroup(t *testing.T) {
-	var resp *http.Response
-	var body []byte
-	var err error
-
-	username := "admin"
-	password := "admin"
-	imageRepo, repoPres := os.LookupEnv("dockerRepository")
-	imageTag, tagPres := os.LookupEnv("dockerVersion")
-	namespaceName := "marklogic-" + strings.ToLower(random.UniqueId())
-	kubectlOptions := k8s.NewKubectlOptions("", "", namespaceName)
-	releaseName := "test-default-group"
-	podName := releaseName + "-marklogic-0"
-
-	// Path to the helm chart we will test
-	helmChartPath, e := filepath.Abs("../../charts")
-
-	if e != nil {
-		t.Fatalf(e.Error())
-	}
-
-	if !repoPres {
-		imageRepo = "marklogic-centos/marklogic-server-centos"
-		t.Logf("No imageRepo variable present, setting to default value: " + imageRepo)
-	}
-
-	if !tagPres {
-		imageTag = "10-internal"
-		t.Logf("No imageTag variable present, setting to default value: " + imageTag)
-	}
-
-	// Helm options for enode creation
-	noGroupOptions := &helm.Options{
-		KubectlOptions: kubectlOptions,
-		SetValues: map[string]string{
-			"replicaCount":          "1",
-			"image.repository":      imageRepo,
-			"image.tag":             imageTag,
-			"auth.adminUsername":    username,
-			"auth.adminPassword":    password,
-			"logCollection.enabled": "false",
-		},
-	}
-
-	t.Logf("====Creating namespace: " + namespaceName)
-	k8s.CreateNamespace(t, kubectlOptions, namespaceName)
-
-	defer t.Logf("====Deleting namespace: " + namespaceName)
-	defer k8s.DeleteNamespace(t, kubectlOptions, namespaceName)
-
-	t.Logf("====Installing No Group Helm Chart " + releaseName)
-	helm.Install(t, noGroupOptions, helmChartPath, releaseName)
-
-	// wait until the pod is in ready status
-	k8s.WaitUntilPodAvailable(t, kubectlOptions, podName, 10, 20*time.Second)
-
-	tunnel := k8s.NewTunnel(
-		kubectlOptions, k8s.ResourceTypePod, podName, 8002, 8002)
-
-	defer tunnel.Close()
-
-	tunnel.ForwardPort(t)
-
-	// Verify only single group was created and it is default group
-	groupStatusEndpoint := fmt.Sprintf("http://%s/manage/v2/groups?format=json", tunnel.Endpoint())
-	groupStatus := digestAuth.NewRequest(username, password, "GET", groupStatusEndpoint, "")
-	t.Logf(`groupStatusEndpoint: %s`, groupStatusEndpoint)
-	if resp, err = groupStatus.Execute(); err != nil {
-		t.Fatalf(err.Error())
-	}
-	if body, err = ioutil.ReadAll(resp.Body); err != nil {
-		t.Fatalf(err.Error())
-	}
-	groupNameJSON := gjson.Get(string(body), "group-default-list.list-items.list-item[0].nameref")
-	groupQuantityJSON := gjson.Get(string(body), "group-default-list.list-items.list-count.value")
-	if groupNameJSON.Str != "Default" && groupQuantityJSON.Num != 1 {
-		t.Errorf("Only group should exist and it should be the Default group, instead %v groups exist and the first group is named %v", groupQuantityJSON.Num, groupNameJSON.Str)
-	}
-
-	t.Logf("Groups status response:\n" + string(body))
-}
-
-func TestSingleGroupCreated(t *testing.T) {
-	var resp *http.Response
-	var body []byte
-	var err error
-
-	username := "admin"
-	password := "admin"
-	imageRepo, repoPres := os.LookupEnv("dockerRepository")
-	imageTag, tagPres := os.LookupEnv("dockerVersion")
-	namespaceName := "marklogic-" + strings.ToLower(random.UniqueId())
-	kubectlOptions := k8s.NewKubectlOptions("", "", namespaceName)
-	releaseName := "test-default-group"
-	podName := releaseName + "-marklogic-0"
-
-	// Path to the helm chart we will test
-	helmChartPath, e := filepath.Abs("../../charts")
-
-	if e != nil {
-		t.Fatalf(e.Error())
-	}
-
-	if !repoPres {
-		imageRepo = "marklogic-centos/marklogic-server-centos"
-		t.Logf("No imageRepo variable present, setting to default value: " + imageRepo)
-	}
-
-	if !tagPres {
-		imageTag = "10-internal"
-		t.Logf("No imageTag variable present, setting to default value: " + imageTag)
-	}
-
-	// Helm options for enode creation
-	noGroupOptions := &helm.Options{
-		KubectlOptions: kubectlOptions,
-		SetValues: map[string]string{
-			"replicaCount":          "3",
-			"image.repository":      imageRepo,
-			"image.tag":             imageTag,
-			"auth.adminUsername":    username,
-			"auth.adminPassword":    password,
-			"logCollection.enabled": "false",
-			"group.name":            "enode",
-		},
-	}
-
-	t.Logf("====Creating namespace: " + namespaceName)
-	k8s.CreateNamespace(t, kubectlOptions, namespaceName)
-
-	defer t.Logf("====Deleting namespace: " + namespaceName)
-	defer k8s.DeleteNamespace(t, kubectlOptions, namespaceName)
-
-	t.Logf("====Installing No Group Helm Chart " + releaseName)
-	helm.Install(t, noGroupOptions, helmChartPath, releaseName)
-
-	// wait until the pod is in ready status
-	k8s.WaitUntilPodAvailable(t, kubectlOptions, podName, 10, 20*time.Second)
-
-	tunnel := k8s.NewTunnel(
-		kubectlOptions, k8s.ResourceTypePod, podName, 8002, 8002)
-
-	defer tunnel.Close()
-
-	tunnel.ForwardPort(t)
-
-	// Verify no groups beyond enode were created/modified
-	groupStatusEndpoint := fmt.Sprintf("http://%s/manage/v2/groups?format=json", tunnel.Endpoint())
-	groupStatus := digestAuth.NewRequest(username, password, "GET", groupStatusEndpoint, "")
-	t.Logf(`groupStatusEndpoint: %s`, groupStatusEndpoint)
-	if resp, err = groupStatus.Execute(); err != nil {
-		t.Fatalf(err.Error())
-	}
-	if body, err = ioutil.ReadAll(resp.Body); err != nil {
-		t.Fatalf(err.Error())
-	}
-	groupQuantityJSON := gjson.Get(string(body), "group-default-list.list-items.list-count.value")
-
-	if groupQuantityJSON.Num != 1 {
-		t.Errorf("Only group should exist, instead %v groups exist", groupQuantityJSON.Num)
-	}
-
-	t.Logf("Groups status response:\n" + string(body))
-}
+