Skip to content

fix: keep agent-core install script from joining fiif #82

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

Open
stctheproducer wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: keep agent-core install script from joining fiif #82

Show file tree
Hide file tree
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
4 changes: 3 additions & 1 deletion dory-core-swift/Sources/DorydKit/MachineRecipeProvisioner.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ public enum MachineRecipeProvisioner {
}

private static func packageInstallScript(alpine: String, debian: String) -> String {
// Swift multiline strings drop the newline before the closing delimiter.
// A later `if` must start on a new line so ash does not see `fiif`.
"""
if command -v apk >/dev/null 2>&1; then
apk add --no-cache \(alpine)
Expand All @@ -44,7 +46,7 @@ public enum MachineRecipeProvisioner {
echo "Dory recipes support Alpine apk and Debian apt guests" >&2
exit 69
fi
"""
""" + "\n"
}

public static func recipe(id rawID: String) throws -> Recipe {
Expand Down
7 changes: 7 additions & 0 deletions dory-core-swift/Tests/DorydKitTests/MachineRecipeProvisionerTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,13 @@ final class MachineRecipeProvisionerTests: XCTestCase {
}
}

func testAgentCoreInstallScriptDoesNotJoinFiIntoTheFdShim() throws {
let script = try MachineRecipeProvisioner.recipe(id: "agent-core").installScript
XCTAssertFalse(script.contains("fiif"), script)
XCTAssertTrue(script.contains("fi\nif ! command -v fd"), script)
XCTAssertTrue(script.contains("exit 69\nfi\n"), script)
}

func testRequiredProvisioningStageRejectsNonzeroExitWithStderr() {
let result = DoryExecResult(
exitCode: 17,
Expand Down