From d935861ec19a55bcf8ed9313463ea8a32ca85609 Mon Sep 17 00:00:00 2001 From: Donnie Adams Date: Fri, 18 Oct 2024 09:34:33 -0400 Subject: [PATCH 1/2] fix: return error if build tool fails A change was made to return an error if running a code-based tool fails. This should also happen if building the tool fails. Signed-off-by: Donnie Adams --- pkg/engine/cmd.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/engine/cmd.go b/pkg/engine/cmd.go index 9ef6e834..a4f6d3ed 100644 --- a/pkg/engine/cmd.go +++ b/pkg/engine/cmd.go @@ -124,10 +124,10 @@ func (e *Engine) runCommand(ctx Context, tool types.Tool, input string, toolCate } cmd, stop, err := e.newCommand(ctx.Ctx, extraEnv, tool, input, true) if err != nil { - if toolCategory == NoCategory { + if toolCategory == NoCategory && ctx.Parent != nil { return fmt.Sprintf("ERROR: got (%v) while parsing command", err), nil } - return "", err + return "", fmt.Errorf("got (%v) while parsing command", err) } defer stop() From 6e38f43e84c59a5c4768784c73336c2f657e3c99 Mon Sep 17 00:00:00 2001 From: Donnie Adams Date: Fri, 18 Oct 2024 10:30:33 -0400 Subject: [PATCH 2/2] chore: remove directory data home workspace option Signed-off-by: Donnie Adams --- pkg/sdkserver/workspaces.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkg/sdkserver/workspaces.go b/pkg/sdkserver/workspaces.go index 87bc4583..0cbf94b2 100644 --- a/pkg/sdkserver/workspaces.go +++ b/pkg/sdkserver/workspaces.go @@ -26,7 +26,6 @@ func (w workspaceCommonRequest) getToolRepo() string { type createWorkspaceRequest struct { workspaceCommonRequest `json:",inline"` ProviderType string `json:"providerType"` - DirectoryDataHome string `json:"directoryDataHome"` FromWorkspaceIDs []string `json:"fromWorkspaceIDs"` } @@ -53,8 +52,8 @@ func (s *server) createWorkspace(w http.ResponseWriter, r *http.Request) { prg, reqObject.Env, fmt.Sprintf( - `{"provider": "%s", "data_home": "%s", "workspace_ids": "%s"}`, - reqObject.ProviderType, reqObject.DirectoryDataHome, strings.Join(reqObject.FromWorkspaceIDs, ","), + `{"provider": "%s", "workspace_ids": "%s"}`, + reqObject.ProviderType, strings.Join(reqObject.FromWorkspaceIDs, ","), ), ) if err != nil {