Revert "[db] Make hand-written transformers more robust against odd D…

…B values" (#6889) This reverts commit 3be9435.
gitpod-io · Nov 25, 2021 · 348d534 · 348d534
1 parent b558f9d
commit 348d534
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 41 deletions.
diff --git a/components/gitpod-db/src/typeorm/entity/db-prebuild-info-entry.ts b/components/gitpod-db/src/typeorm/entity/db-prebuild-info-entry.ts
@@ -16,7 +16,7 @@ export class DBPrebuildInfo  {
     prebuildId: string;
 
     @Column({
-        type: 'text',
+        type: 'simple-json',
         transformer: (() => {
             return {
                 to(value: any): any {
@@ -27,7 +27,6 @@ export class DBPrebuildInfo  {
                         const obj = JSON.parse(value);
                         return PrebuildInfo.is(obj) ? obj : undefined;
                     } catch (error) {
-                        return undefined;
                     }
                 }
             };

diff --git a/components/gitpod-db/src/typeorm/entity/db-workspace-cluster.ts b/components/gitpod-db/src/typeorm/entity/db-workspace-cluster.ts
@@ -7,7 +7,6 @@
 import { PrimaryColumn, Column, Entity, Index } from "typeorm";
 import { AdmissionConstraint, AdmissionPreference, TLSConfig, WorkspaceCluster, WorkspaceClusterState } from "@gitpod/gitpod-protocol/lib/workspace-cluster";
 import { ValueTransformer } from "typeorm/decorator/options/ValueTransformer";
-import { log } from "@gitpod/gitpod-protocol/lib/util/logging";
 
 @Entity()
 export class DBWorkspaceCluster implements WorkspaceCluster {
@@ -21,7 +20,7 @@ export class DBWorkspaceCluster implements WorkspaceCluster {
     url: string;
 
     @Column({
-        type: "text",
+        type: "simple-json",
         transformer: (() => {
             const defaultValue = {};
             const jsonifiedDefault = JSON.stringify(defaultValue);
@@ -34,20 +33,11 @@ export class DBWorkspaceCluster implements WorkspaceCluster {
                     return JSON.stringify(value);
                 },
                 // <tls> | "{}" => tls | undefined
-                // also: "" | NULL => undefined (to make sure to not break on odd DB values)
                 from(value: any): any {
-                    if (!value || value === jsonifiedDefault) {
-                        return undefined;
-                    }
-
-                    try {
-                        return JSON.parse(value);
-                    } catch (err) {
-                        // ideally we want typeorm to skip this complete row, but can't.
-                        // errors make the whole query fail: too risky here!
-                        log.error("error parsing value ws-cluster from DB", err, { value });
+                    if (value === jsonifiedDefault) {
                         return undefined;
                     }
+                    return JSON.parse(value);
                 }
             };
         })()
@@ -71,7 +61,7 @@ export class DBWorkspaceCluster implements WorkspaceCluster {
     govern: boolean;
 
     @Column({
-        type: "text",
+        type: "simple-json",
         transformer: (() => {
             const defaultValue: AdmissionConstraint[] = [];
             const jsonifiedDefault = JSON.stringify(defaultValue);
@@ -82,29 +72,16 @@ export class DBWorkspaceCluster implements WorkspaceCluster {
                     }
                     return JSON.stringify(value);
                 },
-                // "[...]" | "[]" => []
-                // also: "" | NULL => undefined (to make sure to not break on odd DB values)
                 from(value: any): any {
-                    if (!value) {
-                        return undefined;
-                    }
-
-                    try {
-                        return JSON.parse(value);
-                    } catch (err) {
-                        // ideally we want typeorm to skip this complete row, but can't.
-                        // errors make the whole query fail: too risky here!
-                        log.error("error parsing value ws-cluster from DB", err, { value });
-                        return undefined;
-                    }
+                    return JSON.parse(value);
                 }
             };
         })()
     })
     admissionConstraints?: AdmissionConstraint[];
 
     @Column({
-        type: "text",
+        type: "simple-json",
         transformer: (() => {
             const defaultValue: AdmissionPreference[] = [];
             const jsonifiedDefault = JSON.stringify(defaultValue);
@@ -115,20 +92,11 @@ export class DBWorkspaceCluster implements WorkspaceCluster {
                     }
                     return JSON.stringify(value);
                 },
-                // "[...]" | "[]" => []
-                // also: "" | NULL => undefined (to make sure to not break on odd DB values)
                 from(value: any): any {
                     if (!value) {
                         return undefined;
                     }
-                    try {
-                        return JSON.parse(value);
-                    } catch (err) {
-                        // ideally we want typeorm to skip this complete row, but can't.
-                        // errors make the whole query fail: too risky here!
-                        log.error("error parsing value ws-cluster from DB", err, { value });
-                        return undefined;
-                    }
+                    return JSON.parse(value);
                 }
             };
         })()