Merge pull request #60 from marklogic/feature/CLD-656

CLD-656: Verify node is ready as soon as it is marked as such

Author: ilanRosenbaum

makefile

@@ -93,7 +93,7 @@ lint:
 	minikube image load $(dockerImage)
 
 	@echo "=====Running e2e tests"
-	$(if $(saveOutput),gotestsum --junitfile test/test_results/e2e-tests.xml ./test/e2e/... -count=1 -timeout 30m, go test -v -count=1 ./test/e2e/...) 
+	$(if $(saveOutput),gotestsum --junitfile test/test_results/e2e-tests.xml ./test/e2e/... -count=1 -timeout 30m, go test -v -count=1 -timeout 30m ./test/e2e/...) 
 
 	@echo "=====Delete minikube cluster"
 	minikube delete

test/e2e/clustering_test.go

@@ -13,7 +13,7 @@ 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"
+	digestAuth "github.com/xinsnake/go-http-digest-auth-client"
 )
 
 func TestClusterJoin(t *testing.T) {
@@ -77,7 +77,7 @@ func TestClusterJoin(t *testing.T) {
 	endpoint := fmt.Sprintf("http://%s/manage/v2/hosts", tunnel.Endpoint())
 	t.Logf(`Endpoint: %s`, endpoint)
 
-	dr := digest_auth.NewRequest(username, password, "GET", endpoint, "")
+	dr := digestAuth.NewRequest(username, password, "GET", endpoint, "")
 
 	if resp, err = dr.Execute(); err != nil {
 		t.Fatalf(err.Error())

test/e2e/ready_test.go

@@ -0,0 +1,89 @@
+package e2e
+
+import (
+	"fmt"
+	"io/ioutil"
+	"net/http"
+	"os"
+	"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"
+	digestAuth "github.com/xinsnake/go-http-digest-auth-client"
+)
+
+func TestMarklogicReady(t *testing.T) {
+	// Path to the helm chart we will test
+	helmChartPath, e := filepath.Abs("../../charts")
+	if e != nil {
+		t.Fatalf(e.Error())
+	}
+	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"
+		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)
+	}
+
+	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":      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 Helm Chart")
+	releaseName := "test-install"
+	helm.Install(t, options, helmChartPath, releaseName)
+
+	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, 8001, 8001)
+	defer tunnel.Close()
+	tunnel.ForwardPort(t)
+	endpoint := fmt.Sprintf("http://%s/admin/v1/timestamp", tunnel.Endpoint())
+	t.Logf(`Endpoint: %s`, endpoint)
+
+	// Make request to server as soon as it is ready
+	timestamp := digestAuth.NewRequest(username, password, "GET", endpoint, "")
+
+	if resp, err = timestamp.Execute(); err != nil {
+		t.Fatalf(err.Error())
+	}
+	if body, err = ioutil.ReadAll(resp.Body); err != nil {
+		t.Fatalf(err.Error())
+	}
+
+	t.Logf("Timestamp response:\n" + string(body))
+}