[server/dash] Remove license RPCs/view WEB-214 (#17342)

easyCZ · web-flow · commit eb2ceadb76f5 · 2023-04-24T22:29:45.000+08:00
* [server/dash] Remove license RPCs/view

* remove licence refs

* Fix

* fix
diff --git a/components/dashboard/src/admin/License.tsx b/components/dashboard/src/admin/License.tsx
diff --git a/components/dashboard/src/admin/admin.routes.ts b/components/dashboard/src/admin/admin.routes.ts
@@ -42,9 +42,5 @@ export function getAdminSettingsMenu() {
             title: "General",
             link: ["/admin/settings"],
         },
-        {
-            title: "License",
-            link: ["/admin/license"],
-        },
     ];
 }
diff --git a/components/dashboard/src/app/AppRoutes.tsx b/components/dashboard/src/app/AppRoutes.tsx
@@ -86,7 +86,6 @@ const WorkspacesSearch = React.lazy(() => import(/* webpackPrefetch: true */ "..
 const AdminSettings = React.lazy(() => import(/* webpackPrefetch: true */ "../admin/Settings"));
 const ProjectsSearch = React.lazy(() => import(/* webpackPrefetch: true */ "../admin/ProjectsSearch"));
 const TeamsSearch = React.lazy(() => import(/* webpackPrefetch: true */ "../admin/TeamsSearch"));
-const License = React.lazy(() => import(/* webpackPrefetch: true */ "../admin/License"));
 const Usage = React.lazy(() => import(/* webpackPrefetch: true */ "../Usage"));
 const UserOnboarding = React.lazy(() => import(/* webpackPrefetch: true */ "../onboarding/UserOnboarding"));
 
@@ -224,7 +223,6 @@ export const AppRoutes = () => {
                     <AdminRoute path="/admin/workspaces" component={WorkspacesSearch} />
                     <AdminRoute path="/admin/projects" component={ProjectsSearch} />
                     <AdminRoute path="/admin/blocked-repositories" component={BlockedRepositories} />
-                    <AdminRoute path="/admin/license" component={License} />
                     <AdminRoute path="/admin/settings" component={AdminSettings} />
 
                     <Route path={["/", "/login"]} exact>
diff --git a/components/dashboard/src/index.tsx b/components/dashboard/src/index.tsx
@@ -20,7 +20,6 @@ import { ConfettiContextProvider } from "./contexts/ConfettiContext";
 import { FeatureFlagContextProvider } from "./contexts/FeatureFlagContext";
 import { setupQueryClientProvider } from "./data/setup";
 import "./index.css";
-import { LicenseContextProvider } from "./license-context";
 import { PaymentContextProvider } from "./payment-context";
 import { ProjectContextProvider } from "./projects/project-context";
 import { ThemeContextProvider } from "./theme-context";
@@ -68,19 +67,17 @@ const bootApp = () => {
                                 <UserContextProvider>
                                     <AdminContextProvider>
                                         <PaymentContextProvider>
-                                            <LicenseContextProvider>
-                                                <ProjectContextProvider>
-                                                    <ThemeContextProvider>
-                                                        <BrowserRouter>
-                                                            <StartWorkspaceModalContextProvider>
-                                                                <FeatureFlagContextProvider>
-                                                                    <App />
-                                                                </FeatureFlagContextProvider>
-                                                            </StartWorkspaceModalContextProvider>
-                                                        </BrowserRouter>
-                                                    </ThemeContextProvider>
-                                                </ProjectContextProvider>
-                                            </LicenseContextProvider>
+                                            <ProjectContextProvider>
+                                                <ThemeContextProvider>
+                                                    <BrowserRouter>
+                                                        <StartWorkspaceModalContextProvider>
+                                                            <FeatureFlagContextProvider>
+                                                                <App />
+                                                            </FeatureFlagContextProvider>
+                                                        </StartWorkspaceModalContextProvider>
+                                                    </BrowserRouter>
+                                                </ThemeContextProvider>
+                                            </ProjectContextProvider>
                                         </PaymentContextProvider>
                                     </AdminContextProvider>
                                 </UserContextProvider>
diff --git a/components/dashboard/src/license-context.tsx b/components/dashboard/src/license-context.tsx
diff --git a/components/gitpod-protocol/src/gitpod-service.ts b/components/gitpod-protocol/src/gitpod-service.ts
@@ -51,7 +51,6 @@ import { AdminServer } from "./admin-protocol";
 import { GitpodHostUrl } from "./util/gitpod-host-url";
 import { WebSocketConnectionProvider } from "./messaging/browser/connection";
 import { PermissionName } from "./permission";
-import { LicenseService } from "./license-protocol";
 import { Emitter } from "./util/event";
 import { RemotePageMessage, RemoteTrackMessage, RemoteIdentifyMessage } from "./analytics";
 import { IDEServer } from "./ide-protocol";
@@ -73,7 +72,7 @@ export interface GitpodClient {
 }
 
 export const GitpodServer = Symbol("GitpodServer");
-export interface GitpodServer extends JsonRpcServer<GitpodClient>, AdminServer, LicenseService, IDEServer {
+export interface GitpodServer extends JsonRpcServer<GitpodClient>, AdminServer, IDEServer {
     // User related API
     getLoggedInUser(): Promise<User>;
     updateLoggedInUser(user: Partial<User>): Promise<User>;
diff --git a/components/gitpod-protocol/src/index.ts b/components/gitpod-protocol/src/index.ts
@@ -9,7 +9,6 @@ export * from "./gitpod-service";
 export * from "./util/disposable";
 export * from "./util/event";
 export * from "./util/queue";
-export * from "./license-protocol";
 export * from "./workspace-instance";
 export * from "./permission";
 export * from "./admin-protocol";
diff --git a/components/gitpod-protocol/src/license-protocol.ts b/components/gitpod-protocol/src/license-protocol.ts
diff --git a/components/server/ee/src/workspace/gitpod-server-impl.ts b/components/server/ee/src/workspace/gitpod-server-impl.ts
@@ -41,7 +41,6 @@ import {
 } from "@gitpod/ws-manager/lib";
 import { ErrorCodes } from "@gitpod/gitpod-protocol/lib/messaging/error";
 import { log, LogContext } from "@gitpod/gitpod-protocol/lib/util/logging";
-import { LicenseValidationResult } from "@gitpod/gitpod-protocol/lib/license-protocol";
 import { PrebuildManager } from "../prebuilds/prebuild-manager";
 import { GuardedCostCenter, ResourceAccessGuard, ResourceAccessOp } from "../../../src/auth/resource-access";
 import { CostCenterJSON, ListUsageRequest, ListUsageResponse } from "@gitpod/gitpod-protocol/lib/usage";
@@ -193,10 +192,6 @@ export class GitpodServerEEImpl extends GitpodServerImpl {
         }
     }
 
-    async validateLicense(ctx: TraceContext): Promise<LicenseValidationResult> {
-        return { valid: true };
-    }
-
     goDurationToHumanReadable(goDuration: string): string {
         const [, value, unit] = goDuration.match(/^(\d+)([mh])$/)!;
         let duration = parseInt(value);
diff --git a/components/server/src/auth/rate-limiter.ts b/components/server/src/auth/rate-limiter.ts
@@ -158,7 +158,6 @@ const defaultFunctions: FunctionsConfig = {
     adminGetProjectsBySearchTerm: { group: "default", points: 1 },
     adminGetProjectById: { group: "default", points: 1 },
     adminFindPrebuilds: { group: "default", points: 1 },
-    adminGetLicense: { group: "default", points: 1 },
     adminGetSettings: { group: "default", points: 1 },
     adminUpdateSettings: { group: "default", points: 1 },
     adminGetTelemetryData: { group: "default", points: 1 },
@@ -172,9 +171,6 @@ const defaultFunctions: FunctionsConfig = {
     adminAddUsageCreditNote: { group: "default", points: 1 },
     adminGetUsageBalance: { group: "default", points: 1 },
 
-    validateLicense: { group: "default", points: 1 },
-    getLicenseInfo: { group: "default", points: 1 },
-
     accessCodeSyncStorage: { group: "default", points: 1 },
 
     accessHeadlessLogs: { group: "default", points: 1 },
diff --git a/components/server/src/workspace/gitpod-server-impl.ts b/components/server/src/workspace/gitpod-server-impl.ts
@@ -88,11 +88,6 @@ import {
     AdminModifyRoleOrPermissionRequest,
     WorkspaceAndInstance,
 } from "@gitpod/gitpod-protocol/lib/admin-protocol";
-import {
-    GetLicenseInfoResult,
-    LicenseInfo,
-    LicenseValidationResult,
-} from "@gitpod/gitpod-protocol/lib/license-protocol";
 import { GitpodFileParser } from "@gitpod/gitpod-protocol/lib/gitpod-file-parser";
 import { ErrorCodes } from "@gitpod/gitpod-protocol/lib/messaging/error";
 import { Cancelable } from "@gitpod/gitpod-protocol/lib/util/cancelable";
@@ -3252,22 +3247,6 @@ export class GitpodServerImpl implements GitpodServerWithTracing, Disposable {
         return await this.telemetryDataProvider.getTelemetryData();
     }
 
-    async getLicenseInfo(): Promise<GetLicenseInfoResult> {
-        throw new ResponseError(ErrorCodes.EE_FEATURE, `Licensing is implemented in Gitpod's Enterprise Edition`);
-    }
-
-    async adminGetLicense(ctx: TraceContext): Promise<LicenseInfo> {
-        traceAPIParams(ctx, {});
-
-        await this.guardAdminAccess("adminGetLicense", {}, Permission.ADMIN_API);
-
-        const userCount = await this.userDB.getUserCount(true);
-
-        return {
-            userCount: userCount,
-        };
-    }
-
     protected censorUser(user: User): User {
         const res = { ...user };
         delete res.additionalData;
@@ -3283,10 +3262,6 @@ export class GitpodServerImpl implements GitpodServerWithTracing, Disposable {
         return res;
     }
 
-    async validateLicense(ctx: TraceContext): Promise<LicenseValidationResult> {
-        throw new ResponseError(ErrorCodes.EE_FEATURE, `Licensing is implemented in Gitpod's Enterprise Edition`);
-    }
-
     async getOwnAuthProviders(ctx: TraceContext): Promise<AuthProviderEntry[]> {
         const redacted = (entry: AuthProviderEntry) => AuthProviderEntry.redact(entry);
         let userId: string;
diff --git a/install/installer/pkg/config/v1/config.md b/install/installer/pkg/config/v1/config.md
@@ -78,8 +78,6 @@ Config defines the v1 version structure of the gitpod config file
 |`authProviders[ ].name`|string|Y|  ||
 |`blockNewUsers.enabled`|bool|N|  ||
 |`blockNewUsers.passlist[ ]`|[]string|N|  |  Passlist []string `json:"passlist" validate:"min=1,unique,dive,fqdn"`|
-|`license.kind`|string|N| `secret` ||
-|`license.name`|string|Y|  ||
 |`sshGatewayHostKey.kind`|string|N| `secret` ||
 |`sshGatewayHostKey.name`|string|Y|  ||
 |`disableDefinitelyGp`|bool|N|  ||
diff --git a/install/installer/pkg/config/v1/testdata/envvars/config-options/envvars.yaml b/install/installer/pkg/config/v1/testdata/envvars/config-options/envvars.yaml
@@ -6,7 +6,6 @@ envvars:
   DOMAIN: test.gitpod.io
   DISTRIBUTION: distribution-name
   HTTP_PROXY_NAME: http-proxy-settings
-  LICENSE_NAME: gitpod-license
   LOCAL_REGISTRY_ADDRESS: mylocalregistry.com
   IMAGE_PULL_SECRET_NAME: image-pull-secret
   OPEN_VSX_URL: https://my-openvsx.com
diff --git a/install/installer/pkg/config/v1/testdata/envvars/config-options/expect.yaml b/install/installer/pkg/config/v1/testdata/envvars/config-options/expect.yaml
@@ -12,9 +12,6 @@ domain: test.gitpod.io
 httpProxy:
   kind: secret
   name: http-proxy-settings
-license:
-  kind: secret
-  name: gitpod-license
 openVSX:
   url: https://my-openvsx.com
 sshGatewayHostKey:
diff --git a/install/kots/manifests/gitpod-kots-config.yaml b/install/kots/manifests/gitpod-kots-config.yaml
@@ -24,7 +24,6 @@ data:
 
   # Secret names
   HTTP_PROXY_NAME: '{{repl if (ConfigOptionEquals "enable_proxy_settings" "1" ) }}http-proxy-settings{{repl end }}'
-  LICENSE_NAME: gitpod-license
   SSH_GATEWAY_HOST_KEY_NAME: ssh-gateway-host-key
 
   # Database settings
diff --git a/install/kots/manifests/gitpod-license.yaml b/install/kots/manifests/gitpod-license.yaml
