Merge branch '1.4.0'

backend/app_sdk/app_base.py

@@ -3515,7 +3515,7 @@ class AppBase:
                                     timeout = 30 
 
                                     # Check if current app is Shuffle Tools, then set to 55 due to certain actions being slow (ioc parser..) 
-                                    #uu In general, this should be disabled for onprem 
+                                    # In general, this should be disabled for onprem 
                                     if self.action["app_name"].lower() == "shuffle tools":
                                         timeout = 55
 

backend/go-app/go.mod

@@ -18,8 +18,8 @@ require (
 	github.com/gorilla/mux v1.8.0
 	github.com/h2non/filetype v1.1.3
 	github.com/satori/go.uuid v1.2.0
-	github.com/shuffle/shuffle-shared v0.4.66
-	golang.org/x/crypto v0.14.0
+	github.com/shuffle/shuffle-shared v0.4.79
+	golang.org/x/crypto v0.9.0
 	google.golang.org/api v0.125.0
 	google.golang.org/grpc v1.55.0
 	gopkg.in/src-d/go-git.v4 v4.13.1

backend/go-app/walkoff.go

@@ -1049,15 +1049,25 @@ func handleExecution(id string, workflow shuffle.Workflow, request *http.Request
 
 	workflowExecution, execInfo, _, err := shuffle.PrepareWorkflowExecution(ctx, workflow, request, 10)
 	if err != nil {
+		err = shuffle.SetWorkflowExecution(ctx, workflowExecution, true)
+		if err != nil {
+			log.Printf("[ERROR] Failed setting workflow execution during init (2): %s", err)
+		}
+
 		if strings.Contains(fmt.Sprintf("%s", err), "User Input") {
 			// Special for user input callbacks
 			return workflowExecution, fmt.Sprintf("%s", err), nil
 		} else {
-			log.Printf("[WARNING] Failed in prepareExecution: %s", err)
+			log.Printf("[ERROR] Failed in prepareExecution: %s", err)
 			return shuffle.WorkflowExecution{}, fmt.Sprintf("Failed starting workflow: %s", err), err
 		}
 	}
 
+	err = shuffle.SetWorkflowExecution(ctx, workflowExecution, true)
+	if err != nil {
+		log.Printf("[ERROR] Failed setting workflow execution during init (2): %s", err)
+	}
+
 	err = imageCheckBuilder(execInfo.ImageNames)
 	if err != nil {
 		log.Printf("[ERROR] Failed building the required images from %#v: %s", execInfo.ImageNames, err)
@@ -1643,7 +1653,6 @@ func handleExecution(id string, workflow shuffle.Workflow, request *http.Request
 		return shuffle.WorkflowExecution{}, "Failed building missing Docker images", err
 	}
 
-	//Org               []Org    `json:"org,omitempty" datastore:"org"`
 	err = shuffle.SetWorkflowExecution(ctx, workflowExecution, true)
 	if err != nil {
 		log.Printf("[WARNING] Error saving workflow execution for updates %s", err)