Seperate tests into catagorys instead of all being in one file

Don't allow e2e.sh to used cached tests

Change what digest_auth module we use

Author: ilanRosenbaum

go.mod

@@ -31,7 +31,6 @@ 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
@@ -44,6 +43,7 @@ require (
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/urfave/cli v1.22.2 // indirect
+	github.com/xinsnake/go-http-digest-auth-client v0.6.0
 	golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
 	golang.org/x/net v0.0.0-20210825183410-e898025ed96a // indirect
 	golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect

go.sum

@@ -514,8 +514,6 @@ 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=
@@ -785,6 +783,8 @@ github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2
 github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
 github.com/xeipuuv/gojsonschema v0.0.0-20180618132009-1d523034197f/go.mod h1:5yf86TLmAcydyeJq5YvxkGPE2fm/u4myDekKRoLuqhs=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
+github.com/xinsnake/go-http-digest-auth-client v0.6.0 h1:nrYFWDrB2F7VwYlNravXZS0nOtg9axlATH3Jns55/F0=
+github.com/xinsnake/go-http-digest-auth-client v0.6.0/go.mod h1:QK1t1v7ylyGb363vGWu+6Irh7gyFj+N7+UZzM0L6g8I=
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=

test/e2e/clustering_test.go

@@ -0,0 +1,80 @@
+package e2e
+
+import (
+	"fmt"
+	"io/ioutil"
+	"net/http"
+	"path/filepath"
+	"strings"
+	"testing"
+	"time"
+
+	"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"
+)
+
+
+func TestClusterJoin(t *testing.T) {
+	// Path to the helm chart we will test 
+	helmChartPath, e := filepath.Abs("../../charts")
+	if (e != nil) {
+		t.Fatalf(e.Error())
+	}
+	username := "admin"
+	password := "admin"
+	var resp *http.Response
+	var body []byte
+	var err error
+	namespaceName := "marklogic-" + strings.ToLower(random.UniqueId())
+	kubectlOptions := k8s.NewKubectlOptions("", "", namespaceName)
+	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("====Creating namespace: " + namespaceName)
+	k8s.CreateNamespace(t, kubectlOptions, namespaceName)
+
+	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)
+
+	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 {
+		t.Fatalf(err.Error())
+	}
+	defer resp.Body.Close()
+
+	if body, err = ioutil.ReadAll(resp.Body); err != nil {
+		t.Fatalf(err.Error())
+	}
+
+	t.Logf("Response:\n" + string(body))
+	if !strings.Contains(string(body), "<list-count units=\"quantity\">2</list-count>") {
+		t.Errorf("Wrong number of hosts")
+	}
+}

test/e2e/e2e.sh

@@ -7,7 +7,7 @@ echo "=====Loading marklogc images to minikube cluster"
 minikube image load marklogic-centos/marklogic-server-centos:10-internal
 
 echo "=====Running tests"
-go test -v ./test/e2e/...
+go test -v -count=1 ./test/e2e/...
 
 echo "=====Delete minikube cluster"
 minikube delete

test/e2e/e2e_test.go

@@ -0,0 +1,66 @@
+package e2e
+
+import (
+	"crypto/tls"
+	"fmt"
+	"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"
+)
+
+func TestHelmInstall(t *testing.T) {
+	// Path to the helm chart we will test 
+	helmChartPath, e := filepath.Abs("../../charts")
+	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",
+		},
+	}
+
+	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 Helm Chart")
+	releaseName := "test-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
+		},
+	)
+}