Register Multiple Databases for FluentBecnhmarker Tests (#151)

* Register .benchmark1 and .benchmark2 databases for FluentBenchmarker

* Create vapor_benchmark databases in GitHub Action workflow

* Use prepared-migration-filtering FluentKit branch

* Remove invalid 'creatdb' calls from Ubuntu workflow

* Create becnhmark databases for Ubuntu GitHub workflows, take #1

* Add Postgres repository to APT before attempting to install the database in the Ubuntu GitHub workflows

* Create benchmark databases for Ubuntu GitHub workflows, take #2

* Update APT repository before installing anything

* Try not installing 'deb'

* Attempt to wait for database to settle dynamically instead of a hardcoded second value

* Pass host, username, and password to psql and createdb commands for Ubuntu workflows

* Use PGPASSWORD environment variable to provide password to psql and createdb commands

* Specify vapor_database as database name to wait for to settle

* Fix FluentBenchmarker creation. Also make tests respect the LOG_LEVEL env var.

* Full-matrix CI for PostgreSQL

Maybe this one won't need six rounds of "oops this tiny thing is wrong..."

* Replace .benchmark1 and .benchmark2 databases with .migrationExtra

* Revert FluentKit dependency version

Co-authored-by: Gwynne Raskind <[email protected]>

Author: calebkleveter

.github/workflows/test.yml

@@ -1,54 +1,79 @@
-name: test
-on:
-- pull_request
+name: Test Matrix
+on: ['pull_request']
+defaults:
+  run:
+    shell: bash
 jobs:
-  fluent-postgres-driver_macos:
+  PR-tests-linux:
     strategy:
       fail-fast: false
       matrix:
-        psql: ['postgresql@11', 'postgresql@12']
+        dbimage: ['postgres:11', 'postgres:12']
+        runner: [
+          'swift:5.2-xenial', 'swift:5.2-bionic',
+          'swiftlang/swift:nightly-5.2-xenial', 'swiftlang/swift:nightly-5.2-bionic',
+          'swiftlang/swift:nightly-5.3-xenial', 'swiftlang/swift:nightly-5.3-bionic',
+          'swiftlang/swift:nightly-master-xenial', 'swiftlang/swift:nightly-master-bionic',
+          'swiftlang/swift:nightly-master-focal',
+          'swiftlang/swift:nightly-master-centos8',
+          'swiftlang/swift:nightly-master-amazonlinux2'
+        ]
         include:
-          # The PostgreSQL formulas don't use a consistent data dir
-          - psql: 'postgresql@11'
-            dbroot: '/usr/local/var/postgresql@11'
-          - psql: 'postgresql@12'
-            dbroot: '/usr/local/var/postgres'
-    runs-on: macos-latest
+          - installcmd: 'apt-get -q update && apt-get -q install -y postgresql-client'
+          - { 'runner': 'swiftlang/swift:nightly-master-centos8', 'installcmd': 'dnf install -y zlib-devel postgresql' }
+          - { 'runner': 'swiftlang/swift:nightly-master-amazonlinux2', 'installcmd': 'yum install -y zlib-devel postgresql' }
+    container: ${{ matrix.runner }}
+    runs-on: ubuntu-latest
+    services:
+      postgres:
+        image: ${{ matrix.dbimage }}
+        env: { POSTGRES_USER: vapor_username, POSTGRES_PASSWORD: vapor_password, POSTGRES_DB: vapor_database }
+    env: { 'PGPASSWORD': 'vapor_password' }
     steps:
-    - run: sudo xcode-select -s /Applications/Xcode_11.4.app/Contents/Developer
-    - run: brew uninstall --force libpq postgresql@11 postgresql@12 php
-    - run: brew install ${{ matrix.psql }}
-    - run: brew link --force ${{ matrix.psql }}
-    - run: bash -c '[[ -d "${{ matrix.dbroot }}" ]] && mv "${{ matrix.dbroot }}" /usr/local/var/.outta-the-way || true'
-    - run: mkdir -p /usr/local/var/log "${{ matrix.dbroot }}"
-    - run: initdb --locale=C -E UTF-8 "${{ matrix.dbroot }}"
-    - run: brew services start ${{ matrix.psql }}
-    - run: sleep 4 # give the server a chance to settle
-    - run: createuser -d -l -s vapor_username
-    - run: createdb -O vapor_username vapor_database
-    - uses: actions/checkout@v2
-    - run: swift test --enable-test-discovery --sanitize=thread
-    - run: brew services stop ${{ matrix.psql }}
-  fluent-postgres-driver_ubuntu:
+      - name: Install dependencies
+        run: ${{ matrix.installcmd }}
+      - name: Wait for Postgres server to be ready
+        run: until echo | psql -hpostgres -Uvapor_username vapor_database; do sleep 1; done
+        timeout-minutes: 5
+      - name: Set up Postgres databases and privileges
+        run: |
+          for db in vapor_migration_extra; do createdb -hpostgres -Uvapor_username -Ovapor_username $db; done
+      - name: Check out code
+        uses: actions/checkout@v2
+      - name: Run tests with Thread Sanitizer
+        run: swift test --enable-test-discovery --sanitize=thread
+        env: { 'POSTGRES_HOSTNAME': 'postgres' }
+  PR-tests-macos:
     strategy:
       fail-fast: false
       matrix:
-        psql: ['11', '11-alpine', '12', '12-alpine']
-        base: ['xenial', 'bionic']
-    container: 
-      image: vapor/swift:5.2-${{ matrix.base }}-ci
-    services:
-      psql:
-        image: postgres:${{ matrix.psql }}
-        ports:
-          - 5432:5432
-        env:
-          POSTGRES_USER: vapor_username
-          POSTGRES_DB: vapor_database
-          POSTGRES_PASSWORD: vapor_password
-    runs-on: ubuntu-latest
+        include: 
+          - {'formula': 'postgresql@11', 'datadir': 'postgresql@11'}
+          - {'formula': 'postgresql@12', 'datadir': 'postgres'}
+    runs-on: macos-latest
+    env: { 'PGPASSWORD': 'vapor_password' }
     steps:
-    - uses: actions/checkout@v2
-    - run: swift test --enable-test-discovery --sanitize=thread
-      env:
-        POSTGRES_HOSTNAME: psql
+      - name: Select latest available Xcode
+        uses: maxim-lobanov/[email protected]
+        with: { 'xcode-version': 'latest' }
+      - name: Blow away the default Postgres installation
+        run: brew uninstall --force postgresql php && rm -rf /usr/local/{etc,var}/{postgres,pg}*
+      - name: Install Postgres server from Homebrew
+        run: brew install ${{ matrix.formula }} && brew link --force ${{ matrix.formula }} 
+      - name: Make sure Postgres has a database, Homebrew fails REALLY bad at this
+        run: initdb --locale=C -E UTF-8 $(brew --prefix)/var/${{ matrix.datadir }}
+      - name: Start Postgres server
+        run: brew services start ${{ matrix.formula }}
+      - name: Wait for Postgres server to be ready
+        run: until echo | psql postgres; do sleep 1; done
+        timeout-minutes: 5
+      - name: Set up Postgres databases and privileges
+        run: |
+          createuser --createdb --login vapor_username
+          for db in vapor_{database,migration_extra}; do
+            createdb -Ovapor_username $db && psql $db <<<"ALTER SCHEMA public OWNER TO vapor_username;"
+          done
+      - name: Check out code
+        uses: actions/checkout@v2
+      - name: Run tests with Thread Sanitizer
+        run: swift test --enable-test-discovery --sanitize=thread

Tests/FluentPostgresDriverTests/FluentPostgresDriverTests.swift

@@ -173,21 +173,42 @@ final class FluentPostgresDriverTests: XCTestCase {
     override func setUpWithError() throws {
         try super.setUpWithError()
 
-        let configuration = PostgresConfiguration(
+        let defaultConfig = PostgresConfiguration(
             hostname: hostname,
             username: "vapor_username",
             password: "vapor_password",
             database: "vapor_database"
         )
+
+        let migrationExtraConfig = PostgresConfiguration(
+            hostname: hostname,
+            username: "vapor_username",
+            password: "vapor_password",
+            database: "vapor_migration_extra"
+        )
+
         XCTAssert(isLoggingConfigured)
         self.eventLoopGroup = MultiThreadedEventLoopGroup(numberOfThreads: 1)
         self.threadPool = NIOThreadPool(numberOfThreads: 1)
         self.dbs = Databases(threadPool: threadPool, on: self.eventLoopGroup)
-        self.dbs.use(.postgres(configuration: configuration), as: .psql)
+
+        self.dbs.use(.postgres(configuration: defaultConfig), as: .psql)
+        self.dbs.use(.postgres(configuration: migrationExtraConfig), as: .migrationExtra)
 
         // reset the database
+        let databaseExtra = try XCTUnwrap(
+            self.benchmarker.databases.database(
+                .migrationExtra,
+                logger: Logger(label: "com.test.migration_extra"),
+                on: self.eventLoopGroup.next()
+            ) as? PostgresDatabase
+        )
+
         _ = try self.postgres.query("drop schema public cascade").wait()
         _ = try self.postgres.query("create schema public").wait()
+
+        _ = try databaseExtra.query("drop schema public cascade").wait()
+        _ = try databaseExtra.query("create schema public").wait()
     }
 
     override func tearDownWithError() throws {
@@ -199,9 +220,8 @@ final class FluentPostgresDriverTests: XCTestCase {
 }
 
 extension DatabaseID {
-    static var iso8601: Self {
-        .init(string: "iso8601")
-    }
+    static let iso8601 = DatabaseID(string: "iso8601")
+    static let migrationExtra = DatabaseID(string: "migration_extra")
 }
 
 var hostname: String {
@@ -247,10 +267,14 @@ struct EventMigration: Migration {
     }
 }
 
+func env(_ name: String) -> String? {
+    return ProcessInfo.processInfo.environment[name]
+}
+
 let isLoggingConfigured: Bool = {
     LoggingSystem.bootstrap { label in
         var handler = StreamLogHandler.standardOutput(label: label)
-        handler.logLevel = .debug
+        handler.logLevel = env("LOG_LEVEL").flatMap { Logger.Level(rawValue: $0) } ?? .debug
         return handler
     }
     return true