Refactored to utilize the mariadbHandler

TESTING_dockercompose.md

@@ -45,6 +45,14 @@ docker compose exec -T commons sh -c "curl -kL http://go-web:3000/mariadb?servic
 docker compose exec -T commons sh -c "curl -kL http://go-web:3000/mariadb?service=mariadb-10-11" | grep "SERVICE_HOST=10.11"
 docker compose exec -T commons sh -c "curl -kL http://go-web:3000/mariadb?service=mariadb-10-11" | grep "LAGOON_TEST_VAR=internal-services-test"
 
+# mysql-8-0 should be able to read/write data
+docker compose exec -T commons sh -c "curl -kL http://go-web:3000/mysql?service=mysql-8-0" | grep "SERVICE_HOST=8.0.34"
+docker compose exec -T commons sh -c "curl -kL http://go-web:3000/mysql?service=mysql-8-0" | grep "LAGOON_TEST_VAR=internal-services-test"
+
+# mysql-8-4 should be able to read/write data
+docker compose exec -T commons sh -c "curl -kL http://go-web:3000/mysql?service=mysql-8-4" | grep "SERVICE_HOST=8.4.0"
+docker compose exec -T commons sh -c "curl -kL http://go-web:3000/mysql?service=mysql-8-4" | grep "LAGOON_TEST_VAR=internal-services-test"
+
 # postgres-12 should be able to read/write data
 docker compose exec -T commons sh -c "curl -kL http://go-web:3000/postgres?service=postgres-12" | grep "SERVICE_HOST=PostgreSQL 12"
 docker compose exec -T commons sh -c "curl -kL http://go-web:3000/postgres?service=postgres-12" | grep "LAGOON_TEST_VAR=internal-services-test"

docker-compose.yml

@@ -57,15 +57,15 @@ services:
     ports:
       - '5432'
 
-  mysql-5-7:
-    image: testlagoon/mysql-5.7:experimental
+  mysql-8-0:
+    image: testlagoon/mysql-8.0:experimental
     labels:
       lagoon.type: mariadb
     ports:
       - "3306"
 
-  mysql-8-0:
-    image: testlagoon/mysql-8.0:experimental
+  mysql-8-4:
+    image: testlagoon/mysql-8.4:pr-308 # Placeholder
     labels:
       lagoon.type: mariadb
     ports:

main.go

@@ -21,7 +21,7 @@ func main() {
 	r.HandleFunc("/mongo", mongoHandler)
 	r.HandleFunc("/opensearch", opensearchHandler)
 	r.HandleFunc("/storage", persistentStorageHandler)
-	r.HandleFunc("/mysql", mysqlHandler)
+	r.HandleFunc("/mysql", mariadbHandler)
 	r.HandleFunc("/", handleReq)
 	http.Handle("/", r)