Merge pull request #798 from devspace-cloud/fix/deferred-request-command

minor fixes and improvements

Author: FabianKramm

dist/npm/index.js

@@ -174,25 +174,34 @@ exec("npm bin -g || yarn global bin", function(err, stdout, stderr) {
 
   if (action == "uninstall") {
     let removeGlobalFolder = function() {
-      inquirer
-        .prompt([
-          {
-            type: "list",
-            name: "removeGlobalFolder",
-            message: "Do you want to remove the global DevSpace config folder ~/.devspace?",
-            choices: ["no", "yes"],
-          },
-        ])
-        .then(answers => {
-          if (answers.removeGlobalFolder == "yes") {
-            try {
-              let homedir = require('os').homedir();
-              rimraf(homedir + path.sep + ".devspace");
-            } catch (e) {
-              console.error(e)
+      try {
+        let homedir = require('os').homedir();
+        rimraf(homedir + path.sep + ".devspace");
+      } catch (e) {
+        console.error(e)
+      }
+    };
+
+    let checkRemoveGlobalFolder = function() {
+      if (process.stdout.isTTY) {
+        inquirer
+          .prompt([
+            {
+              type: "list",
+              name: "checkRemoveGlobalFolder",
+              message: "Do you want to remove the global DevSpace config folder ~/.devspace?",
+              choices: ["no", "yes"],
+            },
+          ])
+          .then(answers => {
+            if (answers.checkRemoveGlobalFolder == "yes") {
+              removeGlobalFolder();
             }
-          }
-        });
+          });
+      } else {
+        console.warn("DevSpace will remvove the global ~/.devspace folder without asking because this uninstall call is being executed in a non-interactive environment.")
+        removeGlobalFolder();
+      }
     };
 
     if (process.ppid > 1) {
@@ -204,19 +213,19 @@ exec("npm bin -g || yarn global bin", function(err, stdout, stderr) {
                 if (list.length == 1 && /npm-cli.js("|')\s+up(date)?\s+(.+\s+)?devspace((\s)|$)/.test(list[0].cmd)) {
                   // Do not ask to remove global folder because user runs: npm upgrade
                 } else {
-                  removeGlobalFolder();
+                  checkRemoveGlobalFolder();
                 }
               }, function () {
-                removeGlobalFolder();
+                checkRemoveGlobalFolder();
               })
           } else {
-            removeGlobalFolder();
+            checkRemoveGlobalFolder();
           }
         }, function () {
-          removeGlobalFolder();
+          checkRemoveGlobalFolder();
         })
     } else {
-      removeGlobalFolder();
+      checkRemoveGlobalFolder();
     }
   }
 

pkg/devspace/config/versions/latest/schema.go

@@ -201,9 +201,11 @@ type AutoScalingConfig struct {
 
 // AutoScalingHorizontalConfig holds the horizontal autoscaling config of a component
 type AutoScalingHorizontalConfig struct {
-	MaxReplicas   *int   `yaml:"maxReplicas,omitempty"`
-	AverageCPU    string `yaml:"averageCPU,omitempty"`
-	AverageMemory string `yaml:"averageMemory,omitempty"`
+	MaxReplicas           *int   `yaml:"maxReplicas,omitempty"`
+	AverageCPU            string `yaml:"averageCPU,omitempty"`
+	AverageRelativeCPU    string `yaml:"averageRelativeCPU,omitempty"`
+	AverageMemory         string `yaml:"averageMemory,omitempty"`
+	AverageRelativeMemory string `yaml:"averageRelativeMemory,omitempty"`
 }
 
 // RollingUpdateConfig holds the configuration for rolling updates

pkg/devspace/deploy/helm/client.go

@@ -12,7 +12,7 @@ import (
 // DevSpaceChartConfig is the config that holds the devspace chart information
 var DevSpaceChartConfig = &latest.ChartConfig{
 	Name:    "component-chart",
-	Version: "v0.0.6",
+	Version: "v0.0.8",
 	RepoURL: "https://charts.devspace.cloud",
 }
 

pkg/util/analytics/analytics.go

@@ -329,7 +329,7 @@ func (a *analyticsConfig) sendRequest(requestURL string, data map[string]interfa
 			return errors.Errorf("Couldn't marshal analytics headers: %v", err)
 		}
 
-		args := []string{DEFERRED_REQUEST_COMMAND, "POST", base64.StdEncoding.EncodeToString([]byte(requestURL.String())), base64.StdEncoding.EncodeToString(jsonRequestBody), base64.StdEncoding.EncodeToString(jsonHeaders)}
+		args := []string{DEFERRED_REQUEST_COMMAND, "POST", base64.StdEncoding.EncodeToString([]byte(requestURL.String())), base64.StdEncoding.EncodeToString(jsonHeaders), base64.StdEncoding.EncodeToString(jsonRequestBody)}
 		executable, err := os.Executable()
 		if err != nil {
 			executable = os.Args[0]
@@ -344,7 +344,7 @@ func (a *analyticsConfig) sendRequest(requestURL string, data map[string]interfa
 
 // HandleDeferredRequest sends a request if args are: executable, DEFERRED_REQUEST_COMMAND
 func (a *analyticsConfig) HandleDeferredRequest() error {
-	if len(os.Args) < 6 || os.Args[1] != DEFERRED_REQUEST_COMMAND {
+	if len(os.Args) < 5 || os.Args[1] != DEFERRED_REQUEST_COMMAND {
 		return nil
 	}
 
@@ -353,15 +353,20 @@ func (a *analyticsConfig) HandleDeferredRequest() error {
 	if err != nil {
 		return errors.Errorf("Couldn't base64.decode request URL: %v", err)
 	}
-	requestBody, err := base64.StdEncoding.DecodeString(os.Args[4])
-	if err != nil {
-		return errors.Errorf("Couldn't base64.decode request body: %v", err)
-	}
-	jsonRequestHeaders, err := base64.StdEncoding.DecodeString(os.Args[5])
+
+	jsonRequestHeaders, err := base64.StdEncoding.DecodeString(os.Args[4])
 	if err != nil {
 		return errors.Errorf("Couldn't base64.decode request headers: %v", err)
 	}
 
+	requestBody := []byte{}
+	if len(os.Args) > 5 {
+		requestBody, err = base64.StdEncoding.DecodeString(os.Args[5])
+		if err != nil {
+			return errors.Errorf("Couldn't base64.decode request body: %v", err)
+		}
+	}
+
 	requestHeaders := map[string][]string{}
 	err = json.Unmarshal([]byte(jsonRequestHeaders), &requestHeaders)
 	if err != nil {