@gitpod/gitpod-protocol 0.1.5-mp-pat-server-impl.0 → 0.1.5-mp-server-move-admin-endpoints-to-admin-srv.0

package/src/context-url.spec.ts

@@ -41,24 +41,6 @@ export class ContextUrlTest {
         expect(actual?.pathname).to.equal("/gitpod-io/gitpod-test-repo.git");
     }
 
-    @test public parseContextUrl_withPrebuild() {
-        const actual = ContextURL.getNormalizedURL({
-            contextURL: "prebuild/https://github.com/gitpod-io/gitpod-test-repo",
-            context: {},
-        } as WsContextUrl);
-        expect(actual?.host).to.equal("github.com");
-        expect(actual?.pathname).to.equal("/gitpod-io/gitpod-test-repo");
-    }
-
-    @test public parseContextUrl_withPrebuild_withoutSchema() {
-        const actual = ContextURL.getNormalizedURL({
-            contextURL: "prebuild/github.com/gitpod-io/gitpod-test-repo",
-            context: {},
-        } as WsContextUrl);
-        expect(actual?.host).to.equal("github.com");
-        expect(actual?.pathname).to.equal("/gitpod-io/gitpod-test-repo");
-    }
-
     @test public parseContextUrl_badUrl() {
         const actual = ContextURL.getNormalizedURL({ contextURL: "[Object object]", context: {} } as WsContextUrl);
         expect(actual).to.be.undefined;

package/src/context-url.ts

@@ -15,7 +15,6 @@ import { Workspace } from ".";
  * TODO(gpl) See if we can get this into `server` code to remove the burden from clients
  */
 export namespace ContextURL {
-    export const INCREMENTAL_PREBUILD_PREFIX = "incremental-prebuild";
     export const PREBUILD_PREFIX = "prebuild";
     export const IMAGEBUILD_PREFIX = "imagebuild";
     export const SNAPSHOT_PREFIX = "snapshot";
@@ -91,7 +90,6 @@ export namespace ContextURL {
         const firstSegment = segments[0];
         if (
             firstSegment === PREBUILD_PREFIX ||
-            firstSegment === INCREMENTAL_PREBUILD_PREFIX ||
             firstSegment === IMAGEBUILD_PREFIX ||
             firstSegment === SNAPSHOT_PREFIX ||
             firstSegment.startsWith(REFERRER_PREFIX)

package/src/gitpod-service.ts

@@ -58,7 +58,6 @@ import {
 } from "./team-subscription-protocol";
 import { RemotePageMessage, RemoteTrackMessage, RemoteIdentifyMessage } from "./analytics";
 import { IDEServer } from "./ide-protocol";
-import { InstallationAdminSettings, TelemetryData } from "./installation-admin-protocol";
 import { ListUsageRequest, ListUsageResponse, CostCenterJSON } from "./usage";
 import { SupportedWorkspaceClass } from "./workspace-class";
 import { BillingMode } from "./billing-mode";
@@ -175,11 +174,6 @@ export interface GitpodServer extends JsonRpcServer<GitpodClient>, AdminServer,
     resetGenericInvite(inviteId: string): Promise<TeamMembershipInvite>;
     deleteTeam(teamId: string): Promise<void>;
 
-    // Admin Settings
-    adminGetSettings(): Promise<InstallationAdminSettings>;
-    adminUpdateSettings(settings: InstallationAdminSettings): Promise<void>;
-    adminGetTelemetryData(): Promise<TelemetryData>;
-
     // Projects
     getProviderRepositoriesForUser(params: GetProviderRepositoriesParams): Promise<ProviderRepository[]>;
     createProject(params: CreateProjectParams): Promise<Project>;

package/src/messaging/browser/connection.ts

@@ -16,7 +16,6 @@ import ReconnectingWebSocket, { Event } from "reconnecting-websocket";
 export interface WebSocketOptions {
     onerror?: (event: Event) => void;
     onListening?: (socket: ReconnectingWebSocket) => void;
-    subProtocol?: string;
 }
 
 export class WebSocketConnectionProvider {
@@ -63,7 +62,7 @@ export class WebSocketConnectionProvider {
      */
     listen(handler: ConnectionHandler, eventHandler: ConnectionEventHandler, options?: WebSocketOptions): WebSocket {
         const url = handler.path;
-        const webSocket = this.createWebSocket(url, options);
+        const webSocket = this.createWebSocket(url);
 
         const logger = this.createLogger();
         if (options && options.onerror) {
@@ -87,8 +86,8 @@ export class WebSocketConnectionProvider {
     /**
      * Creates a web socket for the given url
      */
-    createWebSocket(url: string, options?: WebSocketOptions): WebSocket {
-        return new ReconnectingWebSocket(url, options?.subProtocol, {
+    createWebSocket(url: string): WebSocket {
+        return new ReconnectingWebSocket(url, undefined, {
             maxReconnectionDelay: 10000,
             minReconnectionDelay: 1000,
             reconnectionDelayGrowFactor: 1.3,

package/src/messaging/error.ts

@@ -35,6 +35,9 @@ export namespace ErrorCodes {
     // 430 Repository not whitelisted (custom status code)
     export const REPOSITORY_NOT_WHITELISTED = 430;
 
+    // 440 Prebuilds now always require a project (custom status code)
+    export const PROJECT_REQUIRED = 440;
+
     // 450 Payment error
     export const PAYMENT_ERROR = 450;
 

package/src/protocol.ts

@@ -293,17 +293,13 @@ export type BillingTier = "paid" | "free";
  */
 export const WorkspaceFeatureFlags = {
     full_workspace_backup: undefined,
-    persistent_volume_claim: undefined,
     workspace_class_limiting: undefined,
     workspace_connection_limiting: undefined,
     workspace_psi: undefined,
 };
 export type NamedWorkspaceFeatureFlag = keyof typeof WorkspaceFeatureFlags;
 export namespace NamedWorkspaceFeatureFlag {
-    export const WORKSPACE_PERSISTED_FEATTURE_FLAGS: NamedWorkspaceFeatureFlag[] = [
-        "full_workspace_backup",
-        "persistent_volume_claim",
-    ];
+    export const WORKSPACE_PERSISTED_FEATTURE_FLAGS: NamedWorkspaceFeatureFlag[] = ["full_workspace_backup"];
     export function isWorkspacePersisted(ff: NamedWorkspaceFeatureFlag): boolean {
         return WORKSPACE_PERSISTED_FEATTURE_FLAGS.includes(ff);
     }
@@ -651,18 +647,6 @@ export interface Snapshot {
     message?: string;
 }
 
-export interface VolumeSnapshot {
-    id: string;
-    workspaceId: string;
-    creationTime: string;
-    volumeHandle: string;
-}
-
-export interface VolumeSnapshotWithWSType {
-    vs: VolumeSnapshot;
-    wsType: WorkspaceType;
-}
-
 export type SnapshotState = "pending" | "available" | "error";
 
 export interface Workspace {
@@ -1127,7 +1111,7 @@ export interface WithCommitHistory {
 
 export interface StartPrebuildContext extends WorkspaceContext, WithCommitHistory {
     actual: WorkspaceContext;
-    project?: Project;
+    project: Project;
     branch?: string;
 }
 

package/src/teams-projects-protocol.ts

@@ -15,7 +15,6 @@ export interface ProjectConfig {
 
 export interface ProjectSettings {
     useIncrementalPrebuilds?: boolean;
-    usePersistentVolumeClaim?: boolean;
     keepOutdatedPrebuildsRunning?: boolean;
     // whether new workspaces can start on older prebuilds and incrementally update
     allowUsingPreviousPrebuilds?: boolean;

package/src/workspace-class.ts

@@ -10,5 +10,5 @@ export interface SupportedWorkspaceClass {
     displayName: string;
     description: string;
     powerups: number;
-    isSelected: boolean;
+    isDefault: boolean;
 }

package/src/wsready.ts

@@ -4,7 +4,7 @@
  * See License-AGPL.txt in the project root for license information.
  */
 
-// generated using github.com/32leaves/bel on 2022-10-10 21:41:56.018177383 +0000 UTC m=+0.010324839
+// generated using github.com/32leaves/bel on 2022-11-25 13:39:08.995865257 +0000 UTC m=+0.015035221
 // DO NOT MODIFY
 
 export enum WorkspaceInitSource {
@@ -14,4 +14,11 @@ export enum WorkspaceInitSource {
 }
 export interface WorkspaceReadyMessage {
     source: WorkspaceInitSource;
+    metrics: InitializerMetric[];
+}
+
+export interface InitializerMetric {
+    type: string;
+    duration: number;
+    size: number;
 }