chore: Opt-in service client tests

.github/workflows/continuous-integration.yml

@@ -8,6 +8,7 @@ on:
 
 env:
   AWS_SWIFT_SDK_USE_LOCAL_DEPS: 1
+  AWS_SWIFT_SDK_ENABLE_SERVICE_TESTS: 1
 
 jobs:
   apple:

AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Models/PackageManifestBuilder.swift

@@ -146,19 +146,29 @@ struct PackageManifestBuilder {
     /// and calls the `addServiceTarget` for each item.
     private func buildServiceTargets() -> String {
         guard !services.isEmpty else {
-            return "let serviceTargets: [String: [Target.Dependency]] = [:]"
+            return "let serviceClientData: [ServiceClientData] = []"
         }
         var lines: [String] = []
-        lines += ["let serviceTargets: [String: [Target.Dependency]] = ["]
-        lines += services.map {
-            let jsonFilePath = "Sources/Services/\($0.name)/Dependencies.json"
-            let dependencies = clientDependencies(service: $0, jsonFilePath: jsonFilePath)
-            return "    \($0.name.wrappedInQuotes()): \(dependencies),"
-        }
+        lines += ["let serviceClientData: [ServiceClientData] = ["]
+        lines += services.flatMap { serviceTargetData(name: $0.name, internal: false) }
         lines += ["]"]
         return lines.joined(separator: .newline)
     }
 
+    private func serviceTargetData(name: String, internal: Bool) -> [String] {
+        let jsonFilePath = `internal` ?
+            "Sources/Core/AWSSDKIdentity/InternalClients/Internal\(name)/Dependencies.json" :
+            "Sources/Services/\(name)/Dependencies.json"
+        let dependencies = clientDependencies(service: name, jsonFilePath: jsonFilePath)
+        return [
+            "    .init(",
+            "        \(name.wrappedInQuotes()),",
+            "        \(dependencies.0),",
+            "        \(dependencies.1)",
+            "    )\(`internal` ? "" : ",")"
+        ]
+    }
+
     private func buildInternalAWSSTSDependencies() -> String {
         buildInternalClientDependencies(name: "AWSSTS")
     }
@@ -176,17 +186,25 @@ struct PackageManifestBuilder {
     }
 
     private func buildInternalClientDependencies(name: String) -> String {
-        let jsonFilePath = "Sources/Core/AWSSDKIdentity/InternalClients/Internal\(name)/Dependencies.json"
-        let service = Service(name: name)
-        let dependencies = clientDependencies(service: service, jsonFilePath: jsonFilePath)
-        return "let internal\(name)Dependencies: [Target.Dependency] = \(dependencies)"
+        var lines = ["private let internal\(name)Data: ServiceClientData ="]
+        lines.append(contentsOf: serviceTargetData(name: name, internal: true))
+        _ = lines[lines.indices.last!].dropLast() // get rid of the trailing comma
+        return lines.joined(separator: "\n")
     }
 
-    private func clientDependencies(service: Service, jsonFilePath: String) -> String {
-        let jsonFileData = FileManager.default.contents(atPath: jsonFilePath) ?? Data("[]".utf8)
-        let dependencies = try! JSONDecoder().decode([String].self, from: jsonFileData)
-            .filter { $0 != "SmithyTestUtil" }  // links to test files only
-        return "[" + dependencies.map { ".\($0)" }.joined(separator: ", ") + "]"
+    private func clientDependencies(service: String, jsonFilePath: String) -> (String, String) {
+
+        struct ServiceClientInfo: Decodable {
+            let modelPath: String
+            let dependencies: [String]
+        }
+
+        print("CWD: \(FileManager.default.currentDirectoryPath)")
+        print("jsonFilePath: \(jsonFilePath)")
+        let jsonFileData = FileManager.default.contents(atPath: jsonFilePath)
+        let info = try! JSONDecoder().decode(ServiceClientInfo.self, from: jsonFileData!)
+        let modelFileName = info.modelPath
+        return (modelFileName.wrappedInQuotes(), "[" + info.dependencies.map { ".\($0)" }.joined(separator: ", ") + "]")
     }
 }
 

AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Resources/Package.Base.txt

@@ -54,14 +54,14 @@ let package = Package(
     ],
     products:
         runtimeProducts +
-        serviceTargets.map(productForService(_:_:)),
+        serviceProducts,
     dependencies:
-        [smithySwiftDependency, crtDependency, doccDependencyOrNil].compactMap { $0 },
+        dependencies,
     targets:
         runtimeTargets +
         runtimeTestTargets +
-        serviceTargets.map(target(_:_:)) +
-        serviceTargets.map(unitTestTarget(_:_:))
+        serviceTargets +
+        serviceTestTargets
 )
 
 // MARK: Products
@@ -78,12 +78,20 @@ private var runtimeProducts: [Product] {
     ].map { .library(name: $0, targets: [$0]) }
 }
 
-private func productForService(_ service: String, _ dependencies: [Target.Dependency]) -> Product {
-    .library(name: service, targets: [service])
+private var serviceProducts: [Product] {
+    serviceClientData.map(productForService(_:))
+}
+
+private func productForService(_ service: ServiceClientData) -> Product {
+    .library(name: service.name, targets: [service.name])
 }
 
 // MARK: Dependencies
 
+private var dependencies: [Package.Dependency] {
+    [smithySwiftDependency, crtDependency, doccDependencyOrNil].compactMap { $0 }
+}
+
 private var smithySwiftDependency: Package.Dependency {
     let previewPath = "./smithy-swift"
     let developmentPath = "../smithy-swift"
@@ -197,22 +205,22 @@ private var runtimeTargets: [Target] {
         ),
         .target(
             name: "InternalAWSSTS",
-            dependencies: internalAWSSTSDependencies,
+            dependencies: internalAWSSTSData.dependencies,
             path: "Sources/Core/AWSSDKIdentity/InternalClients/InternalAWSSTS/Sources/InternalAWSSTS"
         ),
         .target(
             name: "InternalAWSSSO",
-            dependencies: internalAWSSSODependencies,
+            dependencies: internalAWSSSOData.dependencies,
             path: "Sources/Core/AWSSDKIdentity/InternalClients/InternalAWSSSO/Sources/InternalAWSSSO"
         ),
         .target(
             name: "InternalAWSSSOOIDC",
-            dependencies: internalAWSSSOOIDCDependencies,
+            dependencies: internalAWSSSOOIDCData.dependencies,
             path: "Sources/Core/AWSSDKIdentity/InternalClients/InternalAWSSSOOIDC/Sources/InternalAWSSSOOIDC"
         ),
         .target(
             name: "InternalAWSCognitoIdentity",
-            dependencies: internalAWSCognitoIdentityDependencies,
+            dependencies: internalAWSCognitoIdentityData.dependencies,
             path: "Sources/Core/AWSSDKIdentity/InternalClients/InternalAWSCognitoIdentity/Sources/InternalAWSCognitoIdentity"
         ),
         .target(
@@ -282,24 +290,46 @@ private var runtimeTestTargets: [Target] {
     ]
 }
 
-private func target(_ service: String, _ dependencies: [Target.Dependency]) -> Target {
+private var serviceTargets: [Target] {
+    serviceClientData.map(target(_:))
+}
+
+private func target(_ service: ServiceClientData) -> Target {
     .target(
-        name: service,
-        dependencies: dependencies,
-        path: "Sources/Services/\(service)/Sources/\(service)"
+        name: service.name,
+        dependencies: service.dependencies,
+        path: "Sources/Services/\(service.name)/Sources/\(service.name)"
     )
 }
 
-private func unitTestTarget(_ service: String, _ dependencies: [Target.Dependency]) -> Target {
-    let testName = "\(service)Tests"
+private var serviceTestTargets: [Target] {
+    guard ProcessInfo.processInfo.environment["AWS_SWIFT_SDK_ENABLE_SERVICE_TESTS"] != nil else { return [] }
+    return serviceClientData.map(unitTestTarget(_:))
+}
+
+private func unitTestTarget(_ service: ServiceClientData) -> Target {
+    let testName = "\(service.name)Tests"
+    let modelName = URL(fileURLWithPath: service.modelPath).lastPathComponent
     return .testTarget(
         name: "\(testName)",
         dependencies: [
-            .byName(name: service),
+            .byName(name: service.name),
             .ClientRuntime,
             .AWSClientRuntime,
             .SmithyTestUtil,
         ],
-        path: "Sources/Services/\(service)/Tests/\(testName)"
+        path: "codegen/sdk-codegen/build/smithyprojections/sdk-codegen/\(modelName)/swift-codegen/Tests/\(testName)"
     )
 }
+
+struct ServiceClientData {
+    let name: String
+    let modelPath: String
+    let dependencies: [Target.Dependency]
+
+    init(_ name: String, _ modelPath: String, _ dependencies: [Target.Dependency]) {
+        self.name = name
+        self.modelPath = modelPath
+        self.dependencies = dependencies
+    }
+}

AWSSDKSwiftCLI/Tests/AWSSDKSwiftCLITests/Models/PackageManifestBuilderTests.swift

@@ -40,7 +40,7 @@ class PackageManifestBuilderTests: XCTestCase {
         let subject = try PackageManifestBuilder(
             clientRuntimeVersion: .init("1.2.3"),
             crtVersion: .init("4.5.6"),
-            services: ["A","B","C","D","E"].map { PackageManifestBuilder.Service(name: $0) },
+            services: ["A","B","C","D","E"].map { .init(name: $0) },
             excludeRuntimeTests: false,
             previewBuild: false,
             prefixContents: { "<contents of prefix>" },