Skip to content

Return errors instead of log.Fatalf in lifecycle/cli_adaptor.go #12

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
jim-junior merged 1 commit into from
Sep 18, 2026
+7 −7
Merged

Return errors instead of log.Fatalf in lifecycle/cli_adaptor.go #12

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
14 changes: 7 additions & 7 deletions internal/runtime/lifecycle/cli_adaptor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ func (a *Adapter) CLIPrepare(tc harnessruntime.TrialContext) (harnessruntime.Sta
log.Printf("Running skopeo command: %s\n", cmdskopeo.String())

if err := cmdskopeo.Run(); err != nil {
log.Fatalf("failed to save image %q to tarball: %v", imageName, err)
return harnessruntime.StageResult{}, fmt.Errorf("save image %q to tarball: %w", imageName, err)
}

cmdumoci := exec.Command("umoci", "unpack",
Expand All @@ -38,7 +38,7 @@ func (a *Adapter) CLIPrepare(tc harnessruntime.TrialContext) (harnessruntime.Sta
log.Printf("Running umoci command: %s\n", cmdumoci.String())

if err := cmdumoci.Run(); err != nil {
log.Fatalf("failed to unpack image %q to bundle: %v", imageName, err)
return harnessruntime.StageResult{}, fmt.Errorf("unpack image %q to bundle: %w", imageName, err)
}

finishedAt := time.Now()
Expand Down Expand Up @@ -72,7 +72,7 @@ func (a *Adapter) CLICreateTask(tc harnessruntime.TrialContext) (harnessruntime.
// BUNDLE PATH: pwd + <trial_id>-bundle
dir, err := os.Getwd()
if err != nil {
log.Fatalf("failed to get current working directory: %v", err)
return harnessruntime.StageResult{}, fmt.Errorf("get current working directory: %w", err)
}
bundlePath := fmt.Sprintf("%s/%s-bundle", dir, tc.Trial.ID)

Expand All @@ -86,7 +86,7 @@ func (a *Adapter) CLICreateTask(tc harnessruntime.TrialContext) (harnessruntime.
log.Printf("Running runsc command: %s\n", cmdrunsc.String())

if err := cmdrunsc.Run(); err != nil {
log.Fatalf("failed to create task %q: %v", tc.Trial.ID, err)
return harnessruntime.StageResult{}, fmt.Errorf("create task %q: %w", tc.Trial.ID, err)
}

finishedAt := time.Now()
Expand Down Expand Up @@ -123,7 +123,7 @@ func (a *Adapter) CLIStartTask(tc harnessruntime.TrialContext) (harnessruntime.S
cmdrunsc.Stderr = os.Stderr

if err := cmdrunsc.Run(); err != nil {
log.Fatalf("failed to start task %q: %v", tc.Trial.ID, err)
return harnessruntime.StageResult{}, fmt.Errorf("start task %q: %w", tc.Trial.ID, err)
}

finishedAt := time.Now()
Expand Down Expand Up @@ -197,7 +197,7 @@ func (a *Adapter) CLIDeleteTask(tc harnessruntime.TrialContext) (harnessruntime.
cmdrunsc.Stderr = os.Stderr

if err := cmdrunsc.Run(); err != nil {
log.Fatalf("failed to stop task %q: %v", tc.Trial.ID, err)
return harnessruntime.StageResult{}, fmt.Errorf("delete task %q: %w", tc.Trial.ID, err)
}

finishedAt := time.Now()
Expand Down Expand Up @@ -230,7 +230,7 @@ func (a *Adapter) CLICleanupTask(tc harnessruntime.TrialContext) (harnessruntime

bundleDir := fmt.Sprintf("%s-bundle", tc.Trial.ID)
if err := os.RemoveAll(bundleDir); err != nil {
log.Fatalf("failed to remove bundle directory %q: %v", bundleDir, err)
return harnessruntime.StageResult{}, fmt.Errorf("remove bundle directory %q: %w", bundleDir, err)
}

if err := os.RemoveAll(tc.Trial.ID); err != nil {
Expand Down
Loading