Merge branch 'main' into jbe/account_id_config

awslabs · Jan 15, 2025 · f4f96a6 · f4f96a6
2 parents 51db47a + 51366e3
commit f4f96a6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/AWSSDKSwiftCLI/Sources/AWSCLIUtils/Version.swift b/AWSSDKSwiftCLI/Sources/AWSCLIUtils/Version.swift
@@ -22,7 +22,7 @@ public struct Version: Equatable {
     }
 
     public init(_ value: String) throws {
-        let components = value.split(separator: ".")
+        let components = value.trimmingCharacters(in: .whitespacesAndNewlines).split(separator: ".")
         guard components.count == 3 else {
             throw Error("Version does not have three components")
         }

diff --git a/AWSSDKSwiftCLI/Tests/AWSSDKSwiftCLITests/Utils/VersionUtilsTests.swift b/AWSSDKSwiftCLI/Tests/AWSSDKSwiftCLITests/Utils/VersionUtilsTests.swift
@@ -10,7 +10,14 @@ import AWSCLIUtils
 import XCTest
 
 class VersionUtilsTests: XCTestCase {
-
+
+    func testIgnoresLeadingAndTrailingWhitespace() throws {
+        try XCTAssertEqual(
+            Version("\r\n\t 1.2.1\r\n\t "),
+            Version("1.2.1")
+        )
+    }
+
     func testIncrementingMajor() throws {
         try XCTAssertEqual(
             Version("1.2.1").incrementingMajor(),

diff --git a/Package.version.next b/Package.version.next
@@ -1 +1 @@
-1.1.0
+1.1.0