Merge branch 'main' into feat/operation-context-params

AWSSDKSwiftCLI/Package.resolved

@@ -18,15 +18,6 @@
         "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",
@@ -44,24 +35,6 @@
         "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

@@ -12,7 +12,6 @@ let package = Package(
     ],
     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"),
     ],
@@ -34,7 +33,6 @@ let package = Package(
             dependencies: [
                 .product(name: "ArgumentParser", package: "swift-argument-parser"),
                 .product(name: "Logging", package: "swift-log"),
-                .product(name: "PackageDescription", package: "swift-package-manager"),
             ]
         ),
         .testTarget(

AWSSDKSwiftCLI/Sources/AWSCLIUtils/Process+Git.swift

@@ -6,7 +6,6 @@
 //
 
 import Foundation
-import PackageDescription
 import struct ArgumentParser.ExitCode
 
 public extension Process {

AWSSDKSwiftCLI/Sources/AWSCLIUtils/Process+Swift.swift

@@ -6,7 +6,6 @@
 //
 
 import Foundation
-import PackageDescription
 
 public extension Process {
     struct Swift {

AWSSDKSwiftCLI/Sources/AWSCLIUtils/Process+Utils.swift

@@ -49,6 +49,14 @@ public func _run(_ process: Process) throws {
 }
 
 public func _runReturningStdOut(_ process: Process) throws -> String? {
+    // 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
+    if let testRunner = ProcessRunner.testRunner {
+        try testRunner.run(process)
+        return nil
+    }
+    #endif
     let stdOut = Pipe()
     process.standardOutput = stdOut
 

AWSSDKSwiftCLI/Sources/AWSCLIUtils/Version+Utils.swift → AWSSDKSwiftCLI/Sources/AWSCLIUtils/Version.swift

@@ -7,15 +7,46 @@
 
 import Foundation
 import ArgumentParser
-import PackageDescription
 
-// MARK: - Decodable
+public struct Version: Equatable {
+    public let major: Int
+    public let minor: Int
+    public let patch: Int
+
+    private var versionString: String { "\(major).\(minor).\(patch)" }
+
+    init(_ major: Int, _ minor: Int, _ patch: Int) {
+        self.major = major
+        self.minor = minor
+        self.patch = patch
+    }
+
+    public init(_ value: String) throws {
+        let components = value.split(separator: ".")
+        guard components.count == 3 else {
+            throw Error("Version does not have three components")
+        }
+        guard let major = Int(components[0]), let minor = Int(components[1]), let patch = Int(components[2]) else {
+            throw Error("Version components are not all Int")
+        }
+        self.init(major, minor, patch)
+    }
+}
+
+extension Version: CustomStringConvertible {
+    public var description: String { versionString }
+}
+
+// MARK: - Codable
+
+extension Version: Codable {
 
-extension Version: Decodable {
     public init(from decoder: Decoder) throws {
-        let container = try decoder.singleValueContainer()
-        let value = try container.decode(String.self)
-        self.init(stringLiteral: value)
+        try self.init(try String(from: decoder))
+    }
+
+    public func encode(to encoder: any Encoder) throws {
+        try versionString.encode(to: encoder)
     }
 }
 
@@ -37,11 +68,7 @@ public extension Version {
 
         let normalizedVersionString = versionString.trimmingCharacters(in: .whitespacesAndNewlines)
 
-        guard let version = Version.init(normalizedVersionString) else {
-            throw Error("Failed to parse version from string \(normalizedVersionString)")
-        }
-
-        return version
+        return try Version(normalizedVersionString)
     }
 }
 
@@ -55,9 +82,7 @@ public extension Version {
        Version(
             self.major + 1,
             0,
-            0,
-            prereleaseIdentifiers: prereleaseIdentifiers,
-            buildMetadataIdentifiers: buildMetadataIdentifiers
+            0
         )
     }
 
@@ -68,9 +93,7 @@ public extension Version {
         Version(
             self.major,
             self.minor + 1,
-            0,
-            prereleaseIdentifiers: prereleaseIdentifiers,
-            buildMetadataIdentifiers: buildMetadataIdentifiers
+            0
         )
     }
 
@@ -81,17 +104,16 @@ public extension Version {
         Version(
             self.major,
             self.minor,
-            self.patch + 1,
-            prereleaseIdentifiers: prereleaseIdentifiers,
-            buildMetadataIdentifiers: buildMetadataIdentifiers
+            self.patch + 1
         )
     }
 }
 
 // MARK: - ExpressibleByArgument
 
 extension Version: ExpressibleByArgument {
+
     public init?(argument: String) {
-        self.init(argument)
+        try? self.init(argument)
     }
 }

AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Commands/AWSSDKSwiftCLI/Subcommands/GeneratePackageManifest.swift

@@ -7,7 +7,6 @@
 
 import ArgumentParser
 import Foundation
-import PackageDescription
 import AWSCLIUtils
 
 // MARK: - Command

AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Commands/AWSSDKSwiftCLI/Subcommands/PrepareRelease.swift

@@ -7,7 +7,6 @@
 
 import ArgumentParser
 import Foundation
-import PackageDescription
 import AWSCLIUtils
 
 // MARK: - Command
@@ -147,7 +146,7 @@ struct PrepareRelease {
     func createNewVersion(_ previousVersion: Version) throws -> Version {
         let newVersion = previousVersion.incrementingMinor()
         do {
-          try "\(newVersion)".write(toFile: "Package.version" , atomically: true, encoding: .utf8)
+            try "\(newVersion)".write(toFile: "Package.version" , atomically: true, encoding: .utf8)
         } catch {
           throw Error("Failed to write version \(newVersion) to Package.version")
         }

AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Commands/AWSSDKSwiftCLI/Subcommands/SyncClientRuntimeVersion.swift

@@ -7,7 +7,6 @@
 
 import ArgumentParser
 import Foundation
-import PackageDescription
 import AWSCLIUtils
 
 // MARK: - Command

AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Commands/AWSSDKSwiftCLI/Subcommands/TestAWSSDK.swift

@@ -8,7 +8,6 @@
 import Algorithms
 import ArgumentParser
 import Foundation
-import PackageDescription
 import AWSCLIUtils
 
 // MARK: - Command

AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Models/DocIndexBuilder.swift

@@ -6,7 +6,6 @@
 //
 
 import Foundation
-import PackageDescription
 import AWSCLIUtils
 
 /// Builds the contents of the package manifest file.

AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Models/PackageDependencies.swift

@@ -6,7 +6,7 @@
 //
 
 import Foundation
-import PackageDescription
+import AWSCLIUtils
 
 /// `PackageDependencies` is a representation of contents of the .plist stored at packageDependencies.plist
 struct PackageDependencies: Codable {

AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Models/PackageManifestBuilder.swift

@@ -6,7 +6,6 @@
 //
 
 import Foundation
-import PackageDescription
 import AWSCLIUtils
 
 /// Builds the contents of the package manifest file.

AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Models/ReleaseManifest.swift

@@ -6,7 +6,6 @@
 //
 
 import Foundation
-import PackageDescription
 
 struct ReleaseManifest: Codable {
     let name: String

AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Models/ReleaseNotesBuilder.swift

@@ -6,7 +6,6 @@
 //
 
 import Foundation
-import PackageDescription
 import AWSCLIUtils
 
 // Builds the release notes

AWSSDKSwiftCLI/Tests/AWSSDKSwiftCLITests/Commands/GeneratePackageManifestTests.swift

@@ -6,7 +6,7 @@
 //
 
 @testable import AWSSDKSwiftCLI
-import PackageDescription
+import AWSCLIUtils
 import XCTest
 
 class GeneratePackageManifestTests: CLITestCase {
@@ -16,10 +16,10 @@ class GeneratePackageManifestTests: CLITestCase {
     func createPackageDependencies(
         crtVersion: String,
         clientRuntimeVersion: String
-    ) {
-        let packageDependencies = PackageDependencies(
-            awsCRTSwiftVersion: .init(crtVersion)!,
-            clientRuntimeVersion: .init(clientRuntimeVersion)!
+    ) throws {
+        let packageDependencies = try PackageDependencies(
+            awsCRTSwiftVersion: .init(crtVersion),
+            clientRuntimeVersion: .init(clientRuntimeVersion)
         )
         try! packageDependencies.save()
     }
@@ -41,11 +41,11 @@ class GeneratePackageManifestTests: CLITestCase {
 
     // MARK: Golden Path
 
-    func testGoldenPath() {
+    func testGoldenPath() throws {
         let clientRuntimeVersion = "1.2.3"
         let crtVersion = "3.2.1"
         let services = ["EC2", "S3"]
-        createPackageDependencies(
+        try createPackageDependencies(
             crtVersion: crtVersion,
             clientRuntimeVersion: clientRuntimeVersion
         )
@@ -61,10 +61,10 @@ class GeneratePackageManifestTests: CLITestCase {
 
     // MARK: resolveVersions()
 
-    func testResolveVersionsRetrievesVersionsFromPackageDependencies() {
+    func testResolveVersionsRetrievesVersionsFromPackageDependencies() throws {
         let clientRuntimeVersion = "1.2.3"
         let crtVersion = "3.2.1"
-        createPackageDependencies(
+        try createPackageDependencies(
             crtVersion: crtVersion,
             clientRuntimeVersion: clientRuntimeVersion
         )
@@ -74,10 +74,10 @@ class GeneratePackageManifestTests: CLITestCase {
         XCTAssertEqual(versions.crt.description, crtVersion)
     }
 
-    func testResolveVersionsWithExplicitVersions() {
+    func testResolveVersionsWithExplicitVersions() throws {
         let clientRuntimeVersion = "1.2.3"
         let crtVersion = "3.2.1"
-        let subject = GeneratePackageManifest.mock(
+        let subject = try GeneratePackageManifest.mock(
             clientRuntimeVersion: .init(clientRuntimeVersion),
             crtVersion: .init(crtVersion)
         )