@gitpod/gitpod-protocol 0.1.5-se-multi-repo.24 → 0.1.5-se-prebuilds-failed.0

package/src/gitpod-service.ts

@@ -30,7 +30,7 @@ import { GithubUpgradeURL, PlanCoupon } from './payment-protocol';
 import { TeamSubscription, TeamSubscriptionSlot, TeamSubscriptionSlotResolved } from './team-subscription-protocol';
 import { RemotePageMessage, RemoteTrackMessage, RemoteIdentifyMessage } from './analytics';
 import { IDEServer } from './ide-protocol';
-import { InstallationAdminSettings } from './installation-admin-protocol';
+import { InstallationAdminSettings, TelemetryData } from './installation-admin-protocol';
 
 export interface GitpodClient {
     onInstanceUpdate(instance: WorkspaceInstance): void;
@@ -136,6 +136,7 @@ export interface GitpodServer extends JsonRpcServer<GitpodClient>, AdminServer,
     // Admin Settings
     adminGetSettings(): Promise<InstallationAdminSettings>;
     adminUpdateSettings(settings: InstallationAdminSettings): Promise<void>;
+    adminGetTelemetryData(): Promise<TelemetryData>;
 
     // Projects
     getProviderRepositoriesForUser(params: GetProviderRepositoriesParams): Promise<ProviderRepository[]>;

package/src/headless-workspace-log.ts

@@ -11,6 +11,7 @@ export enum HeadlessWorkspaceEventType {
     FinishedButFailed = "finish-fail",
     AbortedTimedOut = "aborted-timeout",
     Aborted = "aborted",
+    Failed = "failed",
     Started = "started"
 }
 export namespace HeadlessWorkspaceEventType {

package/src/installation-admin-protocol.ts

@@ -23,6 +23,13 @@ export interface InstallationAdmin {
     settings: InstallationAdminSettings;
 }
 
+export interface TelemetryData {
+    installationAdmin: InstallationAdmin
+    totalUsers: number
+    totalWorkspaces: number
+    totalInstances: number
+}
+
 export namespace InstallationAdmin {
     export function createDefault(): InstallationAdmin {
         return {

package/src/protocol.ts

@@ -567,14 +567,7 @@ export interface VSCodeConfig {
     extensions?: string[];
 }
 
-export interface RepositoryCloneInformation {
-    url: string;
-    checkoutLocation?: string;
-}
-
 export interface WorkspaceConfig {
-    mainConfiguration?: string;
-    additionalRepositories?: RepositoryCloneInformation[];
     image?: ImageConfig;
     ports?: PortConfig[];
     tasks?: TaskConfig[];
@@ -657,7 +650,9 @@ export type PrebuiltWorkspaceState
     // the prebuild timed out
     | "timeout"
     // the prebuild has finished and a snapshot is available
-    | "available";
+    | "available"
+    //
+    | "failed";
 
 export interface PrebuiltWorkspace {
     id: string;
@@ -693,7 +688,6 @@ export interface PrebuiltWorkspaceUpdatable {
     repo: string;
     isResolved: boolean;
     installationId: string;
-    commitSHA?: string;
     issue?: string;
     contextUrl?: string;
 }
@@ -823,15 +817,14 @@ export namespace WithSnapshot {
     }
 }
 
-export interface WithPrebuild {
-    snapshotBucketId: string;
+export interface WithPrebuild extends WithSnapshot {
     prebuildWorkspaceId: string;
     wasPrebuilt: true;
 }
 export namespace WithPrebuild {
     export function is(context: any): context is WithPrebuild {
         return context
-            && 'snapshotBucketId' in context
+            && WithSnapshot.is(context)
             && 'prebuildWorkspaceId' in context
             && 'wasPrebuilt' in context;
     }
@@ -875,7 +868,6 @@ export namespace SnapshotContext {
 export interface StartPrebuildContext extends WorkspaceContext {
     actual: WorkspaceContext;
     commitHistory?: string[];
-    subRepoCommitHistories?: string[][];
     project?: Project;
     branch?: string;
 }
@@ -978,47 +970,9 @@ export namespace AdditionalContentContext {
     }
 }
 
-export interface CommitContext extends WorkspaceContext, GitCheckoutInfo {
+export interface CommitContext extends WorkspaceContext, Commit {
     /** @deprecated Moved to .repository.cloneUrl, left here for backwards-compatibility for old workspace contextes in the DB */
     cloneUrl?: string
-
-    /**
-     * The clone and checkout information for the sub-repositories in case of multi-repo projects.
-     */
-    subRepositoryCheckoutInfo?: GitCheckoutInfo[];
-}
-
-export namespace CommitContext {
-    /**
-     * Creates an identifier pointing to the commits of the CommitContext and all sub-repo commit infos.
-     * The identifier is max 255 chars long.
-     * @param commitContext
-     * @returns identifier for set of commits
-     */
-    export function getCommitSHAs(commitContext: CommitContext): string {
-        if (!commitContext.subRepositoryCheckoutInfo || commitContext.subRepositoryCheckoutInfo.length === 0) {
-            return commitContext.revision;
-        }
-        // it's a multi-repo project, we need to store all commit shas and that needs to fit into 255 chars. Let's only store at most first seven.
-        const commits = [commitContext.revision, ... commitContext.subRepositoryCheckoutInfo.map(i => i.revision)];
-        const maxLength = Math.min(7, 255 / commits.length);
-        return commits.map( r => r.substring(0, maxLength)).join(',');
-    }
-
-    /**
-     * unparses the commitShaIdentifier into an array of commit SHAs.
-     * @param commitSHAIdentifier
-     * @returns the array of commit SHAs
-     */
-    export function parseCommitSHAs(commitSHAIdentifier: string): string[] {
-        return commitSHAIdentifier.split(',');
-    }
-}
-
-export interface GitCheckoutInfo extends Commit {
-    checkoutLocation?: string;
-    upstreamRemoteURI?: string;
-    localBranch?: string;
 }
 
 export namespace CommitContext {
@@ -1218,6 +1172,8 @@ export interface AuthProviderEntry {
     readonly status: AuthProviderEntry.Status;
 
     readonly oauth: OAuth2Config;
+    /** A random string that is to change whenever oauth changes (enforced on DB level) */
+    readonly oauthRevision?: string;
 }
 
 export interface OAuth2Config {

package/src/util/analytics.ts

@@ -30,7 +30,13 @@ class SegmentAnalyticsWriter implements IAnalyticsWriter {
 
         identify(msg: IdentifyMessage) {
         try {
-            this.analytics.identify(msg, (err: Error) => {
+            this.analytics.identify({
+                ...msg,
+                integrations: {
+                    "All": true,
+                    "Mixpanel": !!msg.userId
+                }
+            }, (err: Error) => {
                 if (err) {
                     log.warn("analytics.identify failed", err);
                 }
@@ -42,7 +48,13 @@ class SegmentAnalyticsWriter implements IAnalyticsWriter {
 
     track(msg: TrackMessage) {
         try {
-            this.analytics.track(msg, (err: Error) => {
+            this.analytics.track({
+                ...msg,
+                integrations: {
+                    "All": true,
+                    "Mixpanel": !!msg.userId
+                }
+            }, (err: Error) => {
                 if (err) {
                     log.warn("analytics.track failed", err);
                 }
@@ -54,7 +66,13 @@ class SegmentAnalyticsWriter implements IAnalyticsWriter {
 
     page(msg: PageMessage) {
         try{
-            this.analytics.page(msg, (err: Error) => {
+            this.analytics.page({
+                ...msg,
+                integrations: {
+                    "All": true,
+                    "Mixpanel": !!msg.userId
+                }
+            }, (err: Error) => {
                 if (err) {
                     log.warn("analytics.page failed", err);
                 }

package/src/wsready.ts

@@ -1,10 +1,10 @@
 /**
- * Copyright (c) 2022 Gitpod GmbH. All rights reserved.
+ * Copyright (c) 2021 Gitpod GmbH. All rights reserved.
  * Licensed under the GNU Affero General Public License (AGPL).
  * See License-AGPL.txt in the project root for license information.
  */
 
-// generated using github.com/32leaves/bel on 2022-02-15 11:53:18.380158212 +0000 UTC m=+0.011913675
+// generated using github.com/32leaves/bel on 2021-11-04 12:16:53.917570766 +0000 UTC m=+0.006002884
 // DO NOT MODIFY
 
 export enum WorkspaceInitSource {