Merge pull request #6 from rolivieri/master

Migrated library to use newer version of Swift-cfenv.

Author: rfdickerson

Package.swift

@@ -3,7 +3,6 @@ import PackageDescription
 let package = Package(
     name: "CloudConfiguration",
     dependencies: [
-        .Package(url: "https://github.com/IBM-Swift/Configuration", majorVersion: 0),
-        .Package(url: "https://github.com/IBM-Swift/Swift-cfenv.git", majorVersion: 2)
+        .Package(url: "https://github.com/IBM-Swift/Swift-cfenv.git", majorVersion: 3)
     ]
 )

Sources/CloudFoundryConfig/Extensions.swift

@@ -14,10 +14,7 @@
  * limitations under the License.
  */
 
-
-
 import Configuration
-
 import CloudFoundryEnv
 
 /**
@@ -30,118 +27,74 @@ public enum ConfigurationManagerError: Error {
 
 extension ConfigurationManager {
 
-    private func findService(name: String) throws -> Service? {
-
-        let appEnv = try CloudFoundryEnv.getAppEnv(configManager: self)
-        return appEnv.getService(spec: name)
-
-    }
-
     public func getCloudantService(name: String) throws -> CloudantService {
 
-        if let service = try findService(name: name),
+        if let service = getService(spec: name),
             let cloudantService = CloudantService(withService: service) {
                 return cloudantService
         } else {
             throw ConfigurationManagerError.noServiceWithName(name)
         }
-
-
     }
 
     public func getMongoDBService(name: String) throws -> MongoDBService {
 
-        if let service = try findService(name: name),
+        if let service = getService(spec: name),
             let mongoDBService = MongoDBService(withService: service) {
             return mongoDBService
         } else {
             throw ConfigurationManagerError.noServiceWithName(name)
         }
-
-
     }
 
     public func getRedisService(name: String) throws -> RedisService {
 
-        if let service = try findService(name: name),
+        if let service = getService(spec: name),
             let redisService = RedisService(withService: service) {
                 return redisService
         } else {
             throw ConfigurationManagerError.noServiceWithName(name)
         }
-
     }
 
     public func getPostgreSQLService(name: String) throws -> PostgreSQLService {
 
-        if let service = try findService(name: name),
+        if let service = getService(spec: name),
             let postgreSQLService = PostgreSQLService(withService: service) {
             return postgreSQLService
         } else {
             throw ConfigurationManagerError.noServiceWithName(name)
         }
-
     }
 
     public func getMySQLService(name: String) throws -> MySQLService {
 
-        if let service = try findService(name: name),
+        if let service = getService(spec: name),
             let mySQLService = MySQLService(withService: service) {
             return mySQLService
         } else {
             throw ConfigurationManagerError.noServiceWithName(name)
         }
-
     }
 
     public func getDB2Service(name: String) throws -> DB2Service {
 
-        if let service = try findService(name: name),
+        if let service = getService(spec: name),
             let myDB2Service = DB2Service(withService: service) {
             return myDB2Service
         } else {
             throw ConfigurationManagerError.noServiceWithName(name)
         }
-
     }
 
     public func getAlertNotificationService(name: String) throws -> AlertNotificationService {
 
-        if let service = try findService(name: name),
+        if let service = getService(spec: name),
             let alertNotificationService = AlertNotificationService(withService: service) {
             return alertNotificationService
         } else {
             throw ConfigurationManagerError.noServiceWithName(name)
         }
-
-    }
-
-    public var applicationPort: Int {
-
-        if let port = try? CloudFoundryEnv.getAppEnv().port {
-            return port
-        } else {
-            return 8080
-        }
-
-    }
-}
-
-
-extension CloudFoundryEnv {
-
-    public static func getAppEnv(configManager: ConfigurationManager) throws -> AppEnv {
-
-        let servs = configManager["VCAP_SERVICES"]
-
-        let app = configManager["VCAP_APPLICATION"]
-        var vcap: [String:Any] = [:]
-
-        vcap["application"] = app
-        vcap["services"] = servs
-        var config: [String:Any] = [:]
-        config["vcap"] = vcap
-        return try AppEnv(options: config)
     }
 
 }

Sources/CloudFoundryConfig/Services.swift

@@ -15,7 +15,6 @@
  */
 
 import Foundation
-
 import CloudFoundryEnv
 
 public class CloudantService: Service {

Tests/CloudFoundryConfigTests/FileLoadTests.swift

@@ -19,7 +19,6 @@ import Foundation
 import Configuration
 @testable import CloudFoundryConfig
 
-
 class FileLoadTests: XCTestCase {
 
     static var allTests : [(String, (FileLoadTests) -> () throws -> Void)] {
@@ -35,7 +34,8 @@ class FileLoadTests: XCTestCase {
         do {
             // Modify relative path for your system, make more dynamic later
             let filePath = URL(fileURLWithPath: #file).appendingPathComponent("../config_example.json").standardized
-            try manager.load(url: filePath)
+            let loaded = manager.load(url: filePath)
+            XCTAssertTrue(loaded)
 
             let cloudantService = try manager.getCloudantService(name: "CloudantService")