client/cordium - add var to startWorkspacereq in run cmd on subsequent runs

Author: geokb

client/cordium/commands/ccommon/ccommon.go

@@ -19,8 +19,10 @@ package ccommon
 import (
 	"strings"
 
+	pb "github.com/octelium/octelium/apis/main/cordiumv1"
 	"github.com/octelium/octelium/apis/main/metav1"
 	"github.com/octelium/octelium/pkg/apiutils/umetav1"
+	"github.com/pkg/errors"
 )
 
 func GetResourceShortName(rsc umetav1.ResourceObjectI) string {
@@ -45,3 +47,18 @@ func doGetShortName(arg string) string {
 	}
 	return strings.Split(arg, ".")[0]
 }
+
+func ParseVars(raw []string) ([]*pb.Workspace_Spec_Var, error) {
+	vars := make([]*pb.Workspace_Spec_Var, 0, len(raw))
+	for _, s := range raw {
+		name, value, ok := strings.Cut(s, "=")
+		if !ok || name == "" {
+			return nil, errors.Errorf("invalid --var value %q: expected NAME=VALUE", s)
+		}
+		vars = append(vars, &pb.Workspace_Spec_Var{
+			Name:  name,
+			Value: value,
+		})
+	}
+	return vars, nil
+}

client/cordium/commands/run/cmd.go

@@ -22,6 +22,7 @@ import (
 	"os"
 	"time"
 
+	"github.com/octelium/cordium/client/cordium/commands/ccommon"
 	"github.com/octelium/cordium/client/cordium/commands/create/workspace"
 	"github.com/octelium/cordium/client/cordium/commands/terminal"
 	"github.com/octelium/cordium/pkg/apiutils/ucordiumv1"
@@ -265,6 +266,18 @@ func doRun(ctx context.Context, conn *grpc.ClientConn, ws *pb.Workspace) error {
 	case ucordiumv1.ToWorkspace(ws).IsStopped():
 		if _, err := c.StartWorkspace(ctx, &pb.StartWorkspaceRequest{
 			WorkspaceRef: umetav1.GetObjectReference(ws),
+			Config: func() *pb.StartWorkspaceRequest_Config {
+				if len(ws.Status.LastRuns) > 0 && len(cmdArgs.Vars) > 0 {
+
+					if vars, err := ccommon.ParseVars(cmdArgs.Vars); err == nil {
+						return &pb.StartWorkspaceRequest_Config{
+							Vars: vars,
+						}
+					}
+				}
+
+				return nil
+			}(),
 		}); err != nil {
 			if !grpcerr.AlreadyExists(err) {
 				return err

client/cordium/commands/start/cmd.go

@@ -17,13 +17,11 @@
 package start
 
 import (
-	"strings"
-
+	"github.com/octelium/cordium/client/cordium/commands/ccommon"
 	pb "github.com/octelium/octelium/apis/main/cordiumv1"
 	"github.com/octelium/octelium/apis/main/metav1"
 	"github.com/octelium/octelium/client/common/client"
 	"github.com/octelium/octelium/client/common/cliutils"
-	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )
 
@@ -84,7 +82,7 @@ func doCmd(cmd *cobra.Command, args []string) error {
 	}
 
 	if len(cmdArgs.Vars) > 0 {
-		vars, err := parseVars(cmdArgs.Vars)
+		vars, err := ccommon.ParseVars(cmdArgs.Vars)
 		if err != nil {
 			return err
 		}
@@ -101,18 +99,3 @@ func doCmd(cmd *cobra.Command, args []string) error {
 
 	return nil
 }
-
-func parseVars(raw []string) ([]*pb.Workspace_Spec_Var, error) {
-	vars := make([]*pb.Workspace_Spec_Var, 0, len(raw))
-	for _, s := range raw {
-		name, value, ok := strings.Cut(s, "=")
-		if !ok || name == "" {
-			return nil, errors.Errorf("invalid --var value %q: expected NAME=VALUE", s)
-		}
-		vars = append(vars, &pb.Workspace_Spec_Var{
-			Name:  name,
-			Value: value,
-		})
-	}
-	return vars, nil
-}