feat: Add Swift Package Registry tools and config (#1597)

Author: jbelkins

.gitignore

@@ -35,3 +35,7 @@ codegen/protocol-test-codegen/smithy-build.json
 
 # VS Code config files
 .vscode/
+
+# Allow the AWSSDKSwiftCLI Package.resolved
+# while excluding all other Package.resolved files
+!/AWSSDKSwiftCLI/Package.resolved

.swiftlint.yml

@@ -1,5 +1,10 @@
 included:
-  - Sources/Core
+  - Sources/Core/AWSClientRuntime/Sources
+  - Sources/Core/AWSSDKChecksums/Sources
+  - Sources/Core/AWSSDKCommon/Sources
+  - Sources/Core/AWSSDKEventStreamsAuth/Sources
+  - Sources/Core/AWSSDKHTTPAuth/Sources
+  - Sources/Core/AWSSDKIdentity/Sources
 
 analyzer_rules:
   - unused_import

AWSSDKSwiftCLI/Package.resolved

@@ -0,0 +1,95 @@
+{
+  "pins" : [
+    {
+      "identity" : "aws-crt-swift",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/awslabs/aws-crt-swift",
+      "state" : {
+        "revision" : "b6380f683b31072d77b601c88674461c11bcad5a",
+        "version" : "0.30.0"
+      }
+    },
+    {
+      "identity" : "aws-sdk-swift",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/awslabs/aws-sdk-swift",
+      "state" : {
+        "revision" : "3c20e0be8c8246de8b8e04372404ef1f90be71b6",
+        "version" : "0.46.0"
+      }
+    },
+    {
+      "identity" : "smithy-swift",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/smithy-lang/smithy-swift",
+      "state" : {
+        "revision" : "b2322a067f85c230f17c80be8a67dd543454b081",
+        "version" : "0.51.0"
+      }
+    },
+    {
+      "identity" : "swift-algorithms",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-algorithms",
+      "state" : {
+        "revision" : "f6919dfc309e7f1b56224378b11e28bab5bccc42",
+        "version" : "1.2.0"
+      }
+    },
+    {
+      "identity" : "swift-argument-parser",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-argument-parser",
+      "state" : {
+        "revision" : "46989693916f56d1186bd59ac15124caef896560",
+        "version" : "1.3.1"
+      }
+    },
+    {
+      "identity" : "swift-llbuild",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-llbuild.git",
+      "state" : {
+        "revision" : "fb7ebf0b06c0d7c45ca8e18b3371424503a38b5c",
+        "version" : "0.3.0"
+      }
+    },
+    {
+      "identity" : "swift-log",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-log.git",
+      "state" : {
+        "revision" : "e97a6fcb1ab07462881ac165fdbb37f067e205d5",
+        "version" : "1.5.4"
+      }
+    },
+    {
+      "identity" : "swift-numerics",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-numerics.git",
+      "state" : {
+        "revision" : "0a5bc04095a675662cf24757cc0640aa2204253b",
+        "version" : "1.0.2"
+      }
+    },
+    {
+      "identity" : "swift-package-manager",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-package-manager",
+      "state" : {
+        "revision" : "f5ea3972d7d6c574e8bb16a19b2a7bca98ea131b",
+        "version" : "0.6.0"
+      }
+    },
+    {
+      "identity" : "swift-tools-support-core",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-tools-support-core.git",
+      "state" : {
+        "revision" : "98a5916a811fcaaed770f1ed812e9405be762945",
+        "version" : "0.1.0"
+      }
+    }
+  ],
+  "version" : 2
+}

AWSSDKSwiftCLI/Package.swift

@@ -5,28 +5,61 @@ import PackageDescription
 let package = Package(
     name: "AWSSDKSwiftCLI",
     platforms: [
-        .macOS(.v10_15)
+        .macOS(.v13)
     ],
     dependencies: [
         .package(url: "https://github.com/apple/swift-argument-parser", from: "1.2.0"),
         .package(url: "https://github.com/apple/swift-package-manager", from: "0.6.0"),
         .package(url: "https://github.com/apple/swift-algorithms", from: "1.0.0"),
         .package(url: "https://github.com/apple/swift-log.git", from: "1.0.0"),
+        .package(url: "https://github.com/awslabs/aws-sdk-swift", from: "0.46.0"),
     ],
     targets: [
         .executableTarget(
             name: "AWSSDKSwiftCLI",
             dependencies: [
+                "AWSCLIUtils",
                 .product(name: "ArgumentParser", package: "swift-argument-parser"),
-                .product(name: "PackageDescription", package: "swift-package-manager"),
                 .product(name: "Algorithms", package: "swift-algorithms"),
-                .product(name: "Logging", package: "swift-log"),
             ],
             resources: [
                 .process("Resources/Package.Base.swift"),
                 .process("Resources/DocIndex.Base.md")
             ]
         ),
+        .executableTarget(
+            name: "spr-publish",
+            dependencies: [
+                "SPR",
+                "AWSCLIUtils",
+                .product(name: "ArgumentParser", package: "swift-argument-parser"),
+            ]
+        ),
+        .executableTarget(
+            name: "spr-multi-publish",
+            dependencies: [
+                "SPR",
+                "AWSCLIUtils",
+                "spr-publish",
+            ]
+        ),
+        .target(
+            name: "SPR",
+            dependencies: [
+                "AWSCLIUtils",
+                .product(name: "ArgumentParser", package: "swift-argument-parser"),
+                .product(name: "AWSS3", package: "aws-sdk-swift"),
+                .product(name: "AWSCloudFront", package: "aws-sdk-swift"),
+            ]
+        ),
+        .target(
+            name: "AWSCLIUtils",
+            dependencies: [
+                .product(name: "ArgumentParser", package: "swift-argument-parser"),
+                .product(name: "Logging", package: "swift-log"),
+                .product(name: "PackageDescription", package: "swift-package-manager"),
+            ]
+        ),
         .testTarget(
             name: "AWSSDKSwiftCLITests",
             dependencies: ["AWSSDKSwiftCLI"]

AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Models/Error.swift AWSSDKSwiftCLI/Sources/AWSCLIUtils/Error.swift

@@ -7,11 +7,11 @@
 
 import Foundation
 
-struct Error: LocalizedError {
-    var message: String
-    var errorDescription: String? { message }
-    
-    init(_ message: String) {
+public struct Error: LocalizedError {
+    public var message: String
+    public var errorDescription: String? { message }
+
+    public init(_ message: String) {
         self.message = message
     }
 }

AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Utils/FileManager+Utils.swift AWSSDKSwiftCLI/Sources/AWSCLIUtils/FileManager+Utils.swift

@@ -7,7 +7,7 @@
 
 import Foundation
 
-extension FileManager {
+public extension FileManager {
     /// Changes the working directory to the provided path
     func changeWorkingDirectory(_ path: String) throws {
         log("Changing working directory to: \(path)")

AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Models/Logger.swift AWSSDKSwiftCLI/Sources/AWSCLIUtils/Logger.swift

@@ -10,7 +10,11 @@ import Logging
 struct Logger {
     static let standard = Logging.Logger(
         label: "com.aws.sdk.swift.cli",
-        factory: { StreamLogHandler.standardOutput(label: $0) }
+        factory: {
+            var logger = StreamLogHandler.standardOutput(label: $0)
+            logger.logLevel = .info
+            return logger
+        }
     )
 }
 

AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Utils/Process+Git.swift AWSSDKSwiftCLI/Sources/AWSCLIUtils/Process+Git.swift

@@ -9,7 +9,7 @@ import Foundation
 import PackageDescription
 import struct ArgumentParser.ExitCode
 
-extension Process {
+public extension Process {
     /// A struct to create processes for executing git commands.
     struct Git {
         /// Returns a process for executing git commands.
@@ -18,31 +18,31 @@ extension Process {
         }
 
         /// Returns a process for executing `git status`
-        func status() -> Process {
+        public func status() -> Process {
             gitProcess(["status"])
         }
 
         /// Returns a process for executing `git diff <a>..<b> --quiet`
         /// This is used for determining if `<a>` is different from `<b>` and therefore
-        func diff(_ a: String, _ b: String) -> Process {
+        public func diff(_ a: String, _ b: String) -> Process {
             gitProcess(["diff", "\(a)..\(b)", "--quiet"])
         }
 
         /// Returns a process for executing `git add <args>`
         /// This is used for staging specific files.
-        func add(_ files: [String]) -> Process {
+        public func add(_ files: [String]) -> Process {
             gitProcess(["add"] + files)
         }
 
         /// Returns a process for executing `git commit -m <message>`
         /// This is used for committing changes with the provided message
-        func commit(_ message: String) -> Process {
+        public func commit(_ message: String) -> Process {
             gitProcess(["commit", "-m", message])
         }
 
         /// Returns a process for executing `git tag -a <version> -m <message>`
         /// This is used for creating a tag with the provided version and message.
-        func tag(_ version: Version, _ message: String) -> Process {
+        public func tag(_ version: Version, _ message: String) -> Process {
             gitProcess(["tag", "-a", "\(version)", "-m", message])
         }
 
@@ -69,7 +69,7 @@ extension Process {
     static var git: Git { Git() }
 }
 
-extension Process.Git {
+public extension Process.Git {
     /// Returns true if the provided commits/branches/trees are different, otherwise returns false
     func diffHasChanges(_ a: String, _ b: String) throws -> Bool {
         let task = diff(a, b)

AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Utils/Process+Swift.swift AWSSDKSwiftCLI/Sources/AWSCLIUtils/Process+Swift.swift

@@ -8,15 +8,15 @@
 import Foundation
 import PackageDescription
 
-extension Process {
+public extension Process {
     struct Swift {
         /// Returns a process for executing swift commands.
         private func swiftProcess(_ args: [String]) -> Process {
             Process(["swift"] + args)
         }
 
         /// Returns a process for executing `swift test`
-        func test() -> Process {
+        public func test() -> Process {
             swiftProcess(["test"])
         }
     }

AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Utils/Process+Utils.swift AWSSDKSwiftCLI/Sources/AWSCLIUtils/Process+Utils.swift

@@ -8,7 +8,7 @@
 import Foundation
 import ArgumentParser
 
-extension Process {
+public extension Process {
     /// Creates a process using `/usr/bin/env` as the executable
     /// This makes it easy to create a process  for any command, as long as the corresponding executable exists in the PATH.
     ///
@@ -29,14 +29,14 @@ extension Process {
 
     /// Returns the executable and arguments combined as a string
     var commandString: String {
-        let items = [executableURL?.path] + (arguments ?? [])
+        let items = [urlPath(executableURL)] + (arguments ?? [])
         return items
             .compactMap { $0 }
             .joined(separator: " ")
     }
 }
 
-func _run(_ process: Process) throws {
+public func _run(_ process: Process) throws {
     // If debug and we have a non-nil test runner, then use that
     // This allows developers to intercept processes when they run to assert that it is the expected process
     #if DEBUG
@@ -48,30 +48,31 @@ func _run(_ process: Process) throws {
     try ProcessRunner.standard.run(process)
 }
 
-func _runReturningStdOut(_ process: Process) throws -> String? {
+public func _runReturningStdOut(_ process: Process) throws -> String? {
     let stdOut = Pipe()
     process.standardOutput = stdOut
 
-    var data = Data()
-    stdOut.fileHandleForReading.readabilityHandler = { handle in
-        data += handle.availableData
-    }
-    
     try _run(process)
     process.waitUntilExit()
 
+    let data = try stdOut.fileHandleForReading.readToEnd() ?? Data()
     return String(data: data, encoding: .utf8)
 }
 
 /// A simple struct that runs a process
-struct ProcessRunner {
-    let run: (Process) throws -> Void
+public struct ProcessRunner {
+
+    public init(_ run: @escaping (Process) throws -> Void) {
+        self.run = run
+    }
+
+    public let run: (Process) throws -> Void
 
     /// Creates the standard runner to be used by the release version of this CLI
     ///
     /// Runs the process and prints out the process's full command.
-    static let standard = ProcessRunner { process in
-        log("Running process: \(process.commandString)")
+    public static let standard = ProcessRunner { process in
+        log(level: .debug, "Running process: \(process.commandString)")
         try process.run()
         process.waitUntilExit()
         let exitCode = ExitCode(process.terminationStatus)
@@ -82,6 +83,6 @@ struct ProcessRunner {
 
     #if DEBUG
     // Set this to a non-nil value in tests to intercept when a process is run
-    static var testRunner: ProcessRunner? = nil
+    public static var testRunner: ProcessRunner? = nil
     #endif
 }

AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Utils/String+Utils.swift AWSSDKSwiftCLI/Sources/AWSCLIUtils/String+Utils.swift

@@ -7,7 +7,7 @@
 
 import Foundation
 
-extension String {
+public extension String {
     /// Returns the receiver wrapped in the provided string
     ///
     /// ```swift
@@ -37,3 +37,9 @@ extension String {
     /// Returns the string that represents a newline
     static var newline: Self { "\n" }
 }
+
+public func printError(_ items: Any..., separator: String = " ", terminator: String = "\n") throws {
+    var s = ""
+    print(items, separator: separator, terminator: terminator, to: &s)
+    try FileHandle.standardError.write(contentsOf: Data(s.utf8))
+}