diff --git a/.github/workflows/unit_test.yml b/.github/workflows/unit_test.yml
index a479154ca8f..44581a85125 100644
--- a/.github/workflows/unit_test.yml
+++ b/.github/workflows/unit_test.yml
@@ -21,7 +21,7 @@ jobs:
services:
mysql:
- image: mysql/mysql-server:5.6
+ image: mysql:5.7
env:
MYSQL_ROOT_PASSWORD: leonardo-test
MYSQL_USER: leonardo-test
diff --git a/docker/run-mysql.sh b/docker/run-mysql.sh
index 29d81d39f83..ae5d11308b1 100755
--- a/docker/run-mysql.sh
+++ b/docker/run-mysql.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
-# The CloudSQL console simply states "MySQL 5.6" so we may not match the minor version number
-MYSQL_VERSION=5.6
+# The CloudSQL console simply states "MySQL 5.7" so we may not match the minor version number
+MYSQL_VERSION=5.7
start() {
echo "attempting to remove old $CONTAINER container..."
@@ -17,7 +17,7 @@ start() {
-e MYSQL_DATABASE=leotestdb \
-d \
-p 3311:3306 \
- mysql/mysql-server:$MYSQL_VERSION
+ mysql:$MYSQL_VERSION
# validate mysql
echo "running mysql validation..."
diff --git a/http/src/main/resources/org/broadinstitute/dsde/workbench/leonardo/liquibase/changesets/20170901_cluster-createdDate-default.xml b/http/src/main/resources/org/broadinstitute/dsde/workbench/leonardo/liquibase/changesets/20170901_cluster-createdDate-default.xml
index b100269e07b..6838b12501e 100644
--- a/http/src/main/resources/org/broadinstitute/dsde/workbench/leonardo/liquibase/changesets/20170901_cluster-createdDate-default.xml
+++ b/http/src/main/resources/org/broadinstitute/dsde/workbench/leonardo/liquibase/changesets/20170901_cluster-createdDate-default.xml
@@ -1,7 +1,12 @@
+ 8:c1023fe139609a1cab82cda7caededc0
+
+ Mysql 5.7+ cannot add a not null constraint with a default value simultaneously. This changeSet has been modified to reflect that; the
+ validCheckSum is the checksum from when the table was not altered, but with addNotNullConstraint and addDefaultValue.
+
ALTER TABLE CLUSTER
- CHANGE createdDate createdDate TIMESTAMP(6) NOT NULL DEFAULT 0
+ CHANGE createdDate createdDate TIMESTAMP(6) NOT NULL DEFAULT "1970-01-01 00:00:01.000000"
\ No newline at end of file
diff --git a/http/src/main/resources/org/broadinstitute/dsde/workbench/leonardo/liquibase/changesets/20171011_cluster_destroyedDate_not_null.xml b/http/src/main/resources/org/broadinstitute/dsde/workbench/leonardo/liquibase/changesets/20171011_cluster_destroyedDate_not_null.xml
index 928b9bd3850..86a307a6e75 100644
--- a/http/src/main/resources/org/broadinstitute/dsde/workbench/leonardo/liquibase/changesets/20171011_cluster_destroyedDate_not_null.xml
+++ b/http/src/main/resources/org/broadinstitute/dsde/workbench/leonardo/liquibase/changesets/20171011_cluster_destroyedDate_not_null.xml
@@ -1,13 +1,13 @@
-
-
+ 8:29280ede1de44e4c3f2966c6922e9865
+
+ Mysql 5.7+ changed default time stamps. This changeSet has been modified to reflect that; the
+ validCheckSum is the checksum from when the default was 0.
+
+
+ ALTER TABLE CLUSTER MODIFY COLUMN destroyedDate TIMESTAMP(6) NOT NULL DEFAULT '1970-01-01 00:00:01.000000';
+
\ No newline at end of file
diff --git a/http/src/main/resources/org/broadinstitute/dsde/workbench/leonardo/liquibase/changesets/20180515_cluster_dateaccessed.xml b/http/src/main/resources/org/broadinstitute/dsde/workbench/leonardo/liquibase/changesets/20180515_cluster_dateaccessed.xml
index 3891a9b6cd1..175ccb5b181 100644
--- a/http/src/main/resources/org/broadinstitute/dsde/workbench/leonardo/liquibase/changesets/20180515_cluster_dateaccessed.xml
+++ b/http/src/main/resources/org/broadinstitute/dsde/workbench/leonardo/liquibase/changesets/20180515_cluster_dateaccessed.xml
@@ -13,8 +13,11 @@
-
+ 8:5017000ff29d7873815c1bdb69895225
+
+ Mysql 5.7+ cannot add a not null constraint with a default value simultaneously. This changeSet has been modified to reflect that; the
+ validCheckSum is the checksum from when the table was not altered, but with addNotNullConstraint and addDefaultValue.
+
+ ALTER TABLE CLUSTER MODIFY COLUMN dateAccessed TIMESTAMP(6) NOT NULL DEFAULT '1970-01-01 00:00:01.000000'
\ No newline at end of file
diff --git a/http/src/main/resources/org/broadinstitute/dsde/workbench/leonardo/liquibase/changesets/20200427_create_persistent_disk_table.xml b/http/src/main/resources/org/broadinstitute/dsde/workbench/leonardo/liquibase/changesets/20200427_create_persistent_disk_table.xml
index b163acf756a..8ad6bca4f6c 100644
--- a/http/src/main/resources/org/broadinstitute/dsde/workbench/leonardo/liquibase/changesets/20200427_create_persistent_disk_table.xml
+++ b/http/src/main/resources/org/broadinstitute/dsde/workbench/leonardo/liquibase/changesets/20200427_create_persistent_disk_table.xml
@@ -1,6 +1,11 @@
+ 8:6e2afa6af8c562abad1e253e74d79817
+
+ Mysql 5.7+ changed default time stamps. This changeSet has been modified to reflect that; the
+ validCheckSum is the checksum from when the default was not set.
+
@@ -26,13 +31,13 @@
-
+
-
+
-
+
diff --git a/http/src/main/resources/org/broadinstitute/dsde/workbench/leonardo/liquibase/changesets/20200501_kubernetes_tables.xml b/http/src/main/resources/org/broadinstitute/dsde/workbench/leonardo/liquibase/changesets/20200501_kubernetes_tables.xml
index bc8ae9af399..1c5ed3cf766 100644
--- a/http/src/main/resources/org/broadinstitute/dsde/workbench/leonardo/liquibase/changesets/20200501_kubernetes_tables.xml
+++ b/http/src/main/resources/org/broadinstitute/dsde/workbench/leonardo/liquibase/changesets/20200501_kubernetes_tables.xml
@@ -2,6 +2,11 @@
+ 8:599d13c602bc3a23e12dc577a848456f
+
+ Mysql 5.7+ changed default time stamps. This changeSet has been modified to reflect that; the
+ validCheckSum is the checksum from when the default was 0000-00-00 00:00:00.000000.
+
@@ -27,13 +32,13 @@
-
+
-
+
@@ -45,6 +50,11 @@
+ 8:854fccdae58bc9906a94269397f04ae3
+
+ Mysql 5.7+ changed default time stamps. This changeSet has been modified to reflect that; the
+ validCheckSum is the checksum from when the default was 0000-00-00 00:00:00.000000.
+
@@ -61,13 +71,13 @@
-
+
-
+
diff --git a/http/src/main/resources/org/broadinstitute/dsde/workbench/leonardo/liquibase/changesets/20200520_kubernetes_refactor.xml b/http/src/main/resources/org/broadinstitute/dsde/workbench/leonardo/liquibase/changesets/20200520_kubernetes_refactor.xml
index ec364630581..f8522bbc9b5 100644
--- a/http/src/main/resources/org/broadinstitute/dsde/workbench/leonardo/liquibase/changesets/20200520_kubernetes_refactor.xml
+++ b/http/src/main/resources/org/broadinstitute/dsde/workbench/leonardo/liquibase/changesets/20200520_kubernetes_refactor.xml
@@ -19,6 +19,11 @@
+ 8:a2cec6057088736af10dcdc3c2dd3091
+
+ Mysql 5.7+ changed default time stamps. This changeSet has been modified to reflect that; the
+ validCheckSum is the checksum from when the default was 0000-00-00 00:00:00.000000.
+
@@ -41,13 +46,13 @@
-
+
-
+
diff --git a/http/src/main/resources/org/broadinstitute/dsde/workbench/leonardo/liquibase/changesets/20230911_create_app_usage_table.xml b/http/src/main/resources/org/broadinstitute/dsde/workbench/leonardo/liquibase/changesets/20230911_create_app_usage_table.xml
index 0c65fcc8de9..945147a4e40 100644
--- a/http/src/main/resources/org/broadinstitute/dsde/workbench/leonardo/liquibase/changesets/20230911_create_app_usage_table.xml
+++ b/http/src/main/resources/org/broadinstitute/dsde/workbench/leonardo/liquibase/changesets/20230911_create_app_usage_table.xml
@@ -1,6 +1,11 @@
+ 8:10d891c4c811215803753f8b060621be
+
+ Mysql 5.7+ changed default time stamps. This changeSet has been modified to reflect that; the
+ validCheckSum is the checksum from when the default was 0000-00-00 00:00:00.000000.
+
@@ -8,7 +13,7 @@
-
+
diff --git a/http/src/test/resources/reference.conf b/http/src/test/resources/reference.conf
index 2de180f239b..1836bee3dcd 100644
--- a/http/src/test/resources/reference.conf
+++ b/http/src/test/resources/reference.conf
@@ -37,7 +37,7 @@ mysql {
port = 3311
db {
driver = "com.mysql.cj.jdbc.Driver"
- url = "jdbc:mysql://"${mysql.host}":"${mysql.port}"/leotestdb?createDatabaseIfNotExist=true&useSSL=false&rewriteBatchedStatements=true&nullNamePatternMatchesAll=true"
+ url = "jdbc:mysql://"${mysql.host}":"${mysql.port}"/leotestdb?createDatabaseIfNotExist=true&allowPublicKeyRetrieval=true&useSSL=false&rewriteBatchedStatements=true&nullNamePatternMatchesAll=true"
user = "leonardo-test"
password = "leonardo-test"
connectionTimeout = "5 seconds" // default of 1 sec sometimes too short for docker local mysql
diff --git a/leonardo-example.conf b/leonardo-example.conf
index 7a9743672f7..36ecad0aa6c 100644
--- a/leonardo-example.conf
+++ b/leonardo-example.conf
@@ -61,7 +61,7 @@ dataproc {
# Database connection information
mysql {
db {
- url = "jdbc:mysql://YOUR_DB_HOST/leonardo?requireSSL=true&useSSL=true&rewriteBatchedStatements=true&nullNamePatternMatchesAll=true"
+ url = "jdbc:mysql://YOUR_DB_HOST/leonardo?allowPublicKeyRetrieval=true&useSSL=false&rewriteBatchedStatements=true&nullNamePatternMatchesAll=true"
user = "USER_NAME"
password = "PASSWORD"
}