Remove MySQL 5.7 Docker, add MySQL 8.4

Author: daniel-nichter

metrics/repl.lag/lag_test.go

@@ -11,35 +11,12 @@ import (
 	"github.com/cashapp/blip/test"
 )
 
-func TestPrepareForSingleLevelAndNoSourceOnMySQL57(t *testing.T) {
-	// default source on MySQL 5.7 should be `blip`
-	_, db, err := test.Connection("mysql57")
-	if err != nil {
-		if test.Build {
-			t.Skip("mysql57 not running")
-		} else {
-			t.Fatal(err)
-		}
-	}
-	defer db.Close()
-
-	c := NewLag(db)
-
-	defaultPlan := test.ReadPlan(t, "")
-	_, err = c.Prepare(context.Background(), defaultPlan)
-	if err != nil {
-		t.Error(err)
-	}
-
-	assert.Equal(t, "blip", c.lagWriterIn["kpi"])
-}
-
 func TestPrepareForSingleLevelAndNoSourceOnMySQL80(t *testing.T) {
 	// default source on MySQL 8.0 should be `pfs`
 	_, db, err := test.Connection("mysql80")
 	if err != nil {
 		if test.Build {
-			t.Skip("mysql57 not running")
+			t.Skip("mysql80 not running")
 		} else {
 			t.Fatal(err)
 		}
@@ -61,7 +38,7 @@ func TestPrepareWithInvalidSource(t *testing.T) {
 	_, db, err := test.Connection("mysql80")
 	if err != nil {
 		if test.Build {
-			t.Skip("mysql57 not running")
+			t.Skip("mysql80 not running")
 		} else {
 			t.Fatal(err)
 		}
@@ -81,7 +58,7 @@ func TestCollectWithNoSource(t *testing.T) {
 	_, db, err := test.Connection("mysql80")
 	if err != nil {
 		if test.Build {
-			t.Skip("mysql57 not running")
+			t.Skip("mysql80 not running")
 		} else {
 			t.Fatal(err)
 		}
@@ -107,7 +84,7 @@ func TestCollectWithAllSources(t *testing.T) {
 	_, db, err := test.Connection("mysql80")
 	if err != nil {
 		if test.Build {
-			t.Skip("mysql57 not running")
+			t.Skip("mysql80 not running")
 		} else {
 			t.Fatal(err)
 		}

test/docker/docker-compose.yaml

@@ -1,23 +1,21 @@
 version: '3.1'
 name: blip
 services:
-    mysql57:
-        # "MySQL 5.7.44 is the final release of the MySQL 5.7 series."
-        # https://dev.mysql.com/doc/relnotes/mysql/5.7/en/news-5-7-44.html
-        image: mysql:5.7.44
-        platform: linux/amd64
+    mysql80:
+        image: mysql:8.0.34
         command: --default-authentication-plugin=mysql_native_password
         restart: always
         environment:
             - "MYSQL_ROOT_PASSWORD=test"
         ports:
-            - "33570:3306"
-    mysql80:
-        image: mysql:8.0.34
-        platform: linux/amd64
-        command: --default-authentication-plugin=mysql_native_password
+            - "33800:3306"
+    mysql84:
+        image: mysql:8.4
+        command: 
         restart: always
         environment:
             - "MYSQL_ROOT_PASSWORD=test"
         ports:
-            - "33800:3306"
+            - "33840:3306"
+        volumes:
+          - ./init:/docker-entrypoint-initdb.d

test/docker/init/mysql84-init.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+/usr/sbin/mysqld --initialize