add postgres and mysql tests back to CI

resolves #1238
cloudflare · Oct 3, 2022 · a9a2c2e · a9a2c2e
1 parent d4488a8
commit a9a2c2e
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 5 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -11,10 +11,45 @@ jobs:
     strategy:
       matrix:
         go: ["1.18", "1.19"]
+    services:
+      # Label used to access the service container
+      postgres:
+        # Docker Hub image
+        image: postgres
+        # Provide the password for postgres
+        env:
+          POSTGRES_DB: postgres_db
+          POSTGRES_PASSWORD: ""
+          POSTGRES_HOST_AUTH_METHOD: trust # allow no password
+          POSTGRES_PORT: 5432
+          POSTGRES_USER: postgres
+        # Set health checks to wait until postgres has started
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 5432:5432
+      mysql:
+        image: mysql
+        env:
+          MYSQL_ALLOW_EMPTY_PASSWORD: yes
+          MYSQL_ROOT_PASSWORD: ""
+        ports:
+          - 3306:3306
+        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
+
     env:
       GOFLAGS: "-mod=vendor"
       GODEBUG: "x509sha1=1"
+      BUILD_TAGS: "postgresql"
+      PGHOST: localhost
+      MYSQL_HOST: 127.0.0.1
     steps:
+      - run: psql -c 'create database certdb_development;' -U postgres;
+      - run: mysql -e 'create database certdb_development;' -u root;
+      - run: mysql -e 'SET global sql_mode = 0;' -u root;
       - uses: actions/checkout@v2
 
       - name: Set up Go
@@ -24,11 +59,11 @@ jobs:
 
       - name: Build
         run: go build -v ./...
-
+      - run: make bin/goose;
+      - run: ./bin/goose -path certdb/pg up;
+      - run: ./bin/goose -path certdb/mysql up;
       - name: Test
         run: ./test.sh
-      # todo: these Actions tests still need to be updated to run the database tests
-      # that used to run in travis
       - uses: codecov/codecov-action@v3
 
   golangci:

diff --git a/certdb/pg/dbconf.yml b/certdb/pg/dbconf.yml
@@ -1,6 +1,6 @@
 development:
   driver: postgres
-  open: dbname=certdb_development sslmode=disable
+  open: dbname=certdb_development sslmode=disable user=postgres
 
 test:
   driver: postgres

diff --git a/certdb/testdb/testdb.go b/certdb/testdb/testdb.go
@@ -60,7 +60,7 @@ func MySQLDB() *sqlx.DB {
 
 // PostgreSQLDB returns a PostgreSQL db instance for certdb testing.
 func PostgreSQLDB() *sqlx.DB {
-	connStr := "dbname=certdb_development sslmode=disable"
+	connStr := "dbname=certdb_development sslmode=disable user=postgres"
 
 	if dbURL := os.Getenv("DATABASE_URL"); dbURL != "" {
 		connStr = dbURL