[TEST COMMIT] test only, need remove before merge

iQQBot · iQQBot · commit 4f57605a82ec · 2022-12-02T09:28:54.000Z
diff --git a/components/ide-service/pkg/server/server.go b/components/ide-service/pkg/server/server.go
@@ -243,7 +243,8 @@ func (s *IDEServiceServer) resolveReferrerIDE(ideConfig *config.IDEConfig, wsCtx
 }
 
 func (s *IDEServiceServer) ResolveWorkspaceConfig(ctx context.Context, req *api.ResolveWorkspaceConfigRequest) (resp *api.ResolveWorkspaceConfigResponse, err error) {
-	log.WithField("req", req).Debug("receive ResolveWorkspaceConfig request")
+	// TODO: need change to debug, before merge PR
+	log.WithField("req", req).Info("receive ResolveWorkspaceConfig request")
 
 	// make a copy for ref ideConfig, it's safe because we replace ref in update config
 	ideConfig := s.ideConfig
diff --git a/components/server/src/ide-service.ts b/components/server/src/ide-service.ts
@@ -4,9 +4,14 @@
  * See License-AGPL.txt in the project root for license information.
  */
 
-import { JetBrainsConfig, TaskConfig, Workspace } from "@gitpod/gitpod-protocol";
+import { TaskConfig, Workspace } from "@gitpod/gitpod-protocol";
 import { IDEOptions, IDEClient } from "@gitpod/gitpod-protocol/lib/ide-protocol";
-import { IDEServiceClient, IDEServiceDefinition } from "@gitpod/ide-service-api/lib/ide.pb";
+import {
+    IDEServiceClient,
+    IDEServiceDefinition,
+    ResolveWorkspaceConfigRequest,
+    ResolveWorkspaceConfigResponse,
+} from "@gitpod/ide-service-api/lib/ide.pb";
 import { inject, injectable } from "inversify";
 
 export interface IDEConfig {
@@ -37,85 +42,21 @@ export class IDEService {
         }
     }
 
-    resolveGitpodTasks(ws: Workspace): TaskConfig[] {
+    async resolveWorkspaceConfig(req: ResolveWorkspaceConfigRequest): Promise<ResolveWorkspaceConfigResponse> {
+        return this.ideService.resolveWorkspaceConfig(req);
+    }
+
+    resolveGitpodTasks(ws: Workspace, ideConfig: ResolveWorkspaceConfigResponse): TaskConfig[] {
         const tasks: TaskConfig[] = [];
         if (ws.config.tasks) {
             tasks.push(...ws.config.tasks);
         }
-        // TODO(ak) it is a hack to get users going, we should rather layer JB products on prebuild workspaces and move logic to corresponding images
-        if (ws.type === "prebuild" && ws.config.jetbrains) {
-            let warmUp = "";
-            for (const key in ws.config.jetbrains) {
-                let productCode;
-                if (key === "intellij") {
-                    productCode = "IIU";
-                } else if (key === "goland") {
-                    productCode = "GO";
-                } else if (key === "pycharm") {
-                    productCode = "PCP";
-                } else if (key === "phpstorm") {
-                    productCode = "PS";
-                } else if (key === "rubymine") {
-                    productCode = "RM";
-                } else if (key === "webstorm") {
-                    productCode = "WS";
-                } else if (key === "rider") {
-                    productCode = "RD";
-                } else if (key === "clion") {
-                    productCode = "CL";
-                }
-                const prebuilds = productCode && ws.config.jetbrains[key as keyof JetBrainsConfig]?.prebuilds;
-                if (prebuilds) {
-                    warmUp +=
-                        prebuilds.version === "latest"
-                            ? ""
-                            : `
-echo 'warming up stable release of ${key}...'
-echo 'downloading stable ${key} backend...'
-mkdir /tmp/backend
-curl -sSLo /tmp/backend/backend.tar.gz "https://download.jetbrains.com/product?type=release&distribution=linux&code=${productCode}"
-tar -xf /tmp/backend/backend.tar.gz --strip-components=1 --directory /tmp/backend
-
-echo 'configuring JB system config and caches aligned with runtime...'
-printf '\nshared.indexes.download.auto.consent=true' >> "/tmp/backend/bin/idea.properties"
-unset JAVA_TOOL_OPTIONS
-export IJ_HOST_CONFIG_BASE_DIR=/workspace/.config/JetBrains
-export IJ_HOST_SYSTEM_BASE_DIR=/workspace/.cache/JetBrains
-
-echo 'running stable ${key} backend in warmup mode...'
-/tmp/backend/bin/remote-dev-server.sh warmup "$GITPOD_REPO_ROOT"
-
-echo 'removing stable ${key} backend...'
-rm -rf /tmp/backend
-`;
-                    warmUp +=
-                        prebuilds.version === "stable"
-                            ? ""
-                            : `
-echo 'warming up latest release of ${key}...'
-echo 'downloading latest ${key} backend...'
-mkdir /tmp/backend-latest
-curl -sSLo /tmp/backend-latest/backend-latest.tar.gz "https://download.jetbrains.com/product?type=release,eap,rc&distribution=linux&code=${productCode}"
-tar -xf /tmp/backend-latest/backend-latest.tar.gz --strip-components=1 --directory /tmp/backend-latest
-
-echo 'configuring JB system config and caches aligned with runtime...'
-printf '\nshared.indexes.download.auto.consent=true' >> "/tmp/backend-latest/bin/idea.properties"
-unset JAVA_TOOL_OPTIONS
-export IJ_HOST_CONFIG_BASE_DIR=/workspace/.config/JetBrains-latest
-export IJ_HOST_SYSTEM_BASE_DIR=/workspace/.cache/JetBrains-latest
-
-echo 'running ${key} backend in warmup mode...'
-/tmp/backend-latest/bin/remote-dev-server.sh warmup "$GITPOD_REPO_ROOT"
-
-echo 'removing latest ${key} backend...'
-rm -rf /tmp/backend-latest
-`;
-                }
-            }
-            if (warmUp) {
-                tasks.push({
-                    init: warmUp.trim(),
-                });
+        if (ideConfig.tasks) {
+            try {
+                let ideTasks: TaskConfig[] = JSON.parse(ideConfig.tasks);
+                tasks.push(...ideTasks);
+            } catch (e) {
+                console.error("failed get tasks from ide config:", e);
             }
         }
         return tasks;
diff --git a/components/server/src/workspace/workspace-starter.spec.ts b/components/server/src/workspace/workspace-starter.spec.ts
@@ -5,9 +5,8 @@
  */
 
 import { User } from "@gitpod/gitpod-protocol";
-import { IDEOption, IDEOptions } from "@gitpod/gitpod-protocol/lib/ide-protocol";
 import * as chai from "chai";
-import { migrationIDESettings, chooseIDE } from "./workspace-starter";
+import { migrationIDESettings } from "./workspace-starter";
 const expect = chai.expect;
 
 describe("workspace-starter", function () {
@@ -150,118 +149,4 @@ describe("workspace-starter", function () {
             expect(result?.useLatestVersion ?? false).to.be.true;
         });
     });
-    describe("chooseIDE", async function () {
-        const baseOpt: IDEOption = {
-            title: "title",
-            type: "desktop",
-            logo: "",
-            image: "image",
-            latestImage: "latestImage",
-        };
-        const ideOptions: IDEOptions = {
-            options: {
-                code: Object.assign({}, baseOpt, { type: "browser" }),
-                goland: Object.assign({}, baseOpt),
-                "code-desktop": Object.assign({}, baseOpt),
-                "no-latest": Object.assign({}, baseOpt),
-            },
-            defaultIde: "code",
-            defaultDesktopIde: "code-desktop",
-        };
-        delete ideOptions.options["no-latest"].latestImage;
-
-        it("code with latest", function () {
-            const useLatest = true;
-            const hasPerm = false;
-            const result = chooseIDE("code", ideOptions, useLatest, hasPerm);
-            expect(result.ideImage).to.equal(ideOptions.options["code"].latestImage);
-        });
-
-        it("code without latest", function () {
-            const useLatest = false;
-            const hasPerm = false;
-            const result = chooseIDE("code", ideOptions, useLatest, hasPerm);
-            expect(result.ideImage).to.equal(ideOptions.options["code"].image);
-        });
-
-        it("desktop ide with latest", function () {
-            const useLatest = true;
-            const hasPerm = false;
-            const result = chooseIDE("code-desktop", ideOptions, useLatest, hasPerm);
-            expect(result.ideImage).to.equal(ideOptions.options["code"].latestImage);
-            expect(result.desktopIdeImage).to.equal(ideOptions.options["code-desktop"].latestImage);
-        });
-
-        it("desktop ide (JetBrains) without latest", function () {
-            const useLatest = false;
-            const hasPerm = false;
-            const result = chooseIDE("goland", ideOptions, useLatest, hasPerm);
-            expect(result.ideImage).to.equal(ideOptions.options["code"].image);
-            expect(result.desktopIdeImage).to.equal(ideOptions.options["goland"].image);
-        });
-
-        it("desktop ide with no latest image", function () {
-            const useLatest = true;
-            const hasPerm = false;
-            const result = chooseIDE("no-latest", ideOptions, useLatest, hasPerm);
-            expect(result.ideImage).to.equal(ideOptions.options["code"].latestImage);
-            expect(result.desktopIdeImage).to.equal(ideOptions.options["no-latest"].image);
-        });
-
-        it("unknown ide with custom permission should be unknown", function () {
-            const customOptions = Object.assign({}, ideOptions);
-            customOptions.options["unknown-custom"] = {
-                title: "unknown title",
-                type: "browser",
-                logo: "",
-                image: "",
-            };
-            const useLatest = true;
-            const hasPerm = true;
-            const result = chooseIDE("unknown-custom", customOptions, useLatest, hasPerm);
-            expect(result.ideImage).to.equal("unknown-custom");
-        });
-
-        it("unknown desktop ide with custom permission desktop should be unknown", function () {
-            const customOptions = Object.assign({}, ideOptions);
-            customOptions.options["unknown-custom"] = {
-                title: "unknown title",
-                type: "desktop",
-                logo: "",
-                image: "",
-            };
-            const useLatest = true;
-            const hasPerm = true;
-            const result = chooseIDE("unknown-custom", customOptions, useLatest, hasPerm);
-            expect(result.desktopIdeImage).to.equal("unknown-custom");
-        });
-
-        it("unknown browser ide without custom permission should fallback to code", function () {
-            const customOptions = Object.assign({}, ideOptions);
-            customOptions.options["unknown-custom"] = {
-                title: "unknown title",
-                type: "browser",
-                logo: "",
-                image: "",
-            };
-            const useLatest = true;
-            const hasPerm = false;
-            const result = chooseIDE("unknown-custom", customOptions, useLatest, hasPerm);
-            expect(result.ideImage).to.equal(ideOptions.options["code"].latestImage);
-        });
-
-        it("not exists ide with custom permission", function () {
-            const useLatest = true;
-            const hasPerm = true;
-            const result = chooseIDE("not-exists", ideOptions, useLatest, hasPerm);
-            expect(result.ideImage).to.equal(ideOptions.options["code"].latestImage);
-        });
-
-        it("not exists ide with custom permission", function () {
-            const useLatest = true;
-            const hasPerm = false;
-            const result = chooseIDE("not-exists", ideOptions, useLatest, hasPerm);
-            expect(result.ideImage).to.equal(ideOptions.options["code"].latestImage);
-        });
-    });
 });
diff --git a/components/server/src/workspace/workspace-starter.ts b/components/server/src/workspace/workspace-starter.ts

Original file line number	Diff line number	Diff line change
`@@ -243,7 +243,8 @@ func (s IDEServiceServer) resolveReferrerIDE(ideConfig config.IDEConfig, wsCtx`
`243`	`243`	`}`
`244`	`244`
`245`	`245`	`func (s IDEServiceServer) ResolveWorkspaceConfig(ctx context.Context, req api.ResolveWorkspaceConfigRequest) (resp *api.ResolveWorkspaceConfigResponse, err error) {`
`246`		`- log.WithField("req", req).Debug("receive ResolveWorkspaceConfig request")`
	`246`	`+ // TODO: need change to debug, before merge PR`
	`247`	`+ log.WithField("req", req).Info("receive ResolveWorkspaceConfig request")`
`247`	`248`
`248`	`249`	`// make a copy for ref ideConfig, it's safe because we replace ref in update config`
`249`	`250`	`ideConfig := s.ideConfig`