CLD-515: Add aditional test cases

Author: ilanRosenbaum

go.mod

@@ -31,6 +31,7 @@ require (
 	github.com/imdario/mergo v0.3.12 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/judgegregg/go-http-digest-auth-client v0.6.1
 	github.com/mattn/go-zglob v0.0.2-0.20190814121620-e3c945676326 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/moby/spdystream v0.2.0 // indirect

go.sum

@@ -514,6 +514,8 @@ github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHm
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
+github.com/judgegregg/go-http-digest-auth-client v0.6.1 h1:r2N/KgSd0uS18kyoKSVSI3RQ+Rr6Wynk4iaaZUnjqq4=
+github.com/judgegregg/go-http-digest-auth-client v0.6.1/go.mod h1:Eq3vslaiSqDvLLWgenX2mpHiZHG0ZQSKT1Li5Vo5iaQ=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
 github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
 github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=

test/e2e/e2e_test.go

@@ -3,48 +3,110 @@ package e2e
 import (
 	"crypto/tls"
 	"fmt"
+	"io/ioutil"
+	"log"
+	"net/http"
+	"os"
 	"path/filepath"
 	"strings"
 	"testing"
 	"time"
-
+	
 	"github.com/gruntwork-io/terratest/modules/helm"
 	http_helper "github.com/gruntwork-io/terratest/modules/http-helper"
 	"github.com/gruntwork-io/terratest/modules/k8s"
 	"github.com/gruntwork-io/terratest/modules/random"
+	digest_auth "github.com/judgegregg/go-http-digest-auth-client"
 	"github.com/stretchr/testify/require"
 )
 
-func TestHelmInstall(t *testing.T) {
-	// Path to the helm chart we will test
-	helmChartPath, err := filepath.Abs("../../charts")
-	releaseName := "marklogic-test"
-	t.Log(helmChartPath, releaseName)
+// Path to the helm chart we will test
+var helmChartPath, err = filepath.Abs("../../charts")
+var releaseName string = "test"
+var namespaceName string = "marklogic-" + strings.ToLower(random.UniqueId())
+var kubectlOptions = k8s.NewKubectlOptions("", "", namespaceName)
+var 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",
+	},
+}
+
+func TestMain(m *testing.M) {
+	t := &testing.T{}
 	require.NoError(t, err)
-	namespaceName := "marklogic-" + strings.ToLower(random.UniqueId())
-	t.Logf("creating namespace: %s", namespaceName)
-	kubectlOptions := k8s.NewKubectlOptions("", "", namespaceName)
+	log.Println("====Creating namespace: " + namespaceName)
 
 	// create a new namespace for testing
 	k8s.CreateNamespace(t, kubectlOptions, namespaceName)
 
-	defer k8s.DeleteNamespace(t, kubectlOptions, namespaceName)
-	options := &helm.Options{
+	// anything before this runs before the tests run
+	exitVal := m.Run()
+	// anything after this runs after the tests run
+	log.Println("====Deleting Helm Releases: " + namespaceName)
+	helm.Delete(t, options, releaseName+"-upgrade", true)
+	helm.Delete(t, options, releaseName+"-install", true)
+	helm.Delete(t, options, releaseName+"-join", true)
+	log.Println("====Deleting namespace: " + namespaceName)
+	k8s.DeleteNamespace(t, kubectlOptions, namespaceName)
+
+	os.Exit(exitVal)
+}
+
+func TestHelmInstall(t *testing.T) {
+	t.Logf("====Installing Helm Chart")
+	releaseName := releaseName + "-install"
+	helm.Install(t, options, helmChartPath, releaseName)
+
+	tlsConfig := tls.Config{}
+	podName := releaseName + "-marklogic-0"
+	// wait until the pod is in Ready status
+	k8s.WaitUntilPodAvailable(t, kubectlOptions, podName, 10, 15*time.Second)
+	tunnel := k8s.NewTunnel(
+		kubectlOptions, k8s.ResourceTypePod, podName, 7997, 7997)
+	defer tunnel.Close()
+	tunnel.ForwardPort(t)
+	endpoint := fmt.Sprintf("http://%s", tunnel.Endpoint())
+	t.Logf(`Endpoint: %s`, endpoint)
+
+	http_helper.HttpGetWithRetryWithCustomValidation(
+		t,
+		endpoint,
+		&tlsConfig,
+		10,
+		15*time.Second,
+		func(statusCode int, body string) bool {
+			return statusCode == 200
+		},
+	)
+}
+
+func TestHelmUpgrade(t *testing.T) {
+	t.Logf("====Installing Helm Chart")
+	releaseName := releaseName + "-upgrade"
+	helm.Install(t, options, helmChartPath, releaseName)
+
+	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",
 		},
 	}
 
-	defer helm.Delete(t, options, releaseName, true)
-
-	//install Helm Chart for testing
-	helm.Install(t, options, helmChartPath, releaseName)
+	t.Logf("====Upgrading Helm Chart")
+	helm.Upgrade(t, newOptions, helmChartPath, releaseName)
 
 	tlsConfig := tls.Config{}
-	podName := "marklogic-0"
+	podName := releaseName + "-marklogic-1"
+
 	// wait until the pod is in Ready status
-	k8s.WaitUntilPodAvailable(t, kubectlOptions, podName, 10, 10*time.Second)
+	k8s.WaitUntilPodAvailable(t, kubectlOptions, podName, 10, 20*time.Second)
 	tunnel := k8s.NewTunnel(
 		kubectlOptions, k8s.ResourceTypePod, podName, 7997, 7997)
 	defer tunnel.Close()
@@ -63,3 +125,53 @@ func TestHelmInstall(t *testing.T) {
 		},
 	)
 }
+
+func TestClusterJoin(t *testing.T) {
+	var username string = "admin"
+	var password string = "admin"
+	var resp *http.Response
+	var body []byte
+	var err error
+
+	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,
+		},
+	}
+	t.Logf("====Installing Helm Chart")
+	releaseName := releaseName + "-join"
+	helm.Install(t, options, helmChartPath, releaseName)
+
+	podName := releaseName + "-marklogic-1"
+
+	// 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)
+	endpoint := fmt.Sprintf("http://%s/manage/v2/hosts", tunnel.Endpoint())
+	t.Logf(`Endpoint: %s`, endpoint)
+
+	dr := digest_auth.NewRequest(username, password, "GET", endpoint, "")
+	
+	if resp, err = dr.Execute(); err != nil {
+		log.Fatalln(err)
+	}
+	defer resp.Body.Close()
+
+	if body, err = ioutil.ReadAll(resp.Body); err != nil {
+		log.Fatalln(err)
+	}
+
+	t.Logf("Response:\n" + string(body))
+	if !strings.Contains(string(body), "<list-count units=\"quantity\">2</list-count>") {
+		t.Errorf("Wrong number of hosts")
+	}
+}