Added fixes towards new worker deployment

backend/app_sdk/build.sh

@@ -3,7 +3,7 @@
 
 ### DEFAULT 
 NAME=shuffle-app_sdk
-VERSION=0.9.34
+VERSION=0.9.35
 
 docker rmi docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION --force
 docker build . -f Dockerfile -t frikky/shuffle:app_sdk -t frikky/$NAME:$VERSION -t docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION -t ghcr.io/frikky/$NAME:$VERSION -t ghcr.io/frikky/$NAME:nightly

backend/go-app/go.mod

@@ -22,7 +22,7 @@ require (
 	github.com/gorilla/mux v1.8.0
 	github.com/h2non/filetype v1.1.1
 	github.com/satori/go.uuid v1.2.0
-	github.com/shuffle/shuffle-shared v0.1.35
+	github.com/shuffle/shuffle-shared v0.1.36
 	github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e // indirect
 	go4.org v0.0.0-20201209231011-d4a079459e60 // indirect
 	golang.org/x/crypto v0.0.0-20210921155107-089bfa567519

backend/go-app/main.go

@@ -3809,6 +3809,7 @@ func runInitEs(ctx context.Context) {
 
 	log.Printf("[DEBUG] Getting organizations")
 	activeOrgs, err := shuffle.GetAllOrgs(ctx)
+
 	setUsers := false
 	//log.Printf("ORGS: %d", len(activeOrgs))
 	if err != nil {
@@ -3896,6 +3897,7 @@ func runInitEs(ctx context.Context) {
 		}
 	}
 
+	_ = setUsers
 	schedules, err := shuffle.GetAllSchedules(ctx, "ALL")
 	if err != nil {
 		log.Printf("[WARNING] Failed getting schedules during service init: %s", err)
@@ -3937,6 +3939,7 @@ func runInitEs(ctx context.Context) {
 		}
 	}
 
+	parsedApikey := ""
 	users, err := shuffle.GetAllUsers(ctx)
 	if len(users) == 0 {
 		log.Printf("[INFO] Trying to set up user based on environments SHUFFLE_DEFAULT_USERNAME & SHUFFLE_DEFAULT_PASSWORD")
@@ -3948,6 +3951,10 @@ func runInitEs(ctx context.Context) {
 		} else {
 			apikey := os.Getenv("SHUFFLE_DEFAULT_APIKEY")
 
+			if len(parsedApikey) == 0 {
+				parsedApikey = apikey
+			}
+
 			log.Printf("[DEBUG] Creating org for default user %s", username)
 			orgId := uuid.NewV4().String()
 			orgSetupName := "default"
@@ -3996,8 +4003,15 @@ func runInitEs(ctx context.Context) {
 				}
 			}
 		}
+	} else {
+		for _, user := range users {
+			if user.Role == "admin" && len(user.ApiKey) > 0 {
+				parsedApikey = user.ApiKey
+				log.Printf("[DEBUG] Using apikey of %s (%s) for cleanup", user.Username, user.Id)
+				break
+			}
+		}
 	}
-	_ = setUsers
 
 	log.Printf("[INFO] Starting cloud schedules for orgs if enabled!")
 	type requestStruct struct {
@@ -4041,6 +4055,57 @@ func runInitEs(ctx context.Context) {
 		forceUpdate = true
 	}
 
+	// FIXME: Have this for all envs in all orgs (loop and find).
+	if len(parsedApikey) > 0 {
+		cleanupSchedule := 3600
+		environments := []string{"Shuffle"}
+		log.Printf("[DEBUG] Starting schedule setup for execution cleanup every %d seconds. Running first immediately.", cleanupSchedule)
+		cleanupJob := func() func() {
+			return func() {
+				log.Printf("[INFO] Running schedule for cleaning up or re-running unfinished workflows in %d environments.", len(environments))
+
+				for _, environment := range environments {
+					url := fmt.Sprintf("http://localhost:5001/api/v1/environments/%s/stop", environment)
+					httpClient := &http.Client{}
+					req, err := http.NewRequest(
+						"GET",
+						url,
+						nil,
+					)
+
+					req.Header.Add("Authorization", fmt.Sprintf(`Bearer %s`, parsedApikey))
+					if err != nil {
+						log.Printf("[ERROR] Failed CREATING environment request for %s: %s", environment, err)
+						continue
+
+					}
+
+					newresp, err := httpClient.Do(req)
+					if err != nil {
+						log.Printf("[ERROR] Failed running environment request %s: %s", environment, err)
+						continue
+					}
+
+					respBody, err := ioutil.ReadAll(newresp.Body)
+					if err != nil {
+						log.Printf("[ERROR] Failed setting respbody %s", err)
+						continue
+					}
+					log.Printf("[DEBUG] Successfully ran workflow cleanup request for %s. Body: %s", environment, string(respBody))
+				}
+			}
+		}
+
+		jobret, err := newscheduler.Every(cleanupSchedule).Seconds().Run(cleanupJob())
+		if err != nil {
+			log.Printf("[ERROR] Failed to schedule Cleanup: %s", err)
+		} else {
+			_ = jobret
+		}
+	} else {
+		log.Printf("[DEBUG] Couldn't find a valid API-key, hence couldn't run cleanup")
+	}
+
 	// Getting apps to see if we should initialize a test
 	// FIXME: Isn't this a little backwards?
 	workflowapps, err := shuffle.GetAllWorkflowApps(ctx, 1000)