Prefix default usernames and password for test with test_ instead of vapor_ (#192)

* Prefix default usernames and password for test with test_ instead of vapor_
* Update test workflow to use new defaults

Author: fabianfett

.github/workflows/test.yml

@@ -57,28 +57,37 @@ jobs:
     runs-on: ubuntu-latest
     env:
       LOG_LEVEL: debug
+      # Unfortunately, fluent-postgres-driver details leak through here
       POSTGRES_HOSTNAME: 'psql-a'
-      POSTGRES_DB: 'vapor_database'
-      POSTGRES_USER: 'vapor_username'
-      POSTGRES_PASSWORD: 'vapor_password'
+      POSTGRES_DB: 'test_database'
+      POSTGRES_DATABASE: 'test_database'
+      POSTGRES_DATABASE_A: 'test_database'
+      POSTGRES_DATABASE_B: 'test_database'
+      POSTGRES_USER: 'test_username'
+      POSTGRES_USERNAME: 'test_username'
+      POSTGRES_USERNAME_A: 'test_username'
+      POSTGRES_USERNAME_B: 'test_username'
+      POSTGRES_PASSWORD: 'test_password'
+      POSTGRES_PASSWORD_A: 'test_password'
+      POSTGRES_PASSWORD_B: 'test_password'
       POSTGRES_HOSTNAME_A: 'psql-a'
       POSTGRES_HOSTNAME_B: 'psql-b'
       POSTGRES_HOST_AUTH_METHOD: ${{ matrix.dbauth }}
     services:
       psql-a:
         image: ${{ matrix.dbimage }}
         env:
-          POSTGRES_USER: 'vapor_username'
-          POSTGRES_DB: 'vapor_database'
-          POSTGRES_PASSWORD: 'vapor_password'
+          POSTGRES_USER: 'test_username'
+          POSTGRES_DB: 'test_database'
+          POSTGRES_PASSWORD: 'test_password'
           POSTGRES_HOST_AUTH_METHOD: ${{ matrix.dbauth }}
           POSTGRES_INITDB_ARGS: --auth-host=${{ matrix.dbauth }}
       psql-b:
         image: ${{ matrix.dbimage }}
         env:
-          POSTGRES_USER: 'vapor_username'
-          POSTGRES_DB: 'vapor_database'
-          POSTGRES_PASSWORD: 'vapor_password'
+          POSTGRES_USER: 'test_username'
+          POSTGRES_DB: 'test_database'
+          POSTGRES_PASSWORD: 'test_password'
           POSTGRES_HOST_AUTH_METHOD: ${{ matrix.dbauth }}
           POSTGRES_INITDB_ARGS: --auth-host=${{ matrix.dbauth }}
     steps:
@@ -124,8 +133,8 @@ jobs:
     env:
       LOG_LEVEL: debug
       POSTGRES_HOSTNAME: 127.0.0.1
-      POSTGRES_USER: 'vapor_username'
-      POSTGRES_PASSWORD: 'vapor_password'
+      POSTGRES_USER: 'test_username'
+      POSTGRES_PASSWORD: 'test_password'
       POSTGRES_DB: 'postgres'
       POSTGRES_HOST_AUTH_METHOD: ${{ matrix.dbauth }}
     steps:

README.md

@@ -124,9 +124,9 @@ Once you have a connection, you will need to authenticate with the server using
 
 ```swift
 try conn.authenticate(
-    username: "vapor_username",
-    database: "vapor_database",
-    password: "vapor_password"
+    username: "your_username",
+    database: "your_database",
+    password: "your_password"
 ).wait()
 ```
 

Tests/IntegrationTests/PSQLIntegrationTests.swift

@@ -25,8 +25,8 @@ final class IntegrationTests: XCTestCase {
         let config = PSQLConnection.Configuration(
             host: env("POSTGRES_HOSTNAME") ?? "localhost",
             port: 5432,
-            username: env("POSTGRES_USER") ?? "postgres",
-            database: env("POSTGRES_DB"),
+            username: env("POSTGRES_USER") ?? "test_username",
+            database: env("POSTGRES_DB") ?? "test_database",
             password: "wrong_password",
             tlsConfiguration: nil)
 
@@ -327,9 +327,9 @@ extension PSQLConnection {
         let config = PSQLConnection.Configuration(
             host: env("POSTGRES_HOSTNAME") ?? "localhost",
             port: 5432,
-            username: env("POSTGRES_USER") ?? "postgres",
-            database: env("POSTGRES_DB"),
-            password: env("POSTGRES_PASSWORD"),
+            username: env("POSTGRES_USER") ?? "test_username",
+            database: env("POSTGRES_DB") ?? "test_database",
+            password: env("POSTGRES_PASSWORD") ?? "test_password",
             tlsConfiguration: nil)
 
         return PSQLConnection.connect(configuration: config, logger: logger, on: eventLoop)

Tests/IntegrationTests/Utilities.swift

@@ -26,9 +26,9 @@ extension PostgresConnection {
     static func test(on eventLoop: EventLoop, logLevel: Logger.Level = .info) -> EventLoopFuture<PostgresConnection> {
         return testUnauthenticated(on: eventLoop, logLevel: logLevel).flatMap { conn in
             return conn.authenticate(
-                username: env("POSTGRES_USER") ?? "vapor_username",
-                database: env("POSTGRES_DB") ?? "vapor_database",
-                password: env("POSTGRES_PASSWORD") ?? "vapor_password"
+                username: env("POSTGRES_USER") ?? "test_username",
+                database: env("POSTGRES_DB") ?? "test_database",
+                password: env("POSTGRES_PASSWORD") ?? "test_password"
             ).map {
                 return conn
             }.flatMapError { error in

docker-compose.yml

@@ -6,28 +6,28 @@ services:
     user: postgres:postgres
     environment:
       POSTGRES_HOST_AUTH_METHOD: "${POSTGRES_HOST_AUTH_METHOD:-md5}"
-      POSTGRES_USER: vapor_username
-      POSTGRES_DB: vapor_database
-      POSTGRES_PASSWORD: vapor_password
+      POSTGRES_USER: test_username
+      POSTGRES_DB: test_database
+      POSTGRES_PASSWORD: test_password
     ports:
       - 5432:5432
   psql-12:
     image: postgres:12
     user: postgres:postgres
     environment:
       POSTGRES_HOST_AUTH_METHOD: "${POSTGRES_HOST_AUTH_METHOD:-md5}"
-      POSTGRES_USER: vapor_username
-      POSTGRES_DB: vapor_database
-      POSTGRES_PASSWORD: vapor_password
+      POSTGRES_USER: test_username
+      POSTGRES_DB: test_database
+      POSTGRES_PASSWORD: test_password
     ports:
       - 5432:5432
   psql-11:
     image: postgres:11
     user: postgres:postgres
     environment:
       POSTGRES_HOST_AUTH_METHOD: "${POSTGRES_HOST_AUTH_METHOD:-md5}"
-      POSTGRES_USER: vapor_username
-      POSTGRES_DB: vapor_database
-      POSTGRES_PASSWORD: vapor_password
+      POSTGRES_USER: test_username
+      POSTGRES_DB: test_database
+      POSTGRES_PASSWORD: test_password
     ports:
       - 5432:5432