Reading environment variable from C (#257)

Sources/AWSSDKSwiftCore/AWSClient.swift

@@ -18,7 +18,6 @@ import Metrics
 import NIO
 import NIOHTTP1
 import NIOTransportServices
-import class  Foundation.ProcessInfo
 import class  Foundation.JSONSerialization
 import class  Foundation.JSONDecoder
 import struct Foundation.Data

Sources/AWSSDKSwiftCore/Credential/Credential.swift

@@ -14,7 +14,6 @@
 
 import INIParser
 import struct Foundation.Date
-import class  Foundation.ProcessInfo
 import class  Foundation.NSString
 
 extension Credential {
@@ -33,7 +32,7 @@ public struct ExpiringCredential: Credential {
     public init(accessKeyId: String, secretAccessKey: String, sessionToken: String? = nil, expiration: Date? = nil) {
         self.accessKeyId = accessKeyId
         self.secretAccessKey = secretAccessKey
-        self.sessionToken = sessionToken ?? ProcessInfo.processInfo.environment["AWS_SESSION_TOKEN"]
+        self.sessionToken = sessionToken ?? Environment["AWS_SESSION_TOKEN"]
         self.expiration = expiration
     }
 
@@ -111,3 +110,22 @@ public struct SharedCredential: Credential {
         self.sessionToken = config["aws_session_token"]
     }
 }
+
+/// environment variable version of credential that uses system environment variables to get credential details
+public struct EnvironmentCredential: Credential {
+    public let accessKeyId: String
+    public let secretAccessKey: String
+    public let sessionToken: String?
+
+    public init?() {
+        guard let accessKeyId = Environment["AWS_ACCESS_KEY_ID"] else {
+            return nil
+        }
+        guard let secretAccessKey = Environment["AWS_SECRET_ACCESS_KEY"] else {
+            return nil
+        }
+        self.accessKeyId = accessKeyId
+        self.secretAccessKey = secretAccessKey
+        self.sessionToken = Environment["AWS_SESSION_TOKEN"]
+    }
+}

Sources/AWSSDKSwiftCore/Doc/Environment.swift

@@ -0,0 +1,14 @@
+#if os(Linux)
+import Glibc
+#else
+import Darwin.C
+#endif
+
+internal enum Environment {
+    internal static subscript(_ name: String) -> String? {
+        guard let value = getenv(name) else {
+            return nil
+        }
+        return String(cString: value)
+    }
+}

Sources/AWSSDKSwiftCore/Doc/Mirror.swift

@@ -12,8 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-func unwrap(_ any: Any) -> Any?
-{
+func unwrap(_ any: Any) -> Any? {
     let mirror = Mirror(reflecting: any)
     guard mirror.displayStyle == .optional else { return any }
     guard let first = mirror.children.first else { return nil }

Sources/AWSSDKSwiftCore/MetaDataService.swift

@@ -25,7 +25,6 @@ import struct Foundation.TimeInterval
 import struct Foundation.TimeZone
 import struct Foundation.Locale
 import class  Foundation.JSONDecoder
-import class  Foundation.ProcessInfo
 
 /// errors returned by metadata service
 enum MetaDataServiceError: Error {
@@ -120,7 +119,7 @@ struct ECSMetaDataServiceProvider: MetaDataServiceProvider {
 
     typealias MetaData = ECSMetaData
 
-    static var containerCredentialsUri = ProcessInfo.processInfo.environment["AWS_CONTAINER_CREDENTIALS_RELATIVE_URI"]
+    static var containerCredentialsUri = Environment["AWS_CONTAINER_CREDENTIALS_RELATIVE_URI"]
     static var host = "169.254.170.2"
     var url: String
 

Sources/AWSSDKSwiftCore/ServiceConfig.swift

@@ -12,8 +12,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-import class Foundation.ProcessInfo
-
 /// Configuration class defining an AWS service
 public class ServiceConfig {
 
@@ -72,7 +70,7 @@ public class ServiceConfig {
             partition = region.partition
         } else if let partitionEndpoint = partitionEndpoints[partition] {
             self.region = partitionEndpoint.region
-        } else if let defaultRegion = ProcessInfo.processInfo.environment["AWS_DEFAULT_REGION"] {
+        } else if let defaultRegion = Environment["AWS_DEFAULT_REGION"] {
             self.region = Region(rawValue: defaultRegion)
         } else {
             self.region = .useast1

Sources/AWSSignerV4/credentials.swift

@@ -12,8 +12,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-import class Foundation.ProcessInfo
-
 /// Protocol for providing credential details for accessing AWS services
 public protocol Credential {
     var accessKeyId: String {get}
@@ -33,23 +31,3 @@ public struct StaticCredential: Credential {
         self.sessionToken = sessionToken
     }
 }
-
-/// environment variable version of credential that uses system environment variables to get credential details
-public struct EnvironmentCredential: Credential {
-    public let accessKeyId: String
-    public let secretAccessKey: String
-    public let sessionToken: String?
-
-    public init?() {
-        guard let accessKeyId = ProcessInfo.processInfo.environment["AWS_ACCESS_KEY_ID"] else {
-            return nil
-        }
-        guard let secretAccessKey = ProcessInfo.processInfo.environment["AWS_SECRET_ACCESS_KEY"] else {
-            return nil
-        }
-        self.accessKeyId = accessKeyId
-        self.secretAccessKey = secretAccessKey
-        self.sessionToken = ProcessInfo.processInfo.environment["AWS_SESSION_TOKEN"]
-    }
-}
-

Tests/AWSSDKSwiftCoreTests/Doc/EnvironmentTests.swift

@@ -0,0 +1,24 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the AWSSDKSwift open source project
+//
+// Copyright (c) 2017-2020 the AWSSDKSwift project authors
+// Licensed under Apache License v2.0
+//
+// See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of AWSSDKSwift project authors
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+//===----------------------------------------------------------------------===//
+
+import XCTest
+@testable import AWSSDKSwiftCore
+
+class EnvironmentTests: XCTestCase {
+    func testGetPathFromEnvironment() {
+        let path = Environment["PATH"]
+        XCTAssertNotNil(path)
+        XCTAssertNotEqual(path, "")
+    }
+}

Tests/AWSSDKSwiftCoreTests/MetaDataServiceTests.swift

@@ -64,7 +64,7 @@ class MetaDataServiceTests: XCTestCase {
 
     // Disabling cannot guarantee that 169.254.169.254 is not a valid IP on another network
     func testMetaDataGetCredential() {
-        if ProcessInfo.processInfo.environment["TEST_EC2_METADATA"] != nil {
+        if Environment["TEST_EC2_METADATA"] != nil {
             do {
                 let httpClient = HTTPClient(eventLoopGroupProvider: .createNew)
                 _ = try MetaDataService.getCredential(httpClient: httpClient, on: httpClient.eventLoopGroup.next()).wait()

Tests/AWSSDKSwiftCoreTests/TestUtils.swift

@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-import AWSSDKSwiftCore
 import Foundation
+@testable import AWSSDKSwiftCore
 
 @propertyWrapper struct EnvironmentVariable<Value: LosslessStringConvertible> {
     var defaultValue: Value
@@ -26,7 +26,7 @@ import Foundation
 
     public var wrappedValue: Value {
         get {
-            guard let value = ProcessInfo.processInfo.environment[variableName] else { return defaultValue }
+            guard let value = Environment[variableName] else { return defaultValue }
             return Value(value) ?? defaultValue
         }
     }