Skip to content

Improve validation of task action implementation tool identifier types #493

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
merged 1 commit into from
May 7, 2025
Merged

Improve validation of task action implementation tool identifier types #493

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
12 changes: 8 additions & 4 deletions Sources/SWBTaskExecution/BuildDescription.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -984,13 +984,17 @@ package final class BuildDescriptionBuilder {
let inputs = amendedInputsForTask(task, inputs)
let outputs = amendedOutputsForTask(task, outputs)

processTaskLock.withLock {
try processTaskLock.withLock {
// Record the custom tool type.
// FIXME: This cast is unfortunate.
let execTask = task.execTask as! Task
assert(execTask.action != nil)
assert(taskActionMap[tool] == nil || taskActionMap[tool]! == type(of: execTask.action!))
taskActionMap[tool] = type(of: execTask.action!)
guard let execTaskAction = execTask.action else {
throw StubError.error("INTERNAL ERROR: custom command with tool identifier '\(tool)' is missing a task action implementation")
}
if let existingTaskAction = taskActionMap[tool], existingTaskAction != type(of: execTaskAction) {
throw StubError.error("INTERNAL ERROR: task action implementation types \(existingTaskAction) and \(type(of: execTaskAction)) have conflicting tool identifier '\(tool)'; tool identifiers must be globally unique across all task action implementation types")
}
taskActionMap[tool] = type(of: execTaskAction)
}

// Add the command definition.
Expand Down
Loading