From 234a82f49b107415372d3cd08f5db90cb88043a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filip=20Tron=C3=AD=C4=8Dek?= <filip@gitpod.io>
Date: Mon, 7 Feb 2022 21:36:19 +0000
Subject: [PATCH] Update VS Code Settings sync schema and VS Code repo refs

Remove Theia assignments

Co-authored-by: Jean Pierre <jeanp413@hotmail.com>
---
 .../src/typeorm/code-sync-resource-db.spec.db.ts |  8 ++++----
 .../src/typeorm/entity/db-code-sync-resource.ts  | 16 +++++++++++-----
 components/ide/code/leeway.Dockerfile            |  4 ++--
 .../server/src/code-sync/code-sync-service.ts    |  4 ++--
 4 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/components/gitpod-db/src/typeorm/code-sync-resource-db.spec.db.ts b/components/gitpod-db/src/typeorm/code-sync-resource-db.spec.db.ts
index 8d98c48c483e0c..950ed9d54db935 100644
--- a/components/gitpod-db/src/typeorm/code-sync-resource-db.spec.db.ts
+++ b/components/gitpod-db/src/typeorm/code-sync-resource-db.spec.db.ts
@@ -85,7 +85,7 @@ export class CodeSyncResourceDBSpec {
         let manifest = await this.db.getManifest(this.userId);
         expect(manifest).to.deep.eq(<IUserDataManifest>{
             session: this.userId,
-            latest: {}
+            latest: {},
         });
 
         let machinesRev = await this.db.insert(this.userId, 'machines', async () => { });
@@ -94,7 +94,7 @@ export class CodeSyncResourceDBSpec {
             session: this.userId,
             latest: {
                 machines: machinesRev
-            }
+            },
         });
 
         let extensionsRev = await this.db.insert(this.userId, SyncResource.Extensions, async () => { });
@@ -104,7 +104,7 @@ export class CodeSyncResourceDBSpec {
             latest: {
                 machines: machinesRev,
                 extensions: extensionsRev
-            }
+            },
         });
 
         machinesRev = await this.db.insert(this.userId, 'machines', async () => { });
@@ -114,7 +114,7 @@ export class CodeSyncResourceDBSpec {
             latest: {
                 machines: machinesRev,
                 extensions: extensionsRev
-            }
+            },
         });
     }
 
diff --git a/components/gitpod-db/src/typeorm/entity/db-code-sync-resource.ts b/components/gitpod-db/src/typeorm/entity/db-code-sync-resource.ts
index da889231584ee7..797660e9039032 100644
--- a/components/gitpod-db/src/typeorm/entity/db-code-sync-resource.ts
+++ b/components/gitpod-db/src/typeorm/entity/db-code-sync-resource.ts
@@ -7,7 +7,7 @@
 import { Entity, Column, PrimaryColumn, Index } from "typeorm";
 import { TypeORM } from "../typeorm";
 
-// should be aligned with https://github.com/gitpod-io/vscode/blob/75c71b49cc25554adc408e63b876b76dcc984bc1/src/vs/platform/userDataSync/common/userDataSync.ts#L113-L156
+// should be aligned with https://github.com/gitpod-io/openvscode-server/blob/a9286bef87ed21bbf108371aa1f62d9a5bc48fc4/src/vs/platform/userDataSync/common/userDataSync.ts#L110-L160
 export interface IUserData {
     ref: string;
     content: string | null;
@@ -17,14 +17,20 @@ export const enum SyncResource {
     Settings = 'settings',
     Keybindings = 'keybindings',
     Snippets = 'snippets',
+    Tasks = 'tasks',
     Extensions = 'extensions',
-    GlobalState = 'globalState'
+    GlobalState = 'globalState',
 }
-export const ALL_SYNC_RESOURCES: SyncResource[] = [SyncResource.Settings, SyncResource.Keybindings, SyncResource.Snippets, SyncResource.Extensions, SyncResource.GlobalState];
+export const ALL_SYNC_RESOURCES: SyncResource[] = [SyncResource.Settings, SyncResource.Keybindings, SyncResource.Snippets, SyncResource.Tasks, SyncResource.Extensions, SyncResource.GlobalState];
 
 export interface IUserDataManifest {
-    latest: Record<ServerResource, string>
-    session: string;
+	readonly latest?: Record<ServerResource, string>;
+	readonly session: string;
+    /**
+     * This property reflects a weak ETag for caching code sync responses,
+     * in the server, this is send in the Etag header and it's calculated by Express.js or we can override it manually.
+     */
+	//readonly ref: string;
 }
 
 export type ServerResource = SyncResource | 'machines';
diff --git a/components/ide/code/leeway.Dockerfile b/components/ide/code/leeway.Dockerfile
index 25b50291153e53..844d6faf546cdb 100644
--- a/components/ide/code/leeway.Dockerfile
+++ b/components/ide/code/leeway.Dockerfile
@@ -9,7 +9,7 @@ ARG CODE_COMMIT
 RUN mkdir /gp-code \
     && cd /gp-code \
     && git init \
-    && git remote add origin https://github.com/gitpod-io/vscode \
+    && git remote add origin https://github.com/gitpod-io/openvscode-server \
     && git fetch origin $CODE_COMMIT --depth=1 \
     && git reset --hard FETCH_HEAD
 WORKDIR /gp-code
@@ -34,7 +34,7 @@ ENV ELECTRON_SKIP_BINARY_DOWNLOAD=1
 RUN mkdir /gp-code \
     && cd /gp-code \
     && git init \
-    && git remote add origin https://github.com/gitpod-io/vscode \
+    && git remote add origin https://github.com/gitpod-io/openvscode-server \
     && git fetch origin $CODE_COMMIT --depth=1 \
     && git reset --hard FETCH_HEAD
 WORKDIR /gp-code
diff --git a/components/server/src/code-sync/code-sync-service.ts b/components/server/src/code-sync/code-sync-service.ts
index 690a02f0e145ed..3fbbba352e8bf6 100644
--- a/components/server/src/code-sync/code-sync-service.ts
+++ b/components/server/src/code-sync/code-sync-service.ts
@@ -114,10 +114,10 @@ export class CodeSyncService {
                 return;
             }
             const manifest = await this.db.getManifest(req.user.id);
-            if (!manifest.latest.extensions) {
+            if (manifest.latest && !manifest.latest.extensions) {
                 manifest.latest.extensions = fromTheiaRev;
             }
-            if (!manifest.latest.settings) {
+            if (manifest.latest && !manifest.latest.settings) {
                 manifest.latest.settings = fromTheiaRev;
             }
             res.json(manifest);