[server] decouple get ide config logic from server

gitpod-io · Sep 27, 2022 · 481267b · 481267b
1 parent 3c7c79b
commit 481267b
Show file tree

Hide file tree

Showing 24 changed files with 79 additions and 294 deletions.
diff --git a/components/server/BUILD.yaml b/components/server/BUILD.yaml
@@ -18,6 +18,7 @@ packages:
       - components/ws-manager-api/typescript:lib
       - components/supervisor-api/typescript-grpcweb:lib
       - components/usage-api/typescript:lib
+      - components/ide-service-api/typescript:lib
     config:
       packaging: offline-mirror
       yarnLock: ${coreYarnLockBase}/yarn.lock
@@ -57,6 +58,7 @@ packages:
       - components/ws-manager-api/typescript:lib
       - components/supervisor-api/typescript-grpcweb:lib
       - components/usage-api/typescript:lib
+      - components/ide-service-api/typescript:lib
       - :dbtest
     config:
       packaging: library
@@ -83,6 +85,7 @@ packages:
       - components/ws-manager-api/typescript:lib
       - components/supervisor-api/typescript-grpcweb:lib
       - components/usage-api/typescript:lib
+      - components/ide-service-api/typescript:lib
     config:
       packaging: library
       yarnLock: ${coreYarnLockBase}/yarn.lock

diff --git a/components/server/ee/src/workspace/workspace-starter.ts b/components/server/ee/src/workspace/workspace-starter.ts
@@ -7,7 +7,7 @@
 import { Workspace, User, WorkspaceInstance, NamedWorkspaceFeatureFlag } from "@gitpod/gitpod-protocol";
 import { TraceContext } from "@gitpod/gitpod-protocol/lib/util/tracing";
 import { injectable } from "inversify";
-import { IDEConfig } from "../../../src/ide-config";
+import { IDEConfig } from "../../../src/ide-service";
 import { WorkspaceStarter } from "../../../src/workspace/workspace-starter";
 
 @injectable()

diff --git a/components/server/leeway.Dockerfile b/components/server/leeway.Dockerfile
@@ -11,9 +11,6 @@ COPY components-server--app /installer/
 WORKDIR /app
 RUN /installer/install.sh
 
-FROM golang:1.17.2 as oci-tool-builder
-RUN go install github.com/csweichel/oci-tool@v0.1.1
-
 FROM node:16.13.0-slim
 ENV NODE_OPTIONS="--unhandled-rejections=warn --max_old_space_size=2048"
 # Using ssh-keygen for RSA keypair generation
@@ -27,7 +24,6 @@ RUN apt-get update && apt-get install -yq \
 
 EXPOSE 3000
 
-COPY --from=oci-tool-builder /go /go/
 ENV PATH="/go/bin:${PATH}"
 
 # '--no-log-init': see https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#user

diff --git a/components/server/package.json b/components/server/package.json
@@ -33,6 +33,7 @@
     "@gitpod/gitpod-messagebus": "0.1.5",
     "@gitpod/gitpod-payment-endpoint": "0.1.5",
     "@gitpod/gitpod-protocol": "0.1.5",
+    "@gitpod/ide-service-api": "0.1.5",
     "@gitpod/image-builder": "0.1.5",
     "@gitpod/licensor": "0.1.5",
     "@gitpod/supervisor-api-grpcweb": "0.1.5",

diff --git a/components/server/src/config.ts b/components/server/src/config.ts
@@ -169,6 +169,12 @@ export interface ConfigSerialized {
      */
     usageServiceAddr: string;
 
+    /**
+     * The address ide service clients connect to
+     * Example: ide-service:9001
+     */
+    ideServiceAddr: string;
+
     codeSync: CodeSyncConfig;
 
     vsxRegistryUrl: string;

diff --git a/components/server/src/container-module.ts b/components/server/src/container-module.ts
@@ -89,7 +89,6 @@ import { ProjectsService } from "./projects/projects-service";
 import { NewsletterSubscriptionController } from "./user/newsletter-subscription-controller";
 import { Config, ConfigFile } from "./config";
 import { defaultGRPCOptions } from "@gitpod/gitpod-protocol/lib/util/grpc";
-import { IDEConfigService } from "./ide-config";
 import { PrometheusClientCallMetrics } from "@gitpod/gitpod-protocol/lib/messaging/client-call-metrics";
 import { IClientCallMetrics } from "@gitpod/gitpod-protocol/lib/util/grpc";
 import { DebugApp } from "@gitpod/gitpod-protocol/lib/util/debug-app";
@@ -111,10 +110,10 @@ import {
 import { VerificationService } from "./auth/verification-service";
 import { WebhookEventGarbageCollector } from "./projects/webhook-event-garbage-collector";
 import { LivenessController } from "./liveness/liveness-controller";
+import { IDEServiceClient, IDEServiceDefinition } from "@gitpod/ide-service-api/lib/ide.pb";
 
 export const productionContainerModule = new ContainerModule((bind, unbind, isBound, rebind) => {
     bind(Config).toConstantValue(ConfigFile.fromFile());
-    bind(IDEConfigService).toSelf().inSingletonScope();
     bind(IDEService).toSelf().inSingletonScope();
 
     bind(UserService).toSelf().inSingletonScope();
@@ -270,6 +269,11 @@ export const productionContainerModule = new ContainerModule((bind, unbind, isBo
         return createClient(BillingServiceDefinition, createChannel(config.usageServiceAddr));
     });
 
+    bind<IDEServiceClient>(IDEServiceDefinition.name).toDynamicValue((ctx) => {
+        const config = ctx.container.get<Config>(Config);
+        return createClient(IDEServiceDefinition, createChannel(config.ideServiceAddr));
+    });
+
     bind(EntitlementService).to(CommunityEntitlementService).inSingletonScope();
 
     bind(ConfigCatClientFactory)

diff --git a/components/server/src/ide-config.ts b/components/server/src/ide-config.ts