Update mysql and postgres GH workflows to use DSNs

warrant-dev · May 22, 2024 · 837432b · 837432b
1 parent 9ba0cc5
commit 837432b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/.github/workflows/mysql.yaml b/.github/workflows/mysql.yaml
@@ -47,15 +47,12 @@ jobs:
           WARRANT_CHECK_MAXCONCURRENCY: 1000
           WARRANT_CHECK_TIMEOUT: 1m
           WARRANT_DATASTORE: mysql
-          WARRANT_DATASTORE_MYSQL_USERNAME: root
-          WARRANT_DATASTORE_MYSQL_PASSWORD: root
-          WARRANT_DATASTORE_MYSQL_HOSTNAME: 127.0.0.1
-          WARRANT_DATASTORE_MYSQL_DATABASE: warrant
+          WARRANT_DATASTORE_MYSQL_DSN: root:root@tcp(127.0.0.1:3306)/warrant?parseTime=true
           WARRANT_DATASTORE_MYSQL_MAXIDLECONNECTIONS: 5
           WARRANT_DATASTORE_MYSQL_MAXOPENCONNECTIONS: 5
           WARRANT_DATASTORE_MYSQL_CONNMAXIDLETIME: 4h
           WARRANT_DATASTORE_MYSQL_CONNMAXLIFETIME: 6h
-          WARRANT_DATASTORE_MYSQL_READERHOSTNAME: 127.0.0.1
+          WARRANT_DATASTORE_MYSQL_READERDSN: root:root@tcp(127.0.0.1:3306)/warrant?parseTime=true
           WARRANT_DATASTORE_MYSQL_READERMAXIDLECONNECTIONS: 5
           WARRANT_DATASTORE_MYSQL_READERMAXOPENCONNECTIONS: 5
       - name: Run apirunner tests

diff --git a/.github/workflows/postgres.yaml b/.github/workflows/postgres.yaml
@@ -52,16 +52,12 @@ jobs:
           WARRANT_CHECK_MAXCONCURRENCY: 1000
           WARRANT_CHECK_TIMEOUT: 1m
           WARRANT_DATASTORE: postgres
-          WARRANT_DATASTORE_POSTGRES_USERNAME: warrant_user
-          WARRANT_DATASTORE_POSTGRES_PASSWORD: db_password
-          WARRANT_DATASTORE_POSTGRES_HOSTNAME: localhost
-          WARRANT_DATASTORE_POSTGRES_DATABASE: warrant
-          WARRANT_DATASTORE_POSTGRES_SSLMODE: disable
+          WARRANT_DATASTORE_POSTGRES_DSN: postgresql://warrant_user:db_password@localhost:5432/warrant?sslmode=disable
           WARRANT_DATASTORE_POSTGRES_MAXIDLECONNECTIONS: 5
           WARRANT_DATASTORE_POSTGRES_MAXOPENCONNECTIONS: 5
           WARRANT_DATASTORE_POSTGRES_CONNMAXIDLETIME: 4h
           WARRANT_DATASTORE_POSTGRES_CONNMAXLIFETIME: 6h
-          WARRANT_DATASTORE_POSTGRES_READERHOSTNAME: localhost
+          WARRANT_DATASTORE_POSTGRES_READERDSN: postgresql://warrant_user:db_password@localhost:5432/warrant?sslmode=disable
           WARRANT_DATASTORE_POSTGRES_READERMAXIDLECONNECTIONS: 5
           WARRANT_DATASTORE_POSTGRES_READERMAXOPENCONNECTIONS: 5
       - name: Run apirunner tests