pass api keys as env vars

DanielSincere · May 20, 2022 · 534a99c · 534a99c
1 parent b1cbcc0
commit 534a99c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/Package.swift b/Package.swift
@@ -21,6 +21,6 @@ let package = Package(
             dependencies: ["Sh"]),
         .testTarget(
             name: "ShXcrunTests",
-            dependencies: ["ShXcrun"]),
+            dependencies: ["ShXcrun", "Sh"]),
     ]
 )
diff --git a/Sources/ShXcrun/Altool/Altool.uploadApp.swift b/Sources/ShXcrun/Altool/Altool.uploadApp.swift
@@ -4,18 +4,11 @@ import Foundation
 extension Altool {
 
   public func uploadApp(_ sink: Sink = .terminal, file: String, platform: Platform, transport: [Transport]? = nil) throws {
-    let command =
-    """
-    xcrun altool \
-    \(credential.serialized) \
-    --upload-app \
-    -f \(file) \
-    -t \(platform) \
-    \(transport.serialized)
-    """
-
+
+    let cred = credential.serialized
+    let trans = transport.serialized
     try sh(sink,
-           command,
+           "xcrun altool \(cred) -upload-app -f \(file) -t \(platform) \(trans)",
            environment: self.credential.environment)
   }
 }
diff --git a/Sources/ShXcrun/Altool/Credential/AltoolCredential.api(keyID,issuerID).swift b/Sources/ShXcrun/Altool/Credential/AltoolCredential.api(keyID,issuerID).swift
@@ -10,6 +10,13 @@ public struct ApiKeyCredential: AltoolCredential {
   let apiIssuerID: String
 
   public var serialized: String {
-    "--apiKey \(apiKeyID) --apiIssuer \(apiIssuerID)"
+    "--apiKey $SH_XCRUN_ALTOOL_API_KEY_ID --apiIssuer $SH_XCRUN_ALTOOL_API_ISSUER_ID"
+  }
+
+  public var environment: [String: String] {
+    [
+      "SH_XCRUN_ALTOOL_API_KEY_ID": apiKeyID,
+      "SH_XCRUN_ALTOOL_API_ISSUER_ID": apiIssuerID,
+    ]
   }
 }