Update odo to v2.1.0 (#2102)

This PR fixes #2100.

Fix updates tools.json with new urls. checksums and version number.
It includes preference.yaml file to use as default odo preferences
with telemetry disabled to avoid confusing extension usage with
real odo usage from command line interface. Every command executed
gets environment variable GLOBALODOCONFIG initialized with path to
default prefernce.yaml file.

Signed-off-by: Denis Golovin dgolovin@redhat.com

Author: dgolovin

preference.yaml

@@ -0,0 +1,8 @@
+kind: Preference
+apiversion: odo.dev/v1alpha1
+OdoSettings:
+  RegistryList:
+  - Name: DefaultDevfileRegistry
+    URL: https://github.com/odo-devfiles/registry
+    secure: false
+  ConsentTelemetry: false

src/odo.ts

@@ -736,22 +736,29 @@ export class OdoImpl implements Odo {
         return services;
     }
 
+    public createEnv(): {} {
+        const env = {...process.env };
+        env.GLOBALODOCONFIG = path.resolve(__dirname,'..', '..', 'preference.yaml');
+        return env;
+    }
+
     public async executeInTerminal(command: CommandText, cwd: string = process.cwd(), name = 'OpenShift'): Promise<void> {
         const [cmd] = `${command}`.split(' ');
         const toolLocation = await ToolsConfig.detect(cmd);
-        const terminal: Terminal = WindowUtil.createTerminal(name, cwd);
+        const terminal: Terminal = WindowUtil.createTerminal(name, cwd, this.createEnv());
         terminal.sendText(toolLocation === cmd ? `${command}` : `${command}`.replace(cmd, `"${toolLocation}"`), true);
         terminal.show();
     }
 
     public async execute(command: CommandText, cwd?: string, fail = true): Promise<cliInstance.CliExitData> {
+        const env = this.createEnv();
         const commandActual = `${command}`;
         const commandPrivacy = `${command.privacyMode(true)}`;
         const [cmd] = commandActual.split(' ');
         const toolLocation = await ToolsConfig.detect(cmd);
         const result: cliInstance.CliExitData = await OdoImpl.cli.execute(
             toolLocation ? commandActual.replace(cmd, `"${toolLocation}"`) : commandActual,
-            cwd ? {cwd} : { }
+            cwd ? {cwd, env} : { env }
         );
         if (result.error && fail) {
             throw new VsCommandError(`${result.error.message}`, `Error when running command: ${commandPrivacy}`, result.error);

src/tools.json

@@ -3,27 +3,27 @@
         "description": "odo CLI",
         "vendor": "Red Hat, Inc.",
         "name": "odo",
-        "version": "2.0.7",
-        "versionRange": "^2.0.7",
-        "versionRangeLabel": "version >= 2.0.7",
+        "version": "2.1.0",
+        "versionRange": "^2.1.0",
+        "versionRangeLabel": "version >= 2.1.0",
         "dlFileName": "odo",
         "filePrefix": "",
         "platform": {
             "win32": {
-                "url": "https://mirror.openshift.com/pub/openshift-v4/clients/odo/v2.0.7/odo-windows-amd64.exe.zip",
-                "sha256sum": "68a1ffd6034ed6ab92ece663a4c95310e2fc8b3c1d4723b31c1f85e6ad77ba2c",
+                "url": "https://mirror.openshift.com/pub/openshift-v4/clients/odo/v2.1.0/odo-windows-amd64.exe.zip",
+                "sha256sum": "77739939e2bbf1662b22fdee402b1a352b80ce3e84fa3dbe549ba532b1283de6",
                 "dlFileName": "odo-windows-amd64.exe.zip",
                 "cmdFileName": "odo.exe"
             },
             "darwin": {
-                "url": "https://mirror.openshift.com/pub/openshift-v4/clients/odo/v2.0.7/odo-darwin-amd64.tar.gz",
-                "sha256sum": "29fe926b4f45ad64eb5d4d555dbf94c4b87e0417520a5d9bd33bdbb25dee2be8",
+                "url": "https://mirror.openshift.com/pub/openshift-v4/clients/odo/v2.1.0/odo-darwin-amd64.tar.gz",
+                "sha256sum": "10f2b4f748bb33c3d4bd9486c62472e9ee51703709d2e4f235460ef5ff686b86",
                 "dlFileName": "odo-darwin-amd64.tar.gz",
                 "cmdFileName": "odo"
             },
             "linux": {
-                "url": "https://mirror.openshift.com/pub/openshift-v4/clients/odo/v2.0.7/odo-linux-amd64.tar.gz",
-                "sha256sum": "e36d27259cf15b34f9fc4303c429f7a52d817b086125ac41505b518a7c6fbd16",
+                "url": "https://mirror.openshift.com/pub/openshift-v4/clients/odo/v2.1.0/odo-linux-amd64.tar.gz",
+                "sha256sum": "46474a5979b2733b0ddb22eb34fd2f3920698566fd5b6a6188272b7e1e4fc7cb",
                 "dlFileName": "odo-linux-amd64.tar.gz",
                 "cmdFileName": "odo"
             }

src/util/windowUtils.ts

@@ -6,10 +6,12 @@
 import { window, Terminal, TerminalOptions } from 'vscode';
 
 export class WindowUtil {
-    static createTerminal(name: string, cwd?: string): Terminal {
+    static createTerminal(name: string, cwd?: string, env = process.env): Terminal {
+
         const options: TerminalOptions = {
             cwd,
-            name
+            name,
+            env
         };
         if (process.platform === 'win32') {
             options.shellPath = process.env.ComSpec;

test/unit/odo.test.ts

@@ -89,7 +89,7 @@ suite('odo', () => {
             const cwd = 'path/to/some/dir';
             await odoCli.execute(command, cwd);
 
-            expect(execStub).calledOnceWith(`${command}`, { cwd });
+            expect(execStub).calledOnceWith(`${command}`, { cwd, env: (odo.getInstance() as odo.OdoImpl).createEnv() });
         });
 
         test('execute rejects if an error occurs in the shell command', async () => {

test/unit/util/window.test.ts

@@ -34,7 +34,7 @@ suite('Window Utility', () => {
         sandbox.stub(process, 'platform').value('win32');
         sandbox.stub(process, 'env').value({ComSpec: 'path'});
         WindowUtil.createTerminal('name', process.cwd());
-        expect(termStub).calledOnceWith({cwd: process.cwd(), name: 'name', shellPath: 'path'});
+        expect(termStub).calledOnceWith({cwd: process.cwd(), name: 'name', shellPath: 'path', env: {ComSpec: 'path'}});
     });
 
 });