Swift client runtime circleci setup

.circleci/config.yml

@@ -84,6 +84,15 @@ commands:
             destination: Reports
             path: build/reports/tests/test/
 
+  pre_start_ios_simulator:
+    description: >-
+      Pre-start iOS Simulator, as the build may fail if it takes too long to start up during that step
+    steps:
+      - run:
+          name: Pre-start iOS Simulator
+          command: |
+            bash CircleciScripts/pre_start_iOS_simulator.sh
+
 jobs:
   build:
     environment:
@@ -115,6 +124,7 @@ jobs:
                 paths:
                   - smithy-swift/build
                   - smithy-swift/*/build
+
   test_smithy_kotlin:
     environment:
       # Configure the JVM and Gradle to avoid OOM errors
@@ -154,6 +164,7 @@ jobs:
           name: Run ktlint
           command: |
             ./gradlew ktlint
+
   test_smithy_swift:
     environment:
       # Configure the JVM and Gradle to avoid OOM errors
@@ -194,9 +205,32 @@ jobs:
           command: |
             ./gradlew ktlint
 
+  build_and_unittest_swift_client_runtime:
+    macos:
+      xcode: "11.4.1"
+    steps:
+      - checkout
+      - pre_start_ios_simulator
+      - run:
+          name: Install swiftlint
+          command: |
+            HOMEBREW_NO_AUTO_UPDATE=1 brew install swiftlint
+      - run:
+          name: Build ClientRuntime
+          working_directory: ~/project/smithy-swift/ClientRuntime
+          command: |
+            xcodebuild build-for-testing -project ClientRuntime.xcodeproj -scheme ClientRuntime -sdk iphonesimulator -destination "${destination}"
+      - run:
+          name: Unit Test ClientRuntime
+          working_directory: ~/project/smithy-swift/ClientRuntime
+          command: |
+            xcodebuild test-without-building -enableCodeCoverage YES -project ClientRuntime.xcodeproj -scheme ClientRuntime -sdk iphonesimulator -destination "${destination}"
+            bash <(curl https://codecov.io/bash | sed 's/"$beta_xcode_partials"//g')
+
 workflows:
   version: 2
-  workflow:
+
+  build_and_test_codegen:
     jobs:
     - build
     - test_smithy_kotlin:
@@ -207,3 +241,11 @@ workflows:
         requires:
           - build
     - lint_smithy_swift
+
+  build_and_test_swift_client_runtime:
+    jobs:
+    - build_and_unittest_swift_client_runtime:
+        filters:
+            branches:
+              only:
+                - swift-client-runtime

CircleciScripts/pre_start_iOS_simulator.sh

@@ -0,0 +1,32 @@
+# Create simulator if needed
+test_device_id=$( xcrun simctl list devices | grep "circleci-test-device" | sed 's/ *circleci-test-device *(//' | sed 's/).*//' )
+
+if [[ -z $test_device_id ]] ; then
+  echo "Creating test device"
+
+  # Get the most recent available runtime
+  runtime=$( xcrun simctl list runtimes iOS | sed 's/iOS //' | sort -h | tail -1 | sed 's/.* - //' | tr -d '[:space:]' )
+  echo "Runtime: '${runtime}'"
+
+  # Get the last alphabetical device (probably something in the iPhone X family, as of 2019-05-31)
+  devicetype=$( xcrun simctl list devicetypes iPhone | sort | tail -1 | sed 's/.*(//' | sed 's/).*//' | tr -d '[:space:]' )
+  echo "Device type: '${devicetype}'"
+
+  test_device_id=$( xcrun simctl create "circleci-test-device" "${devicetype}" "${runtime}" | tr -d '[:space:]' )
+fi
+
+echo "test_device_id: ${test_device_id}"
+echo "export test_device_id='$test_device_id'" >> $BASH_ENV
+
+# Boot sim if needed
+xcrun simctl list devices ${test_device_id} | grep -q Booted
+if [[ $? -eq 1 ]] ; then
+  echo "Booting ${test_device_id}"
+  xcrun simctl boot ${test_device_id}
+fi
+
+# destinationspecifier for xcodebuild commands
+destination="platform=iOS Simulator,id=${test_device_id}"
+echo "destination: ${destination}"
+echo "export destination='$destination'" >> $BASH_ENV
+

smithy-swift/ClientRuntime/.swiftlint.yml

@@ -0,0 +1,38 @@
+excluded:
+  - Pods
+
+analyzer_rules:
+  - unused_import
+  - unused_declaration
+
+disabled_rules:
+  - trailing_whitespace
+
+opt_in_rules:
+  - empty_count
+
+# configurable rules can be customized from this configuration file
+force_cast: warning
+closing_brace: error
+colon:
+  severity: error
+comma: error
+empty_count: warning
+empty_enum_arguments: error
+function_body_length:
+  warning: 100
+  error: 150
+identifier_name:
+  excluded:
+    - id
+    - of
+    - or
+line_length:
+  warning: 120
+  error: 160
+opening_brace: error
+return_arrow_whitespace: error
+statement_position:
+  severity: error
+todo: warning
+trailing_semicolon: error

smithy-swift/ClientRuntime/ClientRuntime.xcodeproj/project.pbxproj

@@ -233,7 +233,6 @@
 		43DD7767249702C70038F7AB /* MockURLProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockURLProtocol.swift; sourceTree = "<group>"; };
 		43DD776924973A7A0038F7AB /* URLSessionDelegateTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = URLSessionDelegateTests.swift; sourceTree = "<group>"; };
 		43DD776B24973AF60038F7AB /* NetworkingTestUtils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkingTestUtils.swift; sourceTree = "<group>"; };
-		43DD776D24981F860038F7AB /* Data+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Data+Extensions.swift"; sourceTree = "<group>"; };
 		43DD7770249892A10038F7AB /* BoolTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BoolTests.swift; sourceTree = "<group>"; };
 		43DD7772249936740038F7AB /* DateTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DateTests.swift; sourceTree = "<group>"; };
 		43DD7776249957000038F7AB /* XMLSimpleTypesTestsUtils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XMLSimpleTypesTestsUtils.swift; sourceTree = "<group>"; };
@@ -541,7 +540,6 @@
 				43DD7767249702C70038F7AB /* MockURLProtocol.swift */,
 				43DD776924973A7A0038F7AB /* URLSessionDelegateTests.swift */,
 				43DD776B24973AF60038F7AB /* NetworkingTestUtils.swift */,
-				43DD776D24981F860038F7AB /* Data+Extensions.swift */,
 				43DD7792249BED370038F7AB /* HttpSerializeTests.swift */,
 			);
 			path = NetworkingTests;
@@ -647,6 +645,7 @@
 				43DD75D8249025250038F7AB /* Sources */,
 				43DD75D9249025250038F7AB /* Frameworks */,
 				43DD75DA249025250038F7AB /* Resources */,
+				43DD77D924A54B070038F7AB /* ShellScript */,
 			);
 			buildRules = (
 			);
@@ -664,6 +663,7 @@
 				43DD75E1249025250038F7AB /* Sources */,
 				43DD75E2249025250038F7AB /* Frameworks */,
 				43DD75E3249025250038F7AB /* Resources */,
+				43DD77D824A54A470038F7AB /* ShellScript */,
 			);
 			buildRules = (
 			);
@@ -729,6 +729,43 @@
 		};
 /* End PBXResourcesBuildPhase section */
 
+/* Begin PBXShellScriptBuildPhase section */
+		43DD77D824A54A470038F7AB /* ShellScript */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			outputFileListPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "if which swiftlint >/dev/null; then\n  swiftlint\nelse\n  echo \"warning: Recommended to install SwiftLint, download from https://github.com/realm/SwiftLint\"\nfi\n";
+		};
+		43DD77D924A54B070038F7AB /* ShellScript */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			outputFileListPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "if which swiftlint >/dev/null; then\n  swiftlint\nelse\n  echo \"warning: Recommended to install SwiftLint, download from https://github.com/realm/SwiftLint\"\nfi\n";
+		};
+/* End PBXShellScriptBuildPhase section */
+
 /* Begin PBXSourcesBuildPhase section */
 		43DD75D8249025250038F7AB /* Sources */ = {
 			isa = PBXSourcesBuildPhase;

smithy-swift/ClientRuntime/ClientRuntime/Networking/ClientError.swift

@@ -20,5 +20,5 @@ public enum ClientError: Error {
     case serializationFailed(String)
     case deserializationFailed(Error)
     case dataNotFound(String)
-    
+
 }

smithy-swift/ClientRuntime/ClientRuntime/Networking/DataNetworkOperation.swift

@@ -16,19 +16,18 @@
 import Foundation
 
 class DataNetworkOperation: NetworkOperation {
-    
+
     init(session: SessionProtocol, request: HttpRequest, completion: @escaping NetworkResult) {
         super.init()
         self.completion = completion
         do {
         let urlRequest = try request.toUrlRequest()
         self.task = session.dataTask(with: urlRequest)
-        }
-        catch {
+        } catch {
             completion(.failure(ClientError.serializationFailed("Serialization failed due to malformed url")))
         }
     }
-    
+
     override func receiveData(data: Data) {
         response?.content = .data(data)
         completion?(Result.success(response!))

smithy-swift/ClientRuntime/ClientRuntime/Networking/Endpoint.swift

@@ -21,7 +21,7 @@ public struct Endpoint {
     public let protocolType: ProtocolType?
     public let host: String
     public let port: Int?
-    
+
     public init(host: String, path: String, port: Int? = nil, queryItems: [URLQueryItem]? = nil, protocolType: ProtocolType? = .https) {
         self.host = host
         self.path = path
@@ -48,5 +48,3 @@ public extension Endpoint {
         return components.url
     }
 }
-
-

smithy-swift/ClientRuntime/ClientRuntime/Networking/Http/HttpClient.swift

@@ -16,22 +16,22 @@
 import Foundation
 
 public class HttpClient {
-    
+
     let session: SessionProtocol
     let operationQueue: OperationQueue
-    
+
     public init(config: HttpClientConfiguration) {
         self.operationQueue = config.operationQueue
         let delegate = SessionDelegate(operationQueue: config.operationQueue)
         self.session = URLSession(configuration: config.toUrlSessionConfig(), delegate: delegate, delegateQueue: config.operationQueue)
     }
-    
+
     init(session: SessionProtocol, config: HttpClientConfiguration) {
         self.session = session
         self.operationQueue = config.operationQueue
     }
-    
-    public func execute(request: HttpRequest,  completion: @escaping NetworkResult) -> StreamingProvider? {
+
+    public func execute(request: HttpRequest, completion: @escaping NetworkResult) -> StreamingProvider? {
         switch request.body {
         case .data, .file, .none :
             let operation = DataNetworkOperation(session: session, request: request, completion: completion)

smithy-swift/ClientRuntime/ClientRuntime/Networking/Http/HttpClientConfiguration.swift

@@ -19,11 +19,11 @@ public class HttpClientConfiguration {
     public var protocolType: ProtocolType
     //initialize with default headers
     public var defaultHeaders: HttpHeaders
-    
+
     public var operationQueue: OperationQueue
-    
+
     public var protocolClasses: [AnyClass]?
-    
+
     //add any other properties here you want to give the service operations control over to be mappted to the urlsessionconfig below
 
     public init(protocolType: ProtocolType = .https,
@@ -38,31 +38,34 @@ public class HttpClientConfiguration {
 }
 
 extension HttpClientConfiguration {
-    
+
     func toUrlSessionConfig () -> URLSessionConfiguration {
         let config = URLSessionConfiguration.default
         config.networkServiceType = .default
-        //essentially uses the network.framework to check network availablity automatically behind the scenes and wont call until network is available. do we want to set this to true for automatic reachability?
+        /* essentially uses the network.framework to check network availablity automatically
+           behind the scenes and wont call until network is available.
+           do we want to set this to true for automatic reachability?
+        */
         config.waitsForConnectivity = true
         config.allowsCellularAccess = true
         config.httpAdditionalHeaders = HttpHeaders().dictionary
         config.operationQueue = self.operationQueue
         config.requestCachePolicy = .reloadIgnoringLocalCacheData
-        
+
         if let protocolClasses = self.protocolClasses {
             config.protocolClasses = protocolClasses
         }
-        
+
         return config
-        
+
     }
 }
 
 extension URLSessionConfiguration {
-
-    static var _operationQueue:OperationQueue = OperationQueue()
-    
-    var operationQueue:OperationQueue {
+    // swiftlint:disable identifier_name
+    static var _operationQueue: OperationQueue = OperationQueue()
+
+    var operationQueue: OperationQueue {
         get {
             return URLSessionConfiguration._operationQueue
         }