fix: add testdata to BUILD.yaml & rename variable

components/ide/jetbrains/image/status/BUILD.yaml

@@ -2,6 +2,7 @@ packages:
   - name: app
     type: go
     srcs:
+      - "testdata/**"
       - "**/*.go"
       - "go.mod"
       - "go.sum"

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

@@ -79,7 +79,7 @@ func main() {
 	repoRoot := wsInfo.GetCheckoutLocation()
 	gitpodConfig, err := parseGitpodConfig(repoRoot)
 	if err != nil {
-		log.WithError(err).Error("parse .gitpod.yml failed")
+		log.WithError(err).Error("failed to parse .gitpod.yml")
 	}
 	version_2022_1, _ := version.NewVersion("2022.1")
 	if version_2022_1.LessThanOrEqual(backendVersion) {
@@ -370,13 +370,13 @@ func updateVMOptions(config *gitpod.GitpodConfig, alias string, content string)
 		vmoptions = deduplicateVMOption(vmoptions, userVMOptions, filterFunc)
 	}
 
-	// user-defined vmoptions (.gitpod.yml)
+	// project-defined vmoptions (.gitpod.yml)
 	if config != nil {
 		productConfig := getProductConfig(config, alias)
 		if productConfig != nil {
-			userVMOptions = strings.Fields(productConfig.VMOptions)
-			if len(userVMOptions) > 0 {
-				vmoptions = deduplicateVMOption(vmoptions, userVMOptions, filterFunc)
+			projectVMOptions := strings.Fields(productConfig.VMOptions)
+			if len(projectVMOptions) > 0 {
+				vmoptions = deduplicateVMOption(vmoptions, projectVMOptions, filterFunc)
 			}
 		}
 	}

components/ide/jetbrains/image/status/testdata/.gitpod.yml

@@ -1,3 +1,7 @@
+# Copyright (c) 2022 Gitpod GmbH. All rights reserved.
+# Licensed under the GNU Affero General Public License (AGPL).
+# See License-AGPL.txt in the project root for license information.
+
 # see https://github.com/gitpod-io/spring-petclinic/blob/master/.gitpod.yml
 tasks:
   - init: ./mvnw package -DskipTests
@@ -24,4 +28,4 @@ jetbrains:
       version: both
     vmoptions: "-Xmx3g"
   goland:
-    vmoptions: "-Xmx4096m -XX:MaxRAMPercentage=75"
+    vmoptions: "-Xmx4096m -XX:MaxRAMPercentage=75"