[server] fix API contribution bindings

Author: akosyakov

components/server/src/api/server.ts

@@ -14,7 +14,7 @@ import { UserService as UserServiceDefinition } from "@gitpod/public-api/lib/git
 import { WorkspacesService as WorkspacesServiceDefinition } from "@gitpod/public-api/lib/gitpod/experimental/v1/workspaces_connectweb";
 import express from "express";
 import * as http from "http";
-import { inject, injectable } from "inversify";
+import { inject, injectable, interfaces } from "inversify";
 import { AddressInfo } from "net";
 import { APIHelloService } from "./dummy";
 import { APIStatsService } from "./stats";
@@ -65,4 +65,13 @@ export class API {
         );
         return router;
     }
+
+    static contribute(bind: interfaces.Bind): void {
+        bind(APIHelloService).toSelf().inSingletonScope();
+        bind(APIUserService).toSelf().inSingletonScope();
+        bind(APITeamsService).toSelf().inSingletonScope();
+        bind(APIWorkspacesService).toSelf().inSingletonScope();
+        bind(APIStatsService).toSelf().inSingletonScope();
+        bind(API).toSelf().inSingletonScope();
+    }
 }

components/server/src/api/teams.spec.db.ts

@@ -3,27 +3,23 @@
  * Licensed under the GNU Affero General Public License (AGPL).
  * See License.AGPL.txt in the project root for license information.
  */
-import { suite, test, timeout } from "@testdeck/mocha";
-import { APIUserService } from "./user";
-import { Container } from "inversify";
-import { TeamDB, TypeORM, UserDB, testContainer } from "@gitpod/gitpod-db/lib";
-import { API } from "./server";
-import * as http from "http";
-import { createConnectTransport } from "@bufbuild/connect-node";
 import { Code, ConnectError, PromiseClient, createPromiseClient } from "@bufbuild/connect";
-import { AddressInfo } from "net";
+import { createConnectTransport } from "@bufbuild/connect-node";
+import { Timestamp } from "@bufbuild/protobuf";
+import { TeamDB, TypeORM, UserDB, testContainer } from "@gitpod/gitpod-db/lib";
+import { DBTeam } from "@gitpod/gitpod-db/lib/typeorm/entity/db-team";
 import { TeamsService as TeamsServiceDefinition } from "@gitpod/public-api/lib/gitpod/experimental/v1/teams_connectweb";
-import { UserAuthentication } from "../user/user-authentication";
-import { APITeamsService } from "./teams";
-import { v4 as uuidv4 } from "uuid";
-import * as chai from "chai";
 import { GetTeamRequest, Team, TeamMember, TeamRole } from "@gitpod/public-api/lib/gitpod/experimental/v1/teams_pb";
-import { DBTeam } from "@gitpod/gitpod-db/lib/typeorm/entity/db-team";
+import { suite, test, timeout } from "@testdeck/mocha";
+import * as chai from "chai";
+import * as http from "http";
+import { Container } from "inversify";
+import { AddressInfo } from "net";
 import { Connection } from "typeorm";
-import { Timestamp } from "@bufbuild/protobuf";
-import { APIWorkspacesService } from "./workspaces";
-import { APIStatsService } from "./stats";
+import { v4 as uuidv4 } from "uuid";
+import { UserAuthentication } from "../user/user-authentication";
 import { WorkspaceService } from "../workspace/workspace-service";
+import { API } from "./server";
 
 const expect = chai.expect;
 
@@ -37,11 +33,7 @@ export class APITeamsServiceSpec {
 
     async before() {
         this.container = testContainer.createChild();
-        this.container.bind(API).toSelf().inSingletonScope();
-        this.container.bind(APIUserService).toSelf().inSingletonScope();
-        this.container.bind(APITeamsService).toSelf().inSingletonScope();
-        this.container.bind(APIWorkspacesService).toSelf().inSingletonScope();
-        this.container.bind(APIStatsService).toSelf().inSingletonScope();
+        API.contribute(this.container.bind.bind(this.container));
 
         this.container.bind(WorkspaceService).toConstantValue({} as WorkspaceService);
         this.container.bind(UserAuthentication).toConstantValue({} as UserAuthentication);

components/server/src/container-module.ts

@@ -6,6 +6,7 @@
 
 import { ContainerModule } from "inversify";
 
+import { RedisPublisher, newRedisClient } from "@gitpod/gitpod-db/lib";
 import { IAnalyticsWriter } from "@gitpod/gitpod-protocol/lib/analytics";
 import { GitpodFileParser } from "@gitpod/gitpod-protocol/lib/gitpod-file-parser";
 import { PrometheusClientCallMetrics } from "@gitpod/gitpod-protocol/lib/messaging/client-call-metrics";
@@ -32,8 +33,10 @@ import {
     WorkspaceManagerClientProviderSource,
 } from "@gitpod/ws-manager/lib/client-provider-source";
 import * as grpc from "@grpc/grpc-js";
+import { Redis } from "ioredis";
 import { createChannel, createClient, createClientFactory } from "nice-grpc";
 import { retryMiddleware } from "nice-grpc-client-middleware-retry";
+import { APIHelloService } from "./api/dummy";
 import { API } from "./api/server";
 import { APIStatsService } from "./api/stats";
 import { APITeamsService } from "./api/teams";
@@ -50,10 +53,14 @@ import { AuthJWT, SignInJWT } from "./auth/jwt";
 import { LoginCompletionHandler } from "./auth/login-completion-handler";
 import { VerificationService } from "./auth/verification-service";
 import { Authorizer, createInitializingAuthorizer } from "./authorization/authorizer";
+import { RelationshipUpdater } from "./authorization/relationship-updater";
+import { RelationshipUpdateJob } from "./authorization/relationship-updater-job";
 import { SpiceDBClientProvider, spiceDBConfigFromEnv } from "./authorization/spicedb";
+import { SpiceDBAuthorizer } from "./authorization/spicedb-authorizer";
 import { BillingModes } from "./billing/billing-mode";
 import { EntitlementService, EntitlementServiceImpl } from "./billing/entitlement-service";
 import { EntitlementServiceUBP } from "./billing/entitlement-service-ubp";
+import { StripeService } from "./billing/stripe-service";
 import { BitbucketAppSupport } from "./bitbucket/bitbucket-app-support";
 import { CodeSyncService } from "./code-sync/code-sync-service";
 import { Config, ConfigFile } from "./config";
@@ -71,9 +78,12 @@ import { WebhookEventGarbageCollector } from "./jobs/webhook-gc";
 import { WorkspaceGarbageCollector } from "./jobs/workspace-gc";
 import { LinkedInService } from "./linkedin-service";
 import { LivenessController } from "./liveness/liveness-controller";
+import { RedisSubscriber } from "./messaging/redis-subscriber";
 import { MonitoringEndpointsApp } from "./monitoring-endpoints";
 import { OAuthController } from "./oauth-server/oauth-controller";
 import { OneTimeSecretServer } from "./one-time-secret-server";
+import { OrganizationService } from "./orgs/organization-service";
+import { UsageService } from "./orgs/usage-service";
 import { BitbucketApp } from "./prebuilds/bitbucket-app";
 import { BitbucketServerApp } from "./prebuilds/bitbucket-server-app";
 import { GithubApp } from "./prebuilds/github-app";
@@ -85,20 +95,23 @@ import { PrebuildManager } from "./prebuilds/prebuild-manager";
 import { PrebuildStatusMaintainer } from "./prebuilds/prebuilt-status-maintainer";
 import { StartPrebuildContextParser } from "./prebuilds/start-prebuild-context-parser";
 import { ProjectsService } from "./projects/projects-service";
+import { ScmService } from "./projects/scm-service";
 import { RedisMutex } from "./redis/mutex";
 import { Server } from "./server";
 import { SessionHandler } from "./session-handler";
 import { ContentServiceStorageClient } from "./storage/content-service-client";
 import { StorageClient } from "./storage/storage-client";
 import { AuthorizationService, AuthorizationServiceImpl } from "./user/authorization-service";
+import { EnvVarService } from "./user/env-var-service";
+import { GitpodTokenService } from "./user/gitpod-token-service";
 import { NewsletterSubscriptionController } from "./user/newsletter-subscription-controller";
-import { StripeService } from "./billing/stripe-service";
+import { SSHKeyService } from "./user/sshkey-service";
 import { TokenProvider } from "./user/token-provider";
 import { TokenService } from "./user/token-service";
-import { UsageService } from "./orgs/usage-service";
+import { UserAuthentication } from "./user/user-authentication";
 import { ServerFactory, UserController } from "./user/user-controller";
 import { UserDeletionService } from "./user/user-deletion-service";
-import { UserAuthentication } from "./user/user-authentication";
+import { UserService } from "./user/user-service";
 import { contentServiceBinder } from "./util/content-service-sugar";
 import { WebsocketConnectionManager } from "./websocket/websocket-connection-manager";
 import { ConfigProvider } from "./workspace/config-provider";
@@ -119,21 +132,8 @@ import { SnapshotService } from "./workspace/snapshot-service";
 import { WorkspaceClusterImagebuilderClientProvider } from "./workspace/workspace-cluster-imagebuilder-client-provider";
 import { WorkspaceDownloadService } from "./workspace/workspace-download-service";
 import { WorkspaceFactory } from "./workspace/workspace-factory";
-import { WorkspaceStarter } from "./workspace/workspace-starter";
-import { SpiceDBAuthorizer } from "./authorization/spicedb-authorizer";
-import { OrganizationService } from "./orgs/organization-service";
-import { RedisSubscriber } from "./messaging/redis-subscriber";
-import { Redis } from "ioredis";
-import { RedisPublisher, newRedisClient } from "@gitpod/gitpod-db/lib";
-import { UserService } from "./user/user-service";
-import { RelationshipUpdater } from "./authorization/relationship-updater";
 import { WorkspaceService } from "./workspace/workspace-service";
-import { SSHKeyService } from "./user/sshkey-service";
-import { GitpodTokenService } from "./user/gitpod-token-service";
-import { EnvVarService } from "./user/env-var-service";
-import { ScmService } from "./projects/scm-service";
-import { RelationshipUpdateJob } from "./authorization/relationship-updater-job";
-import { APIHelloService } from "./api/dummy";
+import { WorkspaceStarter } from "./workspace/workspace-starter";
 
 export const productionContainerModule = new ContainerModule(
     (bind, unbind, isBound, rebind, unbindAsync, onActivation, onDeactivation) => {
@@ -331,6 +331,8 @@ export const productionContainerModule = new ContainerModule(
         bind(RelationshipUpdater).toSelf().inSingletonScope();
 
         // grpc / Connect API
+        API.contribute(bind);
+
         bind(APIHelloService).toSelf().inSingletonScope();
         bind(APIUserService).toSelf().inSingletonScope();
         bind(APITeamsService).toSelf().inSingletonScope();