diff --git a/Package.swift b/Package.swift index 2f1e6f9..14e8b83 100644 --- a/Package.swift +++ b/Package.swift @@ -1,7 +1,5 @@ import PackageDescription -let alpha = Version(2,0,0, prereleaseIdentifiers: ["alpha"]) - let package = Package( name: "AWS", targets: [ @@ -11,6 +9,6 @@ let package = Package( Target(name: "VaporS3", dependencies: ["S3"]), ], dependencies: [ - .Package(url: "https://github.com/vapor/vapor.git", alpha), + .Package(url: "https://github.com/vapor/vapor.git", Version(2,0,0, prereleaseIdentifiers: ["beta"])), ] ) diff --git a/Sources/AWSSignatureV4/ErrorParser/ErrorParser.swift b/Sources/AWSSignatureV4/ErrorParser/ErrorParser.swift index a01735f..8e8d2f5 100644 --- a/Sources/AWSSignatureV4/ErrorParser/ErrorParser.swift +++ b/Sources/AWSSignatureV4/ErrorParser/ErrorParser.swift @@ -38,7 +38,7 @@ extension ErrorParser { let errorBytes = consume(until: .lessThan) guard let error = ErrorParser.awsGrammar.contains(errorBytes) else { - throw Error.unknownError(errorBytes.string) + throw Error.unknownError(errorBytes.makeString()) } return error diff --git a/Sources/S3/S3.swift b/Sources/S3/S3.swift index 7bb0a1e..959c920 100644 --- a/Sources/S3/S3.swift +++ b/Sources/S3/S3.swift @@ -41,7 +41,7 @@ public struct S3 { //TODO(Brett): headers & AccessControlList ) - let response = try EngineClient.put(url, headers, Body.data(bytes)) + let response = try EngineClient.factory.put(url, headers, Body.data(bytes)) guard response.status == .ok else { guard let bytes = response.body.bytes else { throw Error.invalidResponse(response.status) @@ -55,7 +55,7 @@ public struct S3 { let url = generateURL(for: path) let headers = try signer.sign(path: path) - let response = try EngineClient.get(url, headers) + let response = try EngineClient.factory.get(url, headers) guard response.status == .ok else { guard let bytes = response.body.bytes else { throw Error.invalidResponse(response.status) diff --git a/Sources/VaporS3/Provider.swift b/Sources/VaporS3/Provider.swift index 0646614..e198de1 100644 --- a/Sources/VaporS3/Provider.swift +++ b/Sources/VaporS3/Provider.swift @@ -6,7 +6,7 @@ private let s3StorageKey = "s3-provider:s3" public final class Provider: Vapor.Provider { let s3: S3 - + public static var repositoryName: String = "VaporS3" /// Initialize the provider with an s3 instance public init(_ s3: S3) { self.s3 = s3 @@ -45,7 +45,9 @@ public final class Provider: Vapor.Provider { drop.storage[s3StorageKey] = s3 } - public func beforeRun(_ drop: Droplet) throws {} + public func boot(_ config: Config) throws {} + + public func beforeRun(_ droplet: Droplet) throws {} } extension Droplet {