Skip to content

fix: resolve EtcdHttpClient build errors for Xcode 26.2 #544

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
datlechin merged 1 commit into from
Mar 31, 2026
+24 −24
Merged

fix: resolve EtcdHttpClient build errors for Xcode 26.2 #544

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 24 additions & 24 deletions Plugins/EtcdDriverPlugin/EtcdHttpClient.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,28 +574,31 @@ internal final class EtcdHttpClient: @unchecked Sendable {

group.addTask {
let data: Data = try await withCheckedThrowingContinuation { continuation in
self.lock.lock()
guard self.sessionGeneration == generation, let currentSession = self.session else {
self.lock.unlock()
continuation.resume(throwing: EtcdError.notConnected)
return
}
let task = currentSession.dataTask(with: request) { data, _, error in
if let error {
// URLError.cancelled is expected when we cancel after timeout
if (error as? URLError)?.code == .cancelled {
continuation.resume(returning: data ?? Data())
} else {
continuation.resume(throwing: error)
let result: (session: URLSession, task: URLSessionDataTask)? = self.lock.withLock {
guard self.sessionGeneration == generation, let currentSession = self.session else {
return nil
}
let dataTask = currentSession.dataTask(with: request) { data, _, error in
if let error {
// URLError.cancelled is expected when we cancel after timeout
if (error as? URLError)?.code == .cancelled {
continuation.resume(returning: data ?? Data())
} else {
continuation.resume(throwing: error)
}
return
}
return
continuation.resume(returning: data ?? Data())
}
continuation.resume(returning: data ?? Data())
self.currentTask = dataTask
return (currentSession, dataTask)
}
self.currentTask = task
self.lock.unlock()
collectedData.setTask(task)
task.resume()
guard let result else {
continuation.resume(throwing: EtcdError.notConnected)
return
}
collectedData.setTask(result.task)
result.task.resume()
}
return Self.parseWatchEvents(from: data)
}
Expand Down Expand Up @@ -1062,10 +1065,7 @@ internal final class EtcdHttpClient: @unchecked Sendable {
return
}

guard let identity = identityRef as? SecIdentity else {
completionHandler(.cancelAuthenticationChallenge, nil)
return
}
let identity = unsafeBitCast(identityRef, to: SecIdentity.self)
let credential = URLCredential(
identity: identity,
certificates: nil,
Expand Down Expand Up @@ -1122,7 +1122,7 @@ internal final class EtcdHttpClient: @unchecked Sendable {
}

// Export to PKCS#12
var exportItems: CFArray?
let exportItems: CFArray? = nil
guard let identity = createIdentity(certificate: cert, privateKey: privateKey) else {
return nil
}
Expand Down
Loading