diff --git a/.github/workflows/unit_test.yml b/.github/workflows/unit_test.yml index a479154ca8f..62304af92a1 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/mysql-server:8.0 env: MYSQL_ROOT_PASSWORD: leonardo-test MYSQL_USER: leonardo-test diff --git a/docker/run-mysql.sh b/docker/run-mysql.sh index 29d81d39f83..9d8e730584b 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 8.0" so we may not match the minor version number +MYSQL_VERSION=8.0 start() { echo "attempting to remove old $CONTAINER container..." 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..9e40fb80c57 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 @@ -2,6 +2,6 @@ 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..1da74c66d22 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,8 @@ - - + + 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..d29cc8bd030 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,6 @@ - + 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/20200501_kubernetes_tables.xml b/http/src/main/resources/org/broadinstitute/dsde/workbench/leonardo/liquibase/changesets/20200501_kubernetes_tables.xml index bc8ae9af399..6fdd3511901 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 @@ -27,13 +27,13 @@ - + - + @@ -61,13 +61,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..84af2023ab7 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 @@ -41,13 +41,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..94cba82e6ba 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 @@ -8,7 +8,7 @@ - + diff --git a/http/src/test/resources/reference.conf b/http/src/test/resources/reference.conf index 2de180f239b..c4ab9f95663 100644 --- a/http/src/test/resources/reference.conf +++ b/http/src/test/resources/reference.conf @@ -5,7 +5,7 @@ # -e MYSQL_USER=leonardo-test \ # -e MYSQL_PASSWORD=leonardo-test \ # -e MYSQL_DATABASE=leotestdb \ -# -d -p 3311:3306 mysql/mysql-server:5.6 +# -d -p 3311:3306 mysql/mysql-server:8.0 application { leoGoogleProject = "leo-project" @@ -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" }