ci: rework integration tests

- remove unused scripts
- run ginkgo suite directly instead of compiling a `.test` binary
- test helpers run mysql / postgresql db setup commands directly
  - remove db setup shell script
- tests derive config file name based on DB value, simplifies scripts

Author: aramprice

ci/tasks/test-integration.sh

@@ -35,7 +35,7 @@ case "$DB" in
     echo "Memory DB Noop"
     ;;
   *)
-    echo "Usage: DB={mysql|postgresql|memory} $0 {commands}"
+    echo "Usage: DB={mysql|postgresql|memory} $0"
     exit 1
 esac
 

src/config-server/bin/lint

@@ -1,22 +1,23 @@
 #!/usr/bin/env bash
 set -eu -o pipefail
 
-ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"
+config_server_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"
 
 (
-  cd "$ROOT_DIR"
+  cd "${config_server_dir}"
   if ! command -v golangci-lint &> /dev/null; then
     go install -v github.com/golangci/golangci-lint/v2/cmd/golangci-lint@latest
   fi
 )
-go_bin_path="$(go env GOPATH)/bin" # TODO this should be handled in the docker container
-export PATH=${go_bin_path}:${PATH}
 
 golangci-lint version
 
 linted_os_list=(linux)
 
-for os in ${linted_os_list[*]}; do
+for os in "${linted_os_list[@]}"; do
   echo -e "\n lint-ing with GOOS=${os}..."
-  GOOS="${os}" golangci-lint run "${ROOT_DIR}"/...
+  (
+    cd "${config_server_dir}"
+    GOOS="${os}" golangci-lint run ./...
+  )
 done

src/config-server/bin/start_server.sh

@@ -1,57 +1,26 @@
 #!/usr/bin/env bash
 set -eu -o pipefail
 
-export PATH=/usr/local/go/bin:${PATH}
-
-bin=$(dirname $0)
-testdir="./tmp"
-
-setup_test_dir (){
-  rm -rf ${testdir}
-  mkdir ${testdir}
-
-  cp -p "${bin}/start_server.sh" ${testdir}
-  cp -p "${bin}/stop_server.sh" ${testdir}
-  cp -p "${bin}/setup_db.sh" ${testdir}
-  cp -r ./integration/assets ${testdir}/assets
-
-  echo 'Building config-server'
-  go build .
-  cp -p config-server ${testdir}/config-server
-
-  go run github.com/onsi/ginkgo/v2/ginkgo build -r --race integration
-
-  mv ./integration/integration.test ${testdir}
-  pushd ${testdir}
-}
-
-setup_test_dir
-
+config_server_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"
 
 run_tests (){
   export DB=$1
   echo -e "\n\nRunning Integration tests for $DB\n\n"
 
-  export CONFIG_FILE="./assets/config.${DB}.json"
-  ./integration.test
+  pushd "${config_server_dir}"
+    go run github.com/onsi/ginkgo/v2/ginkgo run -r --race integration
+  popd
 }
 
-case $1 in
-    memory  )
-     run_tests memory ;;
-    mysql  )
-     run_tests mysql ;;
-    postgresql  )
-     run_tests postgresql ;;
-    * )
-     if [ -n "$1" ]; then
-        echo "usage test-integration.sh [memory|postgresql|mysql] Defaults to all"
-        exit 1
-     fi
-     run_tests memory
-     run_tests mysql
-     run_tests postgresql
-     ;;
+case "${1:-}" in
+  memory  )
+   run_tests memory ;;
+  mysql  )
+   run_tests mysql ;;
+  postgresql  )
+   run_tests postgresql ;;
+  * )
+    echo "Usage: ${0} {mysql|postgresql|memory}"
+    exit 1
+   ;;
 esac
-
-popd

src/config-server/bin/test-integration

@@ -14,10 +14,10 @@ var _ = Describe("Supported HTTP Methods", func() {
 	var session *gexec.Session
 
 	BeforeEach(func() {
-		SetupDB()
+		SetupDB(GinkgoWriter)
 
 		var err error
-		cmd := exec.Command(pathToConfigServer, pathToConfigFile)
+		cmd := exec.Command(pathToConfigServer, ConfigForDb())
 		session, err = gexec.Start(cmd, GinkgoWriter, GinkgoWriter)
 		Expect(err).NotTo(HaveOccurred())
 
@@ -35,7 +35,7 @@ var _ = Describe("Supported HTTP Methods", func() {
 			resultMap := UnmarshalJSONString(response.Body)
 
 			Expect(resultMap["id"]).ToNot(BeNil())
-			Expect(len((resultMap["id"].(string))) > 0).To(BeTrue())
+			Expect(len(resultMap["id"].(string)) > 0).To(BeTrue())
 			Expect(resultMap["name"]).To(Equal("Dale"))
 			Expect(resultMap["value"]).To(Equal("Wick"))
 		})
@@ -44,12 +44,12 @@ var _ = Describe("Supported HTTP Methods", func() {
 			response1, _ := SendPutRequest("Dale", "Wick") //nolint:errcheck
 			resultMap1 := UnmarshalJSONString(response1.Body)
 			Expect(resultMap1["id"]).ToNot(BeNil())
-			Expect(len((resultMap1["id"].(string))) > 0).To(BeTrue())
+			Expect(len(resultMap1["id"].(string)) > 0).To(BeTrue())
 
 			response2, _ := SendPutRequest("Alan", "Donovan") //nolint:errcheck
 			resultMap2 := UnmarshalJSONString(response2.Body)
 			Expect(resultMap2["id"]).ToNot(BeNil())
-			Expect(len((resultMap2["id"].(string))) > 0).To(BeTrue())
+			Expect(len(resultMap2["id"].(string)) > 0).To(BeTrue())
 
 			Expect(resultMap1["id"]).ToNot(Equal(resultMap2["id"]))
 		})

src/config-server/integration/id_test.go

@@ -1,8 +1,6 @@
 package integration_test
 
 import (
-	"os"
-
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gexec"
@@ -12,7 +10,6 @@ import (
 
 var (
 	pathToConfigServer string
-	pathToConfigFile   string
 )
 
 func TestIntegrationTests(t *testing.T) {
@@ -26,5 +23,4 @@ var _ = SynchronizedBeforeSuite(func() []byte {
 	return []byte(configServerPath)
 }, func(data []byte) {
 	pathToConfigServer = string(data)
-	pathToConfigFile = os.Getenv("CONFIG_FILE")
 })

src/config-server/integration/integration_tests_suite_test.go

@@ -18,10 +18,10 @@ var _ = Describe("Supported HTTP Methods", func() {
 	var session *gexec.Session
 
 	BeforeEach(func() {
-		SetupDB()
+		SetupDB(GinkgoWriter)
 
 		var err error
-		cmd := exec.Command(pathToConfigServer, pathToConfigFile)
+		cmd := exec.Command(pathToConfigServer, ConfigForDb())
 		session, err = gexec.Start(cmd, GinkgoWriter, GinkgoWriter)
 		Expect(err).NotTo(HaveOccurred())
 

src/config-server/integration/main_test.go

@@ -0,0 +1,7 @@
+{
+  "port": 9000,
+  "store": "memory",
+  "certificate_file_path":      "support/assets/ssl.crt",
+  "private_key_file_path":      "support/assets/ssl.key",
+  "jwt_verification_key_path":  "support/assets/uaa.pub"
+}

src/config-server/integration/support/assets/config.memory.json

@@ -0,0 +1,19 @@
+{
+  "port": 9000,
+  "store": "database",
+  "database": {
+    "adapter": "mysql",
+    "user": "root",
+    "password": "password",
+    "host": "127.0.0.1",
+    "port": 3306,
+    "db_name": "config_server",
+    "connection_options": {
+      "max_open_connections": 32,
+      "max_idle_connections": 10
+    }
+  },
+  "certificate_file_path":      "support/assets/ssl.crt",
+  "private_key_file_path":      "support/assets/ssl.key",
+  "jwt_verification_key_path":  "support/assets/uaa.pub"
+}

src/config-server/integration/support/assets/config.mysql.json

@@ -0,0 +1,19 @@
+{
+      "port": 9000,
+      "store": "database",
+      "database": {
+        "adapter": "postgres",
+        "user": "postgres",
+        "password": "password",
+        "host": "127.0.0.1",
+        "port": 5432,
+        "db_name": "config_server",
+        "connection_options": {
+            "max_open_connections": 32,
+            "max_idle_connections": 10
+        }
+      },
+      "certificate_file_path":      "support/assets/ssl.crt",
+      "private_key_file_path":      "support/assets/ssl.key",
+      "jwt_verification_key_path":  "support/assets/uaa.pub"
+}