Decouple from the known list of platforms and branches so that swiftly can operate independently of its current schema version

Author: cmcgee1024

Sources/SwiftlyCore/HTTPClient.swift

@@ -54,7 +54,7 @@ public protocol HTTPRequestExecutor {
     func execute(_ request: HTTPClientRequest, timeout: TimeAmount) async throws -> HTTPClientResponse
     func getCurrentSwiftlyRelease() async throws -> Components.Schemas.SwiftlyRelease
     func getReleaseToolchains() async throws -> [Components.Schemas.Release]
-    func getSnapshotToolchains(branch: Components.Schemas.KnownSourceBranch, platform: Components.Schemas.KnownPlatformIdentifier) async throws -> Components.Schemas.DevToolchains
+    func getSnapshotToolchains(branch: Components.Schemas.SourceBranch, platform: Components.Schemas.PlatformIdentifier) async throws -> Components.Schemas.DevToolchains
 }
 
 internal struct SwiftlyUserAgentMiddleware: ClientMiddleware {
@@ -146,7 +146,7 @@ internal class HTTPRequestExecutorImpl: HTTPRequestExecutor {
         return try response.ok.body.json
     }
 
-    public func getSnapshotToolchains(branch: Components.Schemas.KnownSourceBranch, platform: Components.Schemas.KnownPlatformIdentifier) async throws -> Components.Schemas.DevToolchains {
+    public func getSnapshotToolchains(branch: Components.Schemas.SourceBranch, platform: Components.Schemas.PlatformIdentifier) async throws -> Components.Schemas.DevToolchains {
         let config = AsyncHTTPClientTransport.Configuration(client: self.httpClient, timeout: .seconds(30))
         let swiftlyUserAgent = SwiftlyUserAgentMiddleware()
 
@@ -371,34 +371,30 @@ public struct SwiftlyHTTPClient {
         limit: Int? = nil,
         filter: ((ToolchainVersion.Snapshot) -> Bool)? = nil
     ) async throws -> [ToolchainVersion.Snapshot] {
-        let platformId: Components.Schemas.KnownPlatformIdentifier = switch platform.name {
-        // case PlatformDefinition.ubuntu2404.name:
-        //    .ubuntu2404
-        // case PlatformDefinition.debian12.name:
-        //    .debian12
-        // case PlatformDefinition.fedora39.name:
-        //    .fedora39
+        let platformId: Components.Schemas.PlatformIdentifier = switch platform.name {
+        // These are new platforms that aren't yet in the list of known platforms in the OpenAPI schema
+        case PlatformDefinition.ubuntu2404.name, PlatformDefinition.debian12.name, PlatformDefinition.fedora39.name:
+            .init(value2: platform.name)
+
         case PlatformDefinition.ubuntu2204.name:
-            .ubuntu2204
+            .init(value1: .ubuntu2204)
         case PlatformDefinition.ubuntu2004.name:
-            .ubuntu2004
+            .init(value1: .ubuntu2004)
         case PlatformDefinition.rhel9.name:
-            .ubi9
+            .init(value1: .ubi9)
         case PlatformDefinition.amazonlinux2.name:
-            .amazonlinux2
+            .init(value1: .amazonlinux2)
         case PlatformDefinition.macOS.name:
-            .macos
+            .init(value1: .macos)
         default:
             throw SwiftlyError(message: "No snapshot toolchains available for platform \(platform.name)")
         }
 
-        let sourceBranch: Components.Schemas.KnownSourceBranch = switch branch {
+        let sourceBranch: Components.Schemas.SourceBranch = switch branch {
         case .main:
-            .main
-        case .release(major: 6, minor: 0):
-            ._6_0
-        default:
-            throw SwiftlyError(message: "Unknown snapshot branch: \(branch)")
+            .init(value1: .main)
+        case let .release(major, minor):
+            .init(value2: "\(major).\(minor)")
         }
 
         let devToolchains = try await SwiftlyCore.httpRequestExecutor.getSnapshotToolchains(branch: sourceBranch, platform: platformId)

Sources/SwiftlyCore/openapi.yaml

@@ -37,12 +37,12 @@ paths:
         in: path
         required: true
         schema:
-          $ref: '#/components/schemas/KnownSourceBranch'
+          $ref: '#/components/schemas/SourceBranch'
       - name: platform
         in: path
         required: true
         schema:
-          $ref: '#/components/schemas/KnownPlatformIdentifier'
+          $ref: '#/components/schemas/PlatformIdentifier'
     get:
       operationId: listDevToolchains
       summary: Fetch all development toolchains
@@ -61,7 +61,7 @@ paths:
         in: path
         required: true
         schema:
-          $ref: '#/components/schemas/KnownSourceBranch'
+          $ref: '#/components/schemas/SourceBranch'
     get:
       operationId: listStaticSDKDevToolchains
       summary: Fetch all static SDK development toolchains

Tests/SwiftlyTests/SwiftlyTests.swift

@@ -472,7 +472,7 @@ private struct MockHTTPRequestExecutor: HTTPRequestExecutor {
         throw SwiftlyTestError(message: "Mocking of fetching the release toolchains is not implemented in MockHTTPRequestExecutor.")
     }
 
-    public func getSnapshotToolchains(branch _: Components.Schemas.KnownSourceBranch, platform _: Components.Schemas.KnownPlatformIdentifier) async throws -> Components.Schemas.DevToolchains {
+    public func getSnapshotToolchains(branch _: Components.Schemas.SourceBranch, platform _: Components.Schemas.PlatformIdentifier) async throws -> Components.Schemas.DevToolchains {
         throw SwiftlyTestError(message: "Mocking of fetching the snapshot toolchains is not implemented in MockHTTPRequestExecutor.")
     }
 }
@@ -585,23 +585,23 @@ public class MockToolchainDownloader: HTTPRequestExecutor {
         }
     }
 
-    public func getSnapshotToolchains(branch: Components.Schemas.KnownSourceBranch, platform _: Components.Schemas.KnownPlatformIdentifier) async throws -> Components.Schemas.DevToolchains {
+    public func getSnapshotToolchains(branch: Components.Schemas.SourceBranch, platform _: Components.Schemas.PlatformIdentifier) async throws -> Components.Schemas.DevToolchains {
         let currentPlatform = try await Swiftly.currentPlatform.detectPlatform(disableConfirmation: true, platform: nil)
 
         let releasesForBranch = self.snapshotToolchains.filter { snapshotVersion in
             switch snapshotVersion.branch {
             case .main:
-                branch == .main
+                branch.value1 == .main || branch.value1?.rawValue == "main"
             case let .release(major, minor):
-                major == 6 && minor == 0 && branch == ._6_0
+                branch.value2 == "\(major).\(minor)" || branch.value1?.rawValue == "\(major).\(minor)"
             }
         }
 
         let devToolchainsForArch = releasesForBranch.map { branchSnapshot in
             Components.Schemas.DevToolchainForArch(
                 name: Components.Schemas.DevToolchainKind?.none,
                 date: "",
-                dir: branch == .main ?
+                dir: branch.value1 == .main || branch.value2 == "main" ?
                     "swift-DEVELOPMENT-SNAPSHOT-\(branchSnapshot.date)" :
                     "swift-6.0-DEVELOPMENT-SNAPSHOT-\(branchSnapshot.date)",
                 download: "",