fix: update schema description & refactor

Author: yaohui-wyh

components/gitpod-protocol/data/gitpod-schema.json

@@ -290,7 +290,7 @@
                         },
                         "vmoptions": {
                             "type": "string",
-                            "description": "Adjust VM options for the remote IDE server, especially if you want to increase the '-Xmx' memory size when working with a larger project. See https://www.jetbrains.com/help/idea/tuning-the-ide.html#configure-jvm-options"
+                            "description": "Configure VM options, for instance '-Xmx=4096m'."
                         }
                     }
                 },
@@ -324,7 +324,7 @@
                         },
                         "vmoptions": {
                             "type": "string",
-                            "description": "Adjust VM options for the remote IDE server, especially if you want to increase the '-Xmx' memory size when working with a larger project. See https://www.jetbrains.com/help/idea/tuning-the-ide.html#configure-jvm-options"
+                            "description": "Configure VM options, for instance '-Xmx=4096m'."
                         }
                     }
                 },
@@ -358,7 +358,7 @@
                         },
                         "vmoptions": {
                             "type": "string",
-                            "description": "Adjust VM options for the remote IDE server, especially if you want to increase the '-Xmx' memory size when working with a larger project. See https://www.jetbrains.com/help/idea/tuning-the-ide.html#configure-jvm-options"
+                            "description": "Configure VM options, for instance '-Xmx=4096m'."
                         }
                     }
                 },
@@ -392,7 +392,7 @@
                         },
                         "vmoptions": {
                             "type": "string",
-                            "description": "Adjust VM options for the remote IDE server, especially if you want to increase the '-Xmx' memory size when working with a larger project. See https://www.jetbrains.com/help/idea/tuning-the-ide.html#configure-jvm-options"
+                            "description": "Configure VM options, for instance '-Xmx=4096m'."
                         }
                     }
                 }

components/ide/jetbrains/image/status/main.go

@@ -77,9 +77,13 @@ func main() {
 	log.WithField("cost", time.Now().Local().Sub(startTime).Milliseconds()).Info("content available")
 
 	repoRoot := wsInfo.GetCheckoutLocation()
+	gitpodConfig, err := parseGitpodConfig(repoRoot)
+	if err != nil {
+		log.WithError(err).Error("parse .gitpod.yml failed")
+	}
 	version_2022_1, _ := version.NewVersion("2022.1")
 	if version_2022_1.LessThanOrEqual(backendVersion) {
-		err = installPlugins(repoRoot, alias)
+		err = installPlugins(repoRoot, gitpodConfig, alias)
 		installPluginsCost := time.Now().Local().Sub(startTime).Milliseconds()
 		if err != nil {
 			log.WithError(err).WithField("cost", installPluginsCost).Error("installing repo plugins: done")
@@ -88,7 +92,7 @@ func main() {
 		}
 	}
 
-	err = configureVMOptions(repoRoot, alias)
+	err = configureVMOptions(gitpodConfig, alias)
 	if err != nil {
 		log.WithError(err).Error("failed to configure vmoptions")
 	}
@@ -308,7 +312,7 @@ func handleSignal(projectPath string) {
 	log.Info("asked IDE to terminate")
 }
 
-func configureVMOptions(repoRoot string, alias string) error {
+func configureVMOptions(config *gitpod.GitpodConfig, alias string) error {
 	idePrefix := alias
 	if alias == "intellij" {
 		idePrefix = "idea"
@@ -319,7 +323,7 @@ func configureVMOptions(repoRoot string, alias string) error {
 	if err != nil {
 		return err
 	}
-	newContent := updateVMOptions(repoRoot, alias, string(content))
+	newContent := updateVMOptions(config, alias, string(content))
 	return ioutil.WriteFile(path, []byte(newContent), 0)
 }
 
@@ -341,7 +345,7 @@ func deduplicateVMOption(oldLines []string, newLines []string, predicate func(l,
 	return result
 }
 
-func updateVMOptions(repoRoot string, alias string, content string) string {
+func updateVMOptions(config *gitpod.GitpodConfig, alias string, content string) string {
 	// inspired by how intellij platform merge the VMOptions
 	// https://github.com/JetBrains/intellij-community/blob/master/platform/platform-impl/src/com/intellij/openapi/application/ConfigImportHelper.java#L1115
 	filterFunc := func(l, r string) bool {
@@ -367,9 +371,8 @@ func updateVMOptions(repoRoot string, alias string, content string) string {
 	}
 
 	// user-defined vmoptions (.gitpod.yml)
-	gitpodConfig, err := parseGitpodConfig(repoRoot)
-	if gitpodConfig != nil && err == nil {
-		productConfig := getProductConfig(gitpodConfig, alias)
+	if config != nil {
+		productConfig := getProductConfig(config, alias)
 		if productConfig != nil {
 			userVMOptions = strings.Fields(productConfig.VMOptions)
 			if len(userVMOptions) > 0 {
@@ -424,8 +427,8 @@ func resolveBackendVersion() (*version.Version, error) {
 	return version.NewVersion(info.Version)
 }
 
-func installPlugins(repoRoot string, alias string) error {
-	plugins, err := getPlugins(repoRoot, alias)
+func installPlugins(repoRoot string, config *gitpod.GitpodConfig, alias string) error {
+	plugins, err := getPlugins(config, alias)
 	if err != nil {
 		return err
 	}
@@ -491,12 +494,8 @@ func parseGitpodConfig(repoRoot string) (*gitpod.GitpodConfig, error) {
 	return config, nil
 }
 
-func getPlugins(repoRoot string, alias string) ([]string, error) {
+func getPlugins(config *gitpod.GitpodConfig, alias string) ([]string, error) {
 	var plugins []string
-	config, err := parseGitpodConfig(repoRoot)
-	if err != nil {
-		return nil, err
-	}
 	if config == nil || config.JetBrains == nil {
 		return nil, nil
 	}

components/ide/jetbrains/image/status/main_test.go

@@ -58,7 +58,7 @@ func TestUpdateVMOptions(t *testing.T) {
 		lessFunc := func(a, b string) bool { return a < b }
 
 		t.Run(test.Desc, func(t *testing.T) {
-			actual := updateVMOptions("", test.Alias, test.Src)
+			actual := updateVMOptions(nil, test.Alias, test.Src)
 			if diff := cmp.Diff(strings.Fields(test.Expectation), strings.Fields(actual), cmpopts.SortSlices(lessFunc)); diff != "" {
 				t.Errorf("unexpected output (-want +got):\n%s", diff)
 			}
@@ -67,7 +67,7 @@ func TestUpdateVMOptions(t *testing.T) {
 		t.Run("updateVMOptions multiple time should be stable", func(t *testing.T) {
 			actual := test.Src
 			for i := 0; i < 5; i++ {
-				actual = updateVMOptions("", test.Alias, actual)
+				actual = updateVMOptions(nil, test.Alias, actual)
 				if diff := cmp.Diff(strings.Fields(test.Expectation), strings.Fields(actual), cmpopts.SortSlices(lessFunc)); diff != "" {
 					t.Errorf("unexpected output (-want +got):\n%s", diff)
 				}