Catch feature branch up to main (#2046)

Author: dayaffe

.github/workflows/continuous-integration.yml

@@ -25,7 +25,7 @@ jobs:
           - Xcode_26.0
         destination:
           - 'platform=iOS Simulator,OS=17.2,name=iPhone 15'
-          - 'platform=iOS Simulator,OS=26.0,name=iPhone 17'
+          - 'platform=iOS Simulator,OS=26.0.1,name=iPhone 17'
           - 'platform=tvOS Simulator,OS=17.2,name=Apple TV 4K (3rd generation) (at 1080p)'
           - 'platform=tvOS Simulator,OS=26.0,name=Apple TV 4K (3rd generation) (at 1080p)'
           - 'platform=visionOS Simulator,OS=1.0,name=Apple Vision Pro'
@@ -48,7 +48,7 @@ jobs:
           # Don't run new simulators with old Xcode
           - destination: 'platform=tvOS Simulator,OS=26.0,name=Apple TV 4K (3rd generation) (at 1080p)'
             xcode: Xcode_15.2
-          - destination: 'platform=iOS Simulator,OS=26.0,name=iPhone 17'
+          - destination: 'platform=iOS Simulator,OS=26.0.1,name=iPhone 17'
             xcode: Xcode_15.2
           - destination: 'platform=visionOS Simulator,OS=26.0,name=Apple Vision Pro'
             xcode: Xcode_15.2
@@ -91,6 +91,8 @@ jobs:
           java-version: 17
       - name: Tools Versions
         run: ./aws-sdk-swift/scripts/ci_steps/log_tool_versions.sh
+      - name: List all sims installed
+        run: xcrun simctl list
       - name: Run CLI Unit Tests
         if: ${{ matrix.destination == 'platform=macOS' }}
         run: |
@@ -123,18 +125,16 @@ jobs:
   linux:
     if: github.repository == 'awslabs/aws-sdk-swift' || github.event_name == 'pull_request'
     runs-on: ${{ matrix.runner }}
-    container: swift:${{ matrix.version }}-${{ matrix.os }}
+    container: swift:${{ matrix.swift }}
     strategy:
       fail-fast: false
       matrix:
         runner:
           - ubuntu-24.04
           - ubuntu-24.04-arm
-        os:
-          - jammy
-        version:
-          - "5.9"
-          - "6.2"
+        swift:
+          - "5.9-jammy"
+          - "6.2-noble"
     env:
       ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
     steps:
@@ -163,10 +163,10 @@ jobs:
           path: |
             ~/Library/Caches/org.swift.swiftpm
             ~/.cache/org.swift.swiftpm
-          key: 1-${{ runner.os }}-swift-${{ matrix.version }}-spm-${{ hashFiles('Package.swift', 'AWSSDKSwiftCLI/Package.swift') }}
+          key: 1-${{ runner.os }}-swift-${{ matrix.swift }}-spm-${{ hashFiles('Package.swift', 'AWSSDKSwiftCLI/Package.swift') }}
           restore-keys: |
-            1-${{ runner.os }}-swift-${{ matrix.version }}-spm-${{ hashFiles('Package.swift', 'AWSSDKSwiftCLI/Package.swift') }}
-            1-${{ runner.os }}-swift-${{ matrix.version }}-spm-
+            1-${{ runner.os }}-swift-${{ matrix.swift }}-spm-${{ hashFiles('Package.swift', 'AWSSDKSwiftCLI/Package.swift') }}
+            1-${{ runner.os }}-swift-${{ matrix.swift }}-spm-
       - name: Setup Java
         uses: actions/setup-java@v4
         with:

.github/workflows/integration-test.yml

@@ -30,7 +30,7 @@ jobs:
           - Xcode_26.0
         destination:
           - 'platform=iOS Simulator,OS=17.2,name=iPhone 15'
-          - 'platform=iOS Simulator,OS=26.0,name=iPhone 17'
+          - 'platform=iOS Simulator,OS=26.0.1,name=iPhone 17'
           - 'platform=tvOS Simulator,OS=17.2,name=Apple TV 4K (3rd generation) (at 1080p)'
           - 'platform=tvOS Simulator,OS=26.0,name=Apple TV 4K (3rd generation) (at 1080p)'
           - 'platform=visionOS Simulator,OS=1.0,name=Apple Vision Pro'
@@ -53,7 +53,7 @@ jobs:
           # Don't run new simulators with old Xcode
           - destination: 'platform=tvOS Simulator,OS=26.0,name=Apple TV 4K (3rd generation) (at 1080p)'
             xcode: Xcode_15.2
-          - destination: 'platform=iOS Simulator,OS=26.0,name=iPhone 17'
+          - destination: 'platform=iOS Simulator,OS=26.0.1,name=iPhone 17'
             xcode: Xcode_15.2
           - destination: 'platform=visionOS Simulator,OS=26.0,name=Apple Vision Pro'
             xcode: Xcode_15.2
@@ -101,6 +101,8 @@ jobs:
           java-version: 17
       - name: Tools Versions
         run: ./aws-sdk-swift/scripts/ci_steps/log_tool_versions.sh
+      - name: List all sims installed
+        run: xcrun simctl list
       - name: Add Credentials to Test Plan
         run: |
           cd aws-sdk-swift
@@ -132,18 +134,16 @@ jobs:
     # Details on why AL2 isn't included: https://github.com/awslabs/aws-sdk-swift/pull/1833
     if: github.repository == 'awslabs/aws-sdk-swift' || github.event_name == 'pull_request'
     runs-on: ${{ matrix.runner }}
-    container: swift:${{ matrix.version }}-${{ matrix.os }}
+    container: swift:${{ matrix.swift }}
     strategy:
       fail-fast: false
       matrix:
         runner:
           - ubuntu-24.04
           - ubuntu-24.04-arm
-        os:
-          - jammy
-        version:
-          - "5.9"
-          - "6.2"
+        swift:
+          - "5.9-jammy"
+          - "6.2-noble"
     env:
       ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
     steps:
@@ -179,10 +179,10 @@ jobs:
           path: |
             ~/Library/Caches/org.swift.swiftpm
             ~/.cache/org.swift.swiftpm
-          key: 1-${{ runner.os }}-swift-${{ matrix.version }}-spm-${{ hashFiles('Package.swift', 'AWSSDKSwiftCLI/Package.swift') }}
+          key: 1-${{ runner.os }}-swift-${{ matrix.swift }}-spm-${{ hashFiles('Package.swift', 'AWSSDKSwiftCLI/Package.swift') }}
           restore-keys: |
-            1-${{ runner.os }}-swift-${{ matrix.version }}-spm-${{ hashFiles('Package.swift', 'AWSSDKSwiftCLI/Package.swift') }}
-            1-${{ runner.os }}-swift-${{ matrix.version }}-spm-
+            1-${{ runner.os }}-swift-${{ matrix.swift }}-spm-${{ hashFiles('Package.swift', 'AWSSDKSwiftCLI/Package.swift') }}
+            1-${{ runner.os }}-swift-${{ matrix.swift }}-spm-
       - name: Setup Java
         uses: actions/setup-java@v4
         with:

AWSSDKSwiftCLI/Package.swift

@@ -39,7 +39,8 @@ let package = Package(
         ),
         .testTarget(
             name: "AWSSDKSwiftCLITests",
-            dependencies: ["AWSSDKSwiftCLI"]
+            dependencies: ["AWSSDKSwiftCLI"],
+            resources: [.process("Resources")]
         )
     ]
 )

AWSSDKSwiftCLI/Sources/AWSCLIUtils/FileManager+Utils.swift

@@ -69,6 +69,7 @@ public extension FileManager {
             .sorted()
             .filter { $0 != "AWSSDKForSwift" } // Ignore documentation module
             .filter { $0 != "SDKForSwift" } // Ignore new documentation module
+            .filter { $0 != "AWSSDKDynamic" } // Internal module, do not document
             .filter { !$0.hasPrefix(".") }
     }
 

AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Commands/AWSSDKSwiftCLI/AWSSDKSwiftCLI.swift

@@ -17,7 +17,9 @@ struct AWSSDKSwiftCLI: ParsableCommand {
             PrepareReleaseCommand.self,
             SyncClientRuntimeVersionCommand.self,
             GenerateDocIndexCommand.self,
-            GenerateSmokeTestsPackageManifestCommand.self
+            GenerateSmokeTestsPackageManifestCommand.self,
+            GeneratePartitionsCommand.self,
+            GeneratePackageVersionCommand.self,
         ]
     )
 }

AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Commands/AWSSDKSwiftCLI/Subcommands/GeneratePackageVersion.swift

@@ -0,0 +1,27 @@
+//
+// Copyright Amazon.com Inc. or its affiliates.
+// All Rights Reserved.
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+
+import ArgumentParser
+import Foundation
+import AWSCLIUtils
+
+struct GeneratePackageVersionCommand: ParsableCommand {
+
+    static var configuration = CommandConfiguration(
+        commandName: "generate-package-version",
+        abstract: "Generates the PackageVersion.swift file for the AWSSDKDynamic target."
+    )
+
+    @Argument(help: "The path to the aws-sdk-swift repository")
+    var repoPath: String
+
+    func run() throws {
+        try PackageVersionBuilder(
+            repoPath: repoPath
+        ).generatePackageVersionFile()
+    }
+}

AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Commands/AWSSDKSwiftCLI/Subcommands/GeneratePartitions.swift

@@ -0,0 +1,27 @@
+//
+// Copyright Amazon.com Inc. or its affiliates.
+// All Rights Reserved.
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+
+import ArgumentParser
+import Foundation
+import AWSCLIUtils
+
+struct GeneratePartitionsCommand: ParsableCommand {
+
+    static var configuration = CommandConfiguration(
+        commandName: "generate-partitions",
+        abstract: "Generates the Partitions.swift file for the AWSSDKDynamic target."
+    )
+
+    @Argument(help: "The path to the aws-sdk-swift repository")
+    var repoPath: String
+
+    func run() throws {
+        try PartitionsBuilder(
+            repoPath: repoPath
+        ).generatePartitionsFile()
+    }
+}

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

@@ -208,8 +208,10 @@ struct PrepareRelease {
                 "packageDependencies.plist",
                 "Sources/Services",
                 "Sources/Core/AWSSDKForSwift/Documentation.docc/AWSSDKForSwift.md",
-                "Sources/Core/AWSSDKPartitions/Sources/AWSSDKPartitions/Partitions.swift",
+                "Sources/Core/SDKForSwift/Documentation.docc/SDKForSwift.md",
                 "Sources/Core/AWSSDKIdentity/",
+                "Sources/Core/AWSSDKDynamic/Sources/AWSSDKDynamic/PackageVersion.swift",
+                "Sources/Core/AWSSDKDynamic/Sources/AWSSDKDynamic/Partitions.swift",
             ]
         case .smithySwift:
             files = ["Package.version", "Package.version.next"]

AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Models/PackageVersionBuilder.swift

@@ -0,0 +1,63 @@
+//
+// Copyright Amazon.com Inc. or its affiliates.
+// All Rights Reserved.
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+
+import Foundation
+import struct AWSCLIUtils.Error
+import struct AWSCLIUtils.Version
+
+struct PackageVersionBuilder {
+    let packageVersionFileURL: URL
+    let packageVersionSwiftFileURL: URL
+
+    // MARK: - init
+
+    init(repoPath: String) {
+        let repoFileURL = URL(fileURLWithPath: repoPath)
+        self.init(
+            packageVersionFileURL: repoFileURL.appendingPathComponent("Package.version.next"),
+            packageVersionSwiftFileURL: repoFileURL.appendingPathComponent(
+                "Sources/Core/AWSSDKDynamic/Sources/AWSSDKDynamic/PackageVersion.swift"
+            )
+        )
+    }
+
+    init(
+        packageVersionFileURL: URL,
+        packageVersionSwiftFileURL: URL
+    ) {
+        self.packageVersionFileURL = packageVersionFileURL
+        self.packageVersionSwiftFileURL = packageVersionSwiftFileURL
+    }
+
+    // MARK: - Code generation
+
+    func generatePackageVersionFile() throws {
+        let currentVersionData = try Data(contentsOf: packageVersionFileURL)
+        guard let packageVersion = String(data: currentVersionData, encoding: .utf8) else {
+            throw Error("Package.version.next does not contain UTF-8 data.")
+        }
+        _ = try Version(packageVersion) // throws if currentVersion is not a valid version string
+        let packageVersionFileContents = """
+            //
+            // Copyright Amazon.com Inc. or its affiliates.
+            // All Rights Reserved.
+            //
+            // SPDX-License-Identifier: Apache-2.0
+            //
+            
+            // Code is auto-generated. DO NOT EDIT!
+            
+            public let packageVersion = "\(packageVersion.trimmingCharacters(in: .whitespacesAndNewlines))"
+
+            """
+        try FileManager.default.createDirectory(
+            at: packageVersionSwiftFileURL.deletingLastPathComponent(),
+            withIntermediateDirectories: true
+        )
+        try Data(packageVersionFileContents.utf8).write(to: packageVersionSwiftFileURL)
+    }
+}

AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Models/PartitionsBuilder.swift

@@ -0,0 +1,64 @@
+//
+// Copyright Amazon.com Inc. or its affiliates.
+// All Rights Reserved.
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+
+import Foundation
+import struct AWSCLIUtils.Error
+
+struct PartitionsBuilder {
+    let partitionsFileURL: URL
+    let partitionsSwiftFileURL: URL
+
+    // MARK: - init
+
+    init(repoPath: String) {
+        let repoFileURL = URL(fileURLWithPath: repoPath)
+        self.init(
+            partitionsFileURL: repoFileURL.appendingPathComponent("codegen/sdk-codegen/sdk-partitions.json"),
+            partitionsSwiftFileURL: repoFileURL.appendingPathComponent(
+                "Sources/Core/AWSSDKDynamic/Sources/AWSSDKDynamic/Partitions.swift"
+            )
+        )
+    }
+
+    init(
+        partitionsFileURL: URL,
+        partitionsSwiftFileURL: URL
+    ) {
+        self.partitionsFileURL = partitionsFileURL
+        self.partitionsSwiftFileURL = partitionsSwiftFileURL
+    }
+
+    // MARK: - Code generation
+
+    func generatePartitionsFile() throws {
+        let partitionsData = try Data(contentsOf: partitionsFileURL)
+        guard let partitions = String(data: partitionsData, encoding: .utf8) else {
+            throw Error("sdk-partitions.json does not contain UTF-8 data.")
+        }
+        _ = try JSONSerialization.jsonObject(with: partitionsData) // verifies partitions are valid JSON
+        let partitionsSwiftFileContents = """
+            //
+            // Copyright Amazon.com Inc. or its affiliates.
+            // All Rights Reserved.
+            //
+            // SPDX-License-Identifier: Apache-2.0
+            //
+            
+            // Code is auto-generated. DO NOT EDIT!
+            
+            public let partitions = #\"\"\"
+            \(partitions.trimmingCharacters(in: .whitespacesAndNewlines))
+            \"\"\"#
+
+            """
+        try FileManager.default.createDirectory(
+            at: partitionsSwiftFileURL.deletingLastPathComponent(),
+            withIntermediateDirectories: true
+        )
+        try Data(partitionsSwiftFileContents.utf8).write(to: partitionsSwiftFileURL)
+    }
+}