Updating everything to work with first Vapor beta

Author: mattpolzin

Package.resolved

@@ -4,7 +4,7 @@ import PackageDescription
 let package = Package(
     name: "jsonapi-openapi-test-server",
     platforms: [
-        .macOS(.v10_12)
+        .macOS(.v10_14)
     ],
     products: [
         .library(name: "jsonapi-openapi-test-server", targets: ["App"]),

Package.swift

@@ -8,20 +8,21 @@
 import APITesting
 import Vapor
 
-func configure(_ services: inout Services) {
+func configure(_ app: Application) {
     // Commands
-    services.register(APITestCommand.self) { _ in
+    app.register(APITestCommand.self) { _ in
         return try .init()
     }
-    services.register(CommandConfiguration.self) { container in
+    app.register(CommandConfiguration.self) { container in
         var commandConfig = CommandConfiguration()
-        try commandConfig.use(container.make(APITestCommand.self), as: "test", isDefault: true)
+        commandConfig.use(container.make(APITestCommand.self), as: "test", isDefault: true)
         return commandConfig
     }
 }
 
-let app = Application(environment: try .detect(),
-                      configure: configure)
+let app = Application(environment: try .detect())
+
+configure(app)
 
 try app.boot()
 try app.run()

Sources/APITest/main.swift

@@ -129,9 +129,19 @@ public func openAPIDoc(on loop: EventLoop,
             headers.add(name: .authorization, value: HTTPClient.Authorization.basic(username: username, password: password).headerValue)
         }
 
-        return client.get(url, headers: headers).flatMapThrowing {
+        let request: HTTPClient.Request
+        do {
+            request = try HTTPClient.Request(url: url.string,
+                                         method: .GET,
+                                         headers: headers)
+        } catch {
+            return loop.makeFailedFuture(Abort(.badRequest))
+        }
+
+        return client.execute(request: request).flatMapThrowing { response in
             try client.syncShutdown()
-            return try $0.content.decode(OpenAPI.Document.self)
+            return try ClientResponse(status: response.status, headers: response.headers, body: response.body)
+                .content.decode(OpenAPI.Document.self)
         }
     }
 

Sources/APITesting/APITestCommand.swift

@@ -123,13 +123,9 @@ extension API {
                 Includes(values: resource.1.map { Include1($0) })
         }
 
-        return resourceFuture.and(includesFuture)
-            .map { (resource, includes) in
-                SingleAPITestDescriptorResponse.SuccessDocument(apiDescription: .none,
-                                                                body: .init(resourceObject: resource.0),
-                                                                includes: includes,
-                                                                meta: .none,
-                                                                links: .none)
+        return responseFuture.and(includesFuture)
+            .map { (response, includes) in
+                response.including(includes)
         }
     }
 }

Sources/App/Models/API/API_APITestDescriptor.swift

@@ -21,7 +21,7 @@ public final class APITestDescriptor: Model {
     @Field(key: "status")
     var status: Status
 
-    @Children(from: \.$apiTestDescriptor)
+    @Children(for: \.$apiTestDescriptor)
     var messages: [APITestMessage]
 
     /// Create a new test descriptor. It is strongly recommended that

Sources/App/Models/DB/APITestDescriptor.swift

@@ -2,7 +2,9 @@ import Vapor
 
 /// Creates an instance of `Application`. This is called from `main.swift` in the run target.
 public func app(_ env: Environment) throws -> Application {
-    let app = Application(environment: env, configure: configure)
-    try boot(app)
+    var environment = env
+    try LoggingSystem.bootstrap(from: &environment)
+    let app = Application(environment: environment)
+    try configure(app)
     return app
 }

Sources/App/app.swift

@@ -4,26 +4,24 @@ import Vapor
 import APITesting
 
 /// Called before your application initializes.
-public func configure(_ services: inout Services) {
+public func configure(_ app: Application) throws {
     // Register providers first
-    services.provider(FluentProvider())
-
-    // Register routes
-    services.register(Routes.self, routes)
+    app.provider(FluentProvider())
 
     // Register middleware
-    services.register(MiddlewareConfiguration.self) { container in
-        var middlewares = MiddlewareConfiguration()
-        middlewares.use(ErrorMiddleware.default(environment: container.environment)) // Catches errors and converts to HTTP response
-        return middlewares
+    app.register(extension: MiddlewareConfiguration.self) { middlewares, app in
+        middlewares.use(ErrorMiddleware.default(environment: app.environment))
     }
 
     // Configure databases
-    services.extend(Databases.self, databases)
-    services.register(Database.self) { container in
-        return try container.make(Databases.self).database(.psql)!
+    app.register(extension: Databases.self, databases)
+    app.register(Database.self) { app in
+        return app.make(Databases.self).database(.psql)!
     }
 
     // Configure migrations
-    services.register(Migrations.self, migrations)
+    app.register(Migrations.self, migrations)
+
+    // Register routes
+    try routes(app)
 }

Sources/App/boot.swift

@@ -2,6 +2,8 @@
 import Vapor
 import FluentPostgresDriver
 
-public func databases(_ databases: inout Databases, _ container: Container) throws {
-    try databases.postgres(config: Environment.dbConfig())
+public func databases(_ databases: inout Databases, _ app: Application) throws {
+    try databases.postgres(configuration: Environment.dbConfig(),
+                           poolConfiguration: app.make(),
+                           on: app.make())
 }