Keeping manual fixes of functions during override

Author: frikky

app_upload/stitcher.go

@@ -437,6 +437,32 @@ func deployFunction(appname, localization, applocation string, environmentVariab
 	if err != nil {
 		log.Println("[WARNING] Failed creating new function. Attempting patch, as it might exist already")
 
+		// Get the function
+		// Then replicate environment variables, maxinstance & memory 
+		getcall := projectsLocationsFunctionsService.Get(fmt.Sprintf("%s/functions/%s", location, appname))
+		existingFunction, err := getcall.Do()
+		if err != nil {
+			log.Printf("[WARNING] Failed getting existing function: %s", err)
+		} else {
+			// Timeout
+			if len(existingFunction.Timeout) > 0 {
+				cloudFunction.Timeout = existingFunction.Timeout
+			}
+
+			if len(existingFunction.EnvironmentVariables) > 1 {
+				cloudFunction.EnvironmentVariables = existingFunction.EnvironmentVariables
+			}
+
+			if existingFunction.MaxInstances > 0 {
+				cloudFunction.MaxInstances = existingFunction.MaxInstances
+			}
+
+			if existingFunction.AvailableMemoryMb > 0 {
+				cloudFunction.AvailableMemoryMb = existingFunction.AvailableMemoryMb
+			}
+		}
+
+
 		patchCall := projectsLocationsFunctionsService.Patch(fmt.Sprintf("%s/functions/%s", location, appname), cloudFunction)
 		_, err = patchCall.Do()
 		if err != nil {
@@ -866,8 +892,8 @@ func main() {
 		bucketName = os.Args[5]
 	}
 
-	appname := "shuffle-tools"
-	appversion := "1.2.0"
+	appname := "http"
+	appversion := "1.4.0"
 	err := deployConfigToBackend(appfolder, appname, appversion)
 	if err != nil {
 		log.Printf("[WARNING] Failed uploading config: %s", err)

codegen.go

@@ -3721,7 +3721,7 @@ func HandlePut(swagger *openapi3.Swagger, api WorkflowApp, extraParameters []Wor
 }
 
 func GetAppRequirements() string {
-	return "requests==2.32.3\nurllib3==2.3.0\nliquidpy==0.8.2\nMarkupSafe==3.0.2\nflask[async]==3.1.0\npython-dateutil==2.9.0.post0\nPyJWT==2.10.1\nshufflepy==0.0.7\nshuffle-sdk==0.0.13\n"
+	return "requests==2.32.3\nurllib3==2.3.0\nliquidpy==0.8.2\nMarkupSafe==3.0.2\nflask[async]==3.1.0\npython-dateutil==2.9.0.post0\nPyJWT==2.10.1\nshufflepy==0.0.7\nshuffle-sdk==0.0.18\n"
 }
 
 // Removes JSON values from the input
@@ -3917,6 +3917,7 @@ func DownloadDockerImageBackend(topClient *http.Client, imageName string) error
 	}
 
 	if isCloudDownload {
+		log.Printf("[DEBUG] Running GET request for cloud download for URL %s", dockerImgUrl)
 		req.Method = "GET"
 		req.Body = nil
 	}
@@ -3948,6 +3949,8 @@ func DownloadDockerImageBackend(topClient *http.Client, imageName string) error
 		return err
 	}
 
+	log.Printf("[DEBUG] Redirected download URL: %s", newresp.Request.URL.String())
+
 	defer newresp.Body.Close()
 	if newresp.StatusCode != 200 {
 		log.Printf("[ERROR] Docker download for image %s (backend) StatusCode (1): %d", imageName, newresp.StatusCode)
@@ -3969,8 +3972,8 @@ func DownloadDockerImageBackend(topClient *http.Client, imageName string) error
 		log.Printf("[WARNING] Failed response body copying: %s", err)
 		return err
 	}
-	tar.Seek(0, 0)
 
+	tar.Seek(0, 0)
 	dockercli, err := docker.NewEnvClient()
 	if err != nil {
 		log.Printf("[ERROR] Unable to create docker client (3): %s", err)
@@ -3981,14 +3984,14 @@ func DownloadDockerImageBackend(topClient *http.Client, imageName string) error
 
 	imageLoadResponse, err := dockercli.ImageLoad(context.Background(), tar, true)
 	if err != nil {
-		log.Printf("[ERROR] Error loading images: %s", err)
+		log.Printf("[ERROR] Failed loading docker images: %s", err)
 		return err
 	}
 
 	defer imageLoadResponse.Body.Close()
 	body, err := ioutil.ReadAll(imageLoadResponse.Body)
 	if err != nil {
-		log.Printf("[ERROR] Error reading: %s", err)
+		log.Printf("[ERROR] Failed reading docker image: %s", err)
 		return err
 	}
 

db-connector.go

@@ -12813,11 +12813,11 @@ func GetEsConfig(defaultCreds bool) *opensearch.Client {
 
 		log.Printf("[INFO] Added certificate %s elastic client.", certificateLocation)
 	}
-	config.Transport = transport
 
+	config.Transport = transport
 	es, err := opensearch.NewClient(config)
 	if err != nil {
-		log.Fatalf("[DEBUG] Database client for ELASTICSEARCH error during init (fatal): %s", err)
+		log.Fatalf("[ERROR] Database client for ELASTICSEARCH error during init (fatal): %s", err)
 	}
 
 	return es