Merge pull request #3 from nodes-vapor/vapor-engine

Replacing cURL with vapor/engine

Author: joscdk

.gitignore

@@ -0,0 +1,3 @@
+.DS_Store
+*.xcodeproj
+Packages/

.travis.yml

@@ -0,0 +1,7 @@
+os:
+      - linux
+language: generic
+sudo: required
+dist: trusty
+script:
+      - eval "$(curl -sL https://swift.vapor.sh/ci)"

Package.swift

@@ -1,13 +1,14 @@
 import PackageDescription
 
 let package = Package(
-        name: "AWS",
-        targets: [
-                Target(name: "AWS"),
-                Target(name: "EC2", dependencies: ["AWS"]),
-                Target(name: "S3", dependencies: ["AWS"])
-        ],
-        dependencies: [
-                .Package(url: "https://github.com/vapor/crypto.git", majorVersion: 1),
-        ]
-        )
+    name: "AWS",
+    /*targets: [
+        Target(name: "AWS"),
+        Target(name: "EC2", dependencies: ["AWS"]),
+        Target(name: "S3", dependencies: ["AWS"])
+    ],*/
+    dependencies: [
+        .Package(url: "https://github.com/vapor/crypto.git", majorVersion: 1),
+        .Package(url: "https://github.com/vapor/engine.git", majorVersion: 1)
+    ]
+)

Sources/AWS/AWSApi/CallAWS.swift

@@ -1,10 +1,21 @@
-import Foundation
-import Console
+import HTTP
+import Transport
 
 class CallAWS {
-    let console: ConsoleProtocol = Terminal(arguments: CommandLine.arguments)
-
-    public func call(method: String, service: String, host: String, region: String, baseURL: String, key: String, secret: String, requestParam: String) throws -> String {
+    enum Error: Swift.Error {
+        case unsupported(String)
+    }
+    
+    public func call(
+        method: Authentication.Method,
+        service: String,
+        host: String,
+        region: String,
+        baseURL: String,
+        key: String,
+        secret: String,
+        requestParam: String
+    ) throws -> Response {
         let headers = Authentication(
                 method: method,
                 service: service,
@@ -13,24 +24,21 @@ class CallAWS {
                 baseURL: baseURL,
                 key: key,
                 secret: secret,
-                requestParam: requestParam).getAWSHeaders()
-
-        let header = headers.joined(separator: " ")
-
-        print("curl -X \(method) \(header) \(baseURL)?\(requestParam)")
-
-        do {
-            let output = try console.backgroundExecute(program: "/bin/sh", arguments: [
-                    "-c",
-                    "curl -X \(method) \(header) \(baseURL)?\(requestParam)"
-
-            ])
-
-            return output
-        } catch ConsoleError.backgroundExecute(_, let message, _) {
-            console.error(message.string)
+                requestParam: requestParam
+            ).getAWSHeaders()
+
+        let response: Response
+        switch method {
+        case .get:
+            response = try BasicClient.get(
+                "\(baseURL)?\(requestParam)",
+                headers: headers
+            )
+            
+        case .post:
+            throw Error.unsupported("POST")
         }
-
-        return ""
+        
+        return response
     }
-}
+}

Sources/AWS/Authentication/Authentication.swift

@@ -1,12 +1,17 @@
-import Foundation
-import HMAC
+import Core
 import Hash
+import HMAC
+import HTTP
 import Essentials
-import Core
+import Foundation
 
 class Authentication {
-
-    let method: String
+    enum Method {
+        case get
+        case post
+    }
+    
+    let method: Method
     let service: String
     let host: String
     let region: String
@@ -16,7 +21,7 @@ class Authentication {
     let secret: String
     let requestParam: String!
 
-    public init(method: String, service: String, host: String, region: String, baseURL: String, key: String, secret: String, requestParam: String!) {
+    public init(method: Method, service: String, host: String, region: String, baseURL: String, key: String, secret: String, requestParam: String!) {
         self.method = method
         self.service = service
         self.host = host
@@ -84,11 +89,12 @@ class Authentication {
         return "\(algorithm) Credential=\(self.key)/\(credentialScope), SignedHeaders=host;x-amz-date, Signature=\(signature)"
     }
 
-    public func getAWSHeaders() -> Array<String> {
+    public func getAWSHeaders() -> [HeaderKey : String] {
         amzDateHeader()
-
-        return ["-H \"Authorization: \(authorizationHeader())\"",
-                "-H \"x-amz-date: \(amzDate)\""]
+        return [
+            "Authorization": authorizationHeader(),
+            "x-amz-date": amzDate
+        ]
     }
 
     public func amzDateHeader() {
@@ -116,4 +122,4 @@ extension Data {
     func hexEncodedString() -> String {
         return map { String(format: "%02hhx", $0) }.joined()
     }
-}
+}

Sources/AWS/EC2/EC2.swift

@@ -1,7 +1,6 @@
 import Foundation
 
 class EC2 {
-
     let accessKey: String
     let secretKey: String
     let region: String
@@ -19,20 +18,18 @@ class EC2 {
     }
 
     public func describeInstances() throws -> String {
-        do {
-            return try CallAWS().call(
-                    method: "GET",
-                    service: self.service,
-                    host: self.host,
-                    region: self.region,
-                    baseURL: self.baseURL,
-                    key: self.accessKey,
-                    secret: self.secretKey,
-                    requestParam: "Action=DescribeRegions&Version=2015-10-01")
-        } catch {
-
-        }
-
-        return ""
+        //TODO(Brett): wrap this result in a model instead of a string type
+        let response =  try CallAWS().call(
+            method: .get,
+            service: service,
+            host: host,
+            region: region,
+            baseURL: baseURL,
+            key: accessKey,
+            secret: secretKey,
+            requestParam: "Action=DescribeRegions&Version=2015-10-01"
+        )
+        
+        return response.description
     }
 }

Sources/AWS/S3/S3.swift

@@ -1,9 +1,6 @@
 import Foundation
-import Console
 
 class S3 {
-    let console: ConsoleProtocol = Terminal(arguments: CommandLine.arguments)
-
     let accessKey: String
     let keySecret: String
     let region: String

Tests/AWSTests/AWSTests.swift

@@ -0,0 +1,12 @@
+import XCTest
+@testable import AWS
+
+class AWSTests: XCTestCase {
+    static var allTests = [
+        ("testExample", testExample)
+    ]
+    
+    func testExample() {
+        XCTAssertEqual(2+2, 4)
+    }
+}

Tests/LinuxMain.swift

@@ -0,0 +1,6 @@
+import XCTest
+@testable import AWSTests
+
+XCTMain([
+    testCase(AWSTests.allTests)
+])