chore: make workspace ID required for deleting workspace

Signed-off-by: Donnie Adams <[email protected]>

Author: thedadams

datasets_test.go

@@ -12,7 +12,7 @@ func TestDatasets(t *testing.T) {
 	require.NoError(t, err)
 
 	defer func() {
-		_ = g.DeleteWorkspace(context.Background(), DeleteWorkspaceOptions{WorkspaceID: workspaceID})
+		_ = g.DeleteWorkspace(context.Background(), workspaceID)
 	}()
 
 	// Create a dataset

workspace.go

@@ -36,24 +36,13 @@ func (g *GPTScript) CreateWorkspace(ctx context.Context, providerType string, fr
 	return strings.TrimSpace(out), nil
 }
 
-type DeleteWorkspaceOptions struct {
-	WorkspaceID string
-}
-
-func (g *GPTScript) DeleteWorkspace(ctx context.Context, opts ...DeleteWorkspaceOptions) error {
-	var opt DeleteWorkspaceOptions
-	for _, o := range opts {
-		if o.WorkspaceID != "" {
-			opt.WorkspaceID = o.WorkspaceID
-		}
-	}
-
-	if opt.WorkspaceID == "" {
-		opt.WorkspaceID = os.Getenv("GPTSCRIPT_WORKSPACE_ID")
+func (g *GPTScript) DeleteWorkspace(ctx context.Context, workspaceID string) error {
+	if workspaceID == "" {
+		return fmt.Errorf("workspace ID cannot be empty")
 	}
 
 	_, err := g.runBasicCommand(ctx, "workspaces/delete", map[string]any{
-		"id":            opt.WorkspaceID,
+		"id":            workspaceID,
 		"workspaceTool": g.globalOpts.WorkspaceTool,
 		"env":           g.globalOpts.Env,
 	})

workspace_test.go

@@ -8,13 +8,19 @@ import (
 	"testing"
 )
 
+func TestWorkspaceIDRequiredForDelete(t *testing.T) {
+	if err := g.DeleteWorkspace(context.Background(), ""); err == nil {
+		t.Error("Expected error but got nil")
+	}
+}
+
 func TestCreateAndDeleteWorkspace(t *testing.T) {
 	id, err := g.CreateWorkspace(context.Background(), "directory")
 	if err != nil {
 		t.Fatalf("Error creating workspace: %v", err)
 	}
 
-	err = g.DeleteWorkspace(context.Background(), DeleteWorkspaceOptions{WorkspaceID: id})
+	err = g.DeleteWorkspace(context.Background(), id)
 	if err != nil {
 		t.Errorf("Error deleting workspace: %v", err)
 	}
@@ -27,7 +33,7 @@ func TestWriteReadAndDeleteFileFromWorkspace(t *testing.T) {
 	}
 
 	t.Cleanup(func() {
-		err := g.DeleteWorkspace(context.Background(), DeleteWorkspaceOptions{WorkspaceID: id})
+		err := g.DeleteWorkspace(context.Background(), id)
 		if err != nil {
 			t.Errorf("Error deleting workspace: %v", err)
 		}
@@ -66,7 +72,7 @@ func TestLsComplexWorkspace(t *testing.T) {
 	}
 
 	t.Cleanup(func() {
-		err := g.DeleteWorkspace(context.Background(), DeleteWorkspaceOptions{WorkspaceID: id})
+		err := g.DeleteWorkspace(context.Background(), id)
 		if err != nil {
 			t.Errorf("Error deleting workspace: %v", err)
 		}
@@ -139,7 +145,7 @@ func TestCreateAndDeleteWorkspaceS3(t *testing.T) {
 		t.Fatalf("Error creating workspace: %v", err)
 	}
 
-	err = g.DeleteWorkspace(context.Background(), DeleteWorkspaceOptions{WorkspaceID: id})
+	err = g.DeleteWorkspace(context.Background(), id)
 	if err != nil {
 		t.Errorf("Error deleting workspace: %v", err)
 	}
@@ -156,7 +162,7 @@ func TestWriteReadAndDeleteFileFromWorkspaceS3(t *testing.T) {
 	}
 
 	t.Cleanup(func() {
-		err := g.DeleteWorkspace(context.Background(), DeleteWorkspaceOptions{WorkspaceID: id})
+		err := g.DeleteWorkspace(context.Background(), id)
 		if err != nil {
 			t.Errorf("Error deleting workspace: %v", err)
 		}
@@ -199,7 +205,7 @@ func TestLsComplexWorkspaceS3(t *testing.T) {
 	}
 
 	t.Cleanup(func() {
-		err := g.DeleteWorkspace(context.Background(), DeleteWorkspaceOptions{WorkspaceID: id})
+		err := g.DeleteWorkspace(context.Background(), id)
 		if err != nil {
 			t.Errorf("Error deleting workspace: %v", err)
 		}