@gitpod/gitpod-protocol 0.1.5-wth-test.41 → 0.1.5-yh-vmoptions-fork.3

package/src/encryption/key-provider.ts

@@ -7,16 +7,16 @@
 import { injectable, inject } from "inversify";
 
 export interface KeyMetadata {
-    name: string,
-    version: number
+    name: string;
+    version: number;
 }
 
 export interface Key {
-    metadata: KeyMetadata,
-    material: Buffer
+    metadata: KeyMetadata;
+    material: Buffer;
 }
 
-export const KeyProvider = Symbol('KeyProvider');
+export const KeyProvider = Symbol("KeyProvider");
 export interface KeyProvider {
     getPrimaryKey(): Key;
     getKeyFor(metadata: KeyMetadata): Key;
@@ -24,24 +24,21 @@ export interface KeyProvider {
 
 export type KeyConfig = KeyMetadata & {
     /** base64 encoded */
-    material: string,
-    primary?: boolean
-}
+    material: string;
+    primary?: boolean;
+};
 
-export const KeyProviderConfig = Symbol('KeyProviderConfig');
+export const KeyProviderConfig = Symbol("KeyProviderConfig");
 export interface KeyProviderConfig {
-    keys: KeyConfig[]
+    keys: KeyConfig[];
 }
 
 @injectable()
 export class KeyProviderImpl implements KeyProvider {
-
     static loadKeyConfigFromJsonString(configStr: string): KeyConfig[] {
         const keys = (JSON.parse(configStr) || []) as KeyConfig[];
-        if (!Array.isArray(keys)
-            || keys.length < 0
-            || 1 !== keys.reduce((p, k) => k.primary ? p + 1 : p, 0)) {
-            throw new Error('Invalid key config!');
+        if (!Array.isArray(keys) || keys.length < 0 || 1 !== keys.reduce((p, k) => (k.primary ? p + 1 : p), 0)) {
+            throw new Error("Invalid key config!");
         }
         return keys;
     }
@@ -49,13 +46,13 @@ export class KeyProviderImpl implements KeyProvider {
     constructor(@inject(KeyProviderConfig) protected readonly config: KeyProviderConfig) {}
 
     protected get keys() {
-        return this.config.keys
+        return this.config.keys;
     }
 
     getPrimaryKey(): Key {
         const primaryKey = this.keys.find((key) => !!key.primary);
         if (!primaryKey) {
-            throw new Error('No primary encryption key found!');
+            throw new Error("No primary encryption key found!");
         }
         return this.configToKey(primaryKey);
     }
@@ -72,9 +69,9 @@ export class KeyProviderImpl implements KeyProvider {
         return {
             metadata: {
                 name: config.name,
-                version: config.version
+                version: config.version,
             },
-            material: new Buffer(config.material, 'base64')
+            material: new Buffer(config.material, "base64"),
         };
     }
 }

package/src/env.ts

@@ -6,32 +6,10 @@
 
 import { injectable } from "inversify";
 
-const legacyStagenameTranslation: { [key: string]: KubeStage } = {
-    "production": "production",
-    "staging": "prodcopy",
-    "devstaging": "dev",
-    "dev": "dev"
-}
-
-export function translateLegacyStagename(kubeStage: string): KubeStage {
-    const stage = legacyStagenameTranslation[kubeStage];
-    if (!stage) {
-        throw new Error(`Invalid KUBE_STAGE: ${kubeStage}`);
-    }
-
-    return stage;
-}
-
 @injectable()
 export abstract class AbstractComponentEnv {
-    readonly kubeStage: KubeStage = getEnvVarParsed('KUBE_STAGE', translateLegacyStagename);
-
-    readonly installationLongname: string = getEnvVar("GITPOD_INSTALLATION_LONGNAME")
-    readonly installationShortname: string = getEnvVar("GITPOD_INSTALLATION_SHORTNAME")
 }
 
-export type KubeStage = 'production' | 'prodcopy' | 'staging' | 'dev';
-
 export function getEnvVar(name: string, defaultValue?: string): string {
     const value = process.env[name] || defaultValue;
     if (!value) {

package/src/gitpod-file-parser.spec.ts

@@ -4,19 +4,19 @@
  * See License-AGPL.txt in the project root for license information.
  */
 
-import { suite, test } from "mocha-typescript"
-import * as chai from "chai"
+import { suite, test } from "mocha-typescript";
+import * as chai from "chai";
 
-import { WorkspaceConfig } from './protocol';
-import { GitpodFileParser } from './gitpod-file-parser';
+import { WorkspaceConfig } from "./protocol";
+import { GitpodFileParser } from "./gitpod-file-parser";
 
-const expect = chai.expect
+const expect = chai.expect;
 
 const DEFAULT_IMAGE = "default-image";
 const DEFAULT_CONFIG = <WorkspaceConfig>{ image: DEFAULT_IMAGE };
 
-@suite class TestGitpodFileParser {
-
+@suite
+class TestGitpodFileParser {
     protected parser: GitpodFileParser;
 
     public before() {
@@ -24,107 +24,102 @@ const DEFAULT_CONFIG = <WorkspaceConfig>{ image: DEFAULT_IMAGE };
     }
 
     @test public testOnlyOnePort() {
-        const content =
-            `ports:\n` +
-            `  - port: 5555`;
+        const content = `ports:\n` + `  - port: 5555`;
 
         const result = this.parser.parse(content, {}, DEFAULT_CONFIG);
         expect(result.config).to.deep.equal({
-            ports: [{
-                port: 5555
-            }],
-            image: DEFAULT_IMAGE
+            ports: [
+                {
+                    port: 5555,
+                },
+            ],
+            image: DEFAULT_IMAGE,
         });
     }
 
     @test public testPortRange() {
-        const content =
-            `ports:\n` +
-            `  - port: 5555\n` +
-            `  - port: 3000-3999`; // should be filtered out by default
+        const content = `ports:\n` + `  - port: 5555\n` + `  - port: 3000-3999`; // should be filtered out by default
 
         const result = this.parser.parse(content, {}, DEFAULT_CONFIG);
         expect(result.config).to.deep.equal({
-            ports: [{
-                port: 5555
-            }],
-            image: DEFAULT_IMAGE
+            ports: [
+                {
+                    port: 5555,
+                },
+            ],
+            image: DEFAULT_IMAGE,
         });
     }
 
     @test public testPortRangeAccepted() {
-        const content =
-            `ports:\n` +
-            `  - port: 5555\n` +
-            `  - port: 3000-3999`; // should be included if explicitly supported
+        const content = `ports:\n` + `  - port: 5555\n` + `  - port: 3000-3999`; // should be included if explicitly supported
 
         const result = this.parser.parse(content, { acceptPortRanges: true }, DEFAULT_CONFIG);
         expect(result.config).to.deep.equal({
-            ports: [{
-                port: 5555
-            }, {
-                port: '3000-3999'
-            }],
-            image: DEFAULT_IMAGE
+            ports: [
+                {
+                    port: 5555,
+                },
+                {
+                    port: "3000-3999",
+                },
+            ],
+            image: DEFAULT_IMAGE,
         });
     }
 
     @test public testSimpleTask() {
-        const content =
-            `tasks:\n` +
-            `  - command: yarn`;
+        const content = `tasks:\n` + `  - command: yarn`;
 
         const result = this.parser.parse(content, {}, DEFAULT_CONFIG);
         expect(result.config).to.deep.equal({
-            tasks: [{
-                command: "yarn"
-            }],
-            image: DEFAULT_IMAGE
+            tasks: [
+                {
+                    command: "yarn",
+                },
+            ],
+            image: DEFAULT_IMAGE,
         });
     }
 
     @test public testSimpleImage() {
         const imageName = "my-test-org/my-test-image:some-tag";
-        const content =
-            `image: "${imageName}"\n`;
+        const content = `image: "${imageName}"\n`;
 
         const result = this.parser.parse(content);
         expect(result.config).to.deep.equal({
-            image: imageName
+            image: imageName,
         });
     }
 
     @test public testComplexImageWithoutContext() {
-        const dockerFileName = 'Dockerfile';
-        const content =
-            `image:\n  file: ${dockerFileName}\n`;
+        const dockerFileName = "Dockerfile";
+        const content = `image:\n  file: ${dockerFileName}\n`;
 
         const result = this.parser.parse(content);
         expect(result.config).to.deep.equal({
             image: {
-                file: dockerFileName
-            }
+                file: dockerFileName,
+            },
         });
     }
 
     @test public testComplexImageWithContext() {
-        const dockerFileName = 'Dockerfile';
-        const dockerContext = 'docker';
-        const content =
-            `image:\n  file: ${dockerFileName}\n  context: ${dockerContext}\n`;
+        const dockerFileName = "Dockerfile";
+        const dockerContext = "docker";
+        const content = `image:\n  file: ${dockerFileName}\n  context: ${dockerContext}\n`;
 
         const result = this.parser.parse(content);
         expect(result.config).to.deep.equal({
             image: {
                 file: dockerFileName,
-                context: dockerContext
-            }
+                context: dockerContext,
+            },
         });
     }
 
     @test public testGitconfig() {
-        const content =
-`
+        const content = `
 gitConfig:
     core.autocrlf: input
 `;
@@ -132,20 +127,19 @@ gitConfig:
         const result = this.parser.parse(content, {}, DEFAULT_CONFIG);
         expect(result.config).to.deep.equal({
             gitConfig: {
-                "core.autocrlf": "input"
+                "core.autocrlf": "input",
             },
-            image: DEFAULT_IMAGE
+            image: DEFAULT_IMAGE,
         });
     }
 
     @test public testBrokenConfig() {
-        const content =
-            `image: 42\n`;
+        const content = `image: 42\n`;
 
         const result = this.parser.parse(content, {}, DEFAULT_CONFIG);
         expect(result.config).to.deep.equal({
-            image: DEFAULT_IMAGE
+            image: DEFAULT_IMAGE,
         });
     }
 }
-module.exports = new TestGitpodFileParser()   // Only to circumvent no usage warning :-/
+module.exports = new TestGitpodFileParser(); // Only to circumvent no usage warning :-/

package/src/gitpod-file-parser.ts

@@ -7,40 +7,39 @@
 import { injectable } from "inversify";
 import * as yaml from "js-yaml";
 import * as Ajv from "ajv";
-import { log } from './util/logging';
+import { log } from "./util/logging";
 import { WorkspaceConfig, PortRangeConfig } from "./protocol";
 
-export type MaybeConfig = WorkspaceConfig | undefined
+export type MaybeConfig = WorkspaceConfig | undefined;
 
-const schema = require('../data/gitpod-schema.json');
+const schema = require("../data/gitpod-schema.json");
 const validate = new Ajv().compile(schema);
 const defaultParseOptions = {
     acceptPortRanges: false,
 };
 
 export interface ParseResult {
-    config: WorkspaceConfig
-    parsedConfig?: WorkspaceConfig
-    validationErrors?: string[]
+    config: WorkspaceConfig;
+    parsedConfig?: WorkspaceConfig;
+    validationErrors?: string[];
 }
 
 @injectable()
 export class GitpodFileParser {
-
     public parse(content: string, parseOptions = {}, defaultConfig: WorkspaceConfig = {}): ParseResult {
         const options = {
-           ...defaultParseOptions,
-           ...parseOptions,
+            ...defaultParseOptions,
+            ...parseOptions,
         };
         try {
             const parsedConfig = yaml.safeLoad(content) as any;
             validate(parsedConfig);
-            const validationErrors = validate.errors ? validate.errors.map( e => e.message || e.keyword ) : undefined;
+            const validationErrors = validate.errors ? validate.errors.map((e) => e.message || e.keyword) : undefined;
             if (validationErrors && validationErrors.length > 0) {
                 return {
                     config: defaultConfig,
                     parsedConfig,
-                    validationErrors
+                    validationErrors,
                 };
             }
             const overrides = {} as any;
@@ -49,17 +48,17 @@ export class GitpodFileParser {
             }
             return {
                 config: {
-                    ... defaultConfig,
-                    ... parsedConfig,
-                    ... overrides,
+                    ...defaultConfig,
+                    ...parsedConfig,
+                    ...overrides,
                 },
-                parsedConfig
+                parsedConfig,
             };
         } catch (err) {
-            log.error('Unparsable Gitpod configuration', err, { content });
+            log.error("Unparsable Gitpod configuration", err, { content });
             return {
                 config: defaultConfig,
-                validationErrors: ['Unparsable Gitpod configuration: ' + err.toString()]
+                validationErrors: ["Unparsable Gitpod configuration: " + err.toString()],
             };
         }
     }