[code] Pass GITPOD_CODE_HOST when starting vscode server (#18730)

* Pass GITPOD_CODE_HOST when starting vscode server

* 🧹

* Fix

Author: jeanp413

WORKSPACE.yaml

@@ -7,8 +7,8 @@ defaultArgs:
   publishToNPM: true
   publishToJBMarketplace: true
   localAppVersion: unknown
-  codeCommit: 7a889d86d94c160fa1a4cab832cdbcf45eac0f88
-  codeVersion: 1.82.2
+  codeCommit: 8bcdbe5e6e097191649984c8329af15a3e6b3066
+  codeVersion: 1.83.0
   codeQuality: stable
   noVerifyJBPlugin: false
   intellijDownloadUrl: "https://download.jetbrains.com/idea/ideaIU-2023.2.2.tar.gz"

components/ide/code/codehelper/main.go

@@ -61,14 +61,21 @@ func main() {
 	}
 	phaseDone()
 
+	url, err := url.Parse(wsInfo.GitpodHost)
+	if err != nil {
+		log.WithError(err).Errorf("failed to parse GitpodHost %s", wsInfo.GitpodHost)
+		return
+	}
+	domain := url.Hostname()
+
 	if wsInfo.DebugWorkspaceType != supervisor.DebugWorkspaceType_noDebug {
 		// TODO actually should be performed always
 		// the better way would be to apply replacements during a workspace start
 		// to aling with content in blobserve
-		if err := prepareWebWorkbenchMain(wsInfo); err != nil {
+		if err := prepareWebWorkbenchMain(domain); err != nil {
 			log.WithError(err).Error("failed to prepare web workbench")
 		}
-		if err := prepareServerMain(wsInfo); err != nil {
+		if err := prepareServerMain(domain); err != nil {
 			log.WithError(err).Error("failed to prepare server")
 		}
 	}
@@ -132,8 +139,9 @@ func main() {
 	args = append(args, os.Args[1:]...)
 	args = append(args, "--do-not-sync")
 	args = append(args, "--start-server")
+	cmdEnv := append(os.Environ(), fmt.Sprintf("GITPOD_CODE_HOST=%s", domain))
 	log.WithField("cost", time.Now().Local().Sub(startTime).Milliseconds()).Info("starting server")
-	if err := syscall.Exec(Code, append([]string{"gitpod-code"}, args...), os.Environ()); err != nil {
+	if err := syscall.Exec(Code, append([]string{"gitpod-code"}, args...), cmdEnv); err != nil {
 		log.WithError(err).Error("install ext and start code server failed")
 	}
 }
@@ -246,18 +254,13 @@ func replaceOpenVSXUrl() error {
 
 // TODO it is be applied as well by blobserve if served for regular workspace location
 // reconsider how to configure in all modes, i.e. regular, debug, dev
-func prepareWebWorkbenchMain(wsInfo *supervisor.WorkspaceInfoResponse) error {
+func prepareWebWorkbenchMain(domain string) error {
 	phase := phaseLogging("prepareWebWorkbenchMain")
 	defer phase()
 	b, err := os.ReadFile(WebWorkbenchMainLocation)
 	if err != nil {
 		return errors.New("failed to read " + WebWorkbenchMainLocation + ": " + err.Error())
 	}
-	url, err := url.Parse(wsInfo.GitpodHost)
-	if err != nil {
-		return errors.New("failed to parse " + wsInfo.GitpodHost + ": " + err.Error())
-	}
-	domain := url.Hostname()
 	b = bytes.ReplaceAll(b, []byte("vscode-cdn.net"), []byte(domain))
 	b = bytes.ReplaceAll(b, []byte("ide.gitpod.io/code/markeplace.json"), []byte(fmt.Sprintf("ide.%s/code/marketplace.json", domain)))
 
@@ -269,18 +272,13 @@ func prepareWebWorkbenchMain(wsInfo *supervisor.WorkspaceInfoResponse) error {
 	return nil
 }
 
-func prepareServerMain(wsInfo *supervisor.WorkspaceInfoResponse) error {
+func prepareServerMain(domain string) error {
 	phase := phaseLogging("prepareServerMain")
 	defer phase()
 	b, err := os.ReadFile(ServerMainLocation)
 	if err != nil {
 		return errors.New("failed to read " + ServerMainLocation + ": " + err.Error())
 	}
-	url, err := url.Parse(wsInfo.GitpodHost)
-	if err != nil {
-		return errors.New("failed to parse " + wsInfo.GitpodHost + ": " + err.Error())
-	}
-	domain := url.Hostname()
 	b = bytes.ReplaceAll(b, []byte("https://*.vscode-cdn.net"), []byte(fmt.Sprintf("https://%s https://*.%s", domain, domain)))
 	if err := os.WriteFile(ServerMainLocation, b, 0644); err != nil {
 		return errors.New("failed to write " + ServerMainLocation + ": " + err.Error())

components/ide/code/leeway.Dockerfile

@@ -55,9 +55,7 @@ RUN nameShort=$(jq --raw-output '.nameShort' product.json) && \
     setNameShort="setpath([\"nameShort\"]; \"$nameShort\")" && \
     setNameLong="setpath([\"nameLong\"]; \"$nameLong\")" && \
     setSegmentKey="setpath([\"segmentKey\"]; \"untrusted-dummy-key\")" && \
-    setExtensionsGalleryItemUrl="setpath([\"extensionsGallery\", \"itemUrl\"]; \"{{extensionsGalleryItemUrl}}\")" && \
-    addTrustedDomain=".linkProtectionTrustedDomains += [\"{{trustedDomain}}\"]" && \
-    jqCommands="${setQuality} | ${setNameShort} | ${setNameLong} | ${setSegmentKey} | ${setExtensionsGalleryItemUrl} | ${addTrustedDomain}" && \
+    jqCommands="${setQuality} | ${setNameShort} | ${setNameLong} | ${setSegmentKey}" && \
     cat product.json | jq "${jqCommands}" > product.json.tmp && \
     mv product.json.tmp product.json && \
     jq '{quality,nameLong,nameShort}' product.json
@@ -69,15 +67,10 @@ RUN yarn gulp compile-build \
     && yarn gulp vscode-reh-linux-x64-min-ci
 
 # config for first layer needed by blobserve
-# we also remove `static/` from resource urls as that's needed by blobserve,
 # this custom urls will be then replaced by blobserve.
 # Check pkg/blobserve/blobserve.go, `inlineVars` method
 RUN cp /vscode-web/out/vs/gitpod/browser/workbench/workbench.html /vscode-web/index.html \
     && cp /vscode-web/out/vs/gitpod/browser/workbench/callback.html /vscode-web/callback.html \
-    # TODO: remove next line when workbench.html changes are merged to gp-code/main
-    && sed -i -e 's#static/##g' /vscode-web/index.html \
-    && sed -i -e 's#baseUrl =.*;#baseUrl = window.location.origin;#g' /vscode-web/index.html \
-    && sed -i -e 's#{{WORKBENCH_WEB_BASE_URL}}#.#g' /vscode-web/index.html \
     && sed -i -e "s/{{VERSION}}/$CODE_QUALITY-$CODE_COMMIT/g" /vscode-web/index.html
 
 # cli config: alises to gitpod-code

install/installer/pkg/components/blobserve/configmap.go

@@ -28,7 +28,7 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
 	//nolint:typecheck
 	openVSXProxyUrl := "vsx-proxy-host"
 	if hasOpenVSXProxy {
-		openVSXProxyUrl = fmt.Sprintf("open-vsx.%s", ctx.Config.Domain)
+		openVSXProxyUrl = fmt.Sprintf("https://open-vsx.%s", ctx.Config.Domain)
 	}
 
 	// Check also link below before change values
@@ -49,21 +49,13 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
 						Replacement: ctx.Config.Domain,
 						Path:        "/ide/out/vs/workbench/workbench.web.main.js",
 					}, {
-						Search:      "open-vsx.org",
+						Search:      "https://open-vsx.org",
 						Replacement: openVSXProxyUrl,
 						Path:        "/ide/out/vs/workbench/workbench.web.main.js",
-					}, {
-						Search:      "{{extensionsGalleryItemUrl}}",
-						Replacement: extensionsGalleryItemUrl,
-						Path:        "/ide/out/vs/workbench/workbench.web.api.js",
 					}, {
 						Search:      "{{extensionsGalleryItemUrl}}",
 						Replacement: extensionsGalleryItemUrl,
 						Path:        "/ide/out/vs/workbench/workbench.web.main.js",
-					}, {
-						Search:      "{{trustedDomain}}",
-						Replacement: trustedDomain,
-						Path:        "/ide/out/vs/workbench/workbench.web.api.js",
 					}, {
 						Search:      "{{trustedDomain}}",
 						Replacement: trustedDomain,
@@ -76,20 +68,14 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
 					// TODO consider to provide it as a part of image label or rather inline ${ide} and ${supervisor} in index.html
 					// to decouple blobserve and code image
 					InlineStatic: []blobserve_config.InlineReplacement{{
+						Search:      "{{WORKBENCH_WEB_BASE_URL}}",
+						Replacement: "${ide}",
+					}, {
 						Search:      "window.location.origin;",
 						Replacement: "'${ide}';",
-					}, {
-						Search:      "${window.location.origin}",
-						Replacement: ".",
-					}, {
-						Search:      "value.startsWith(window.location.origin)",
-						Replacement: "value.startsWith(window.location.origin) || value.startsWith('${ide}')",
 					}, {
 						Search:      "./out",
 						Replacement: "${ide}/out",
-					}, {
-						Search:      "./node_modules",
-						Replacement: "${ide}/node_modules",
 					}, {
 						Search:      "/_supervisor/frontend",
 						Replacement: "${supervisor}",