Remove Odo.getActiveCluster() (it's unused)

datho7561 · datho7561 · commit bb366f5a4922 · 2024-02-05T09:14:16.000-05:00
Closes #3663 Signed-off-by: David Thompson <davthomp@redhat.com>
diff --git a/src/k8s/csv.ts b/src/k8s/csv.ts
@@ -3,10 +3,9 @@
  *  Licensed under the MIT License. See LICENSE file in the project root for license information.
  *-----------------------------------------------------------------------------------------------*/
 
-import { TreeItem, WebviewPanel, window } from 'vscode';
+import { TreeItem } from 'vscode';
 import { ClusterExplorerV1 } from 'vscode-kubernetes-tools-api';
 import { Oc } from '../oc/ocWrapper';
-import { Odo } from '../odo/odoWrapper';
 import OpenShiftItem from '../openshift/openshiftItem';
 import { CRDDescription, ClusterServiceVersionKind } from './olm/types';
 
@@ -53,40 +52,4 @@ export class ClusterServiceVersion extends OpenShiftItem {
         };
     }
 
-    static createFormMessageListener(panel: WebviewPanel) {
-        return async (event: any) => {
-            if (event.command === 'cancel') {
-                if (event.changed === true) {
-                    const choice = await window.showWarningMessage('Discard all the changes in the form?', 'Yes', 'No');
-                    if (choice === 'No') {
-                        return;
-                    }
-                }
-                panel.dispose();
-            }
-            if (event.command === 'create') {
-                // add waiting for Deployment to be created using wait --for=condition
-                // no need to wait until it is available
-                if (!await Odo.Instance.getActiveCluster()) {
-                    // could be expired session
-                    return;
-                }
-
-                try {
-                    // make the service part of the app
-                    event.formData.metadata.labels = {
-                        app: 'app',
-                        'app.kubernetes.io/part-of': 'app'
-                    };
-                    await Oc.Instance.createKubernetesObjectFromSpec(event.formData);
-                    void window.showInformationMessage(`Service ${event.formData.metadata.name} successfully created.`);
-                    panel.dispose();
-                } catch (err) {
-                    void window.showErrorMessage(err);
-                    await panel.webview.postMessage({action: 'error'});
-                }
-            }
-        }
-    }
-
 }
diff --git a/src/odo/odoWrapper.ts b/src/odo/odoWrapper.ts
@@ -4,12 +4,11 @@
  *-----------------------------------------------------------------------------------------------*/
 
 import { KubernetesObject } from '@kubernetes/client-node';
-import { Uri, WorkspaceFolder, commands, workspace } from 'vscode';
+import { Uri, WorkspaceFolder, workspace } from 'vscode';
 import { CommandOption, CommandText } from '../base/command';
 import * as cliInstance from '../cli';
 import { ToolsConfig } from '../tools';
 import { ChildProcessUtil, CliExitData } from '../util/childProcessUtil';
-import { KubeConfigUtils } from '../util/kubeUtils';
 import { VsCommandError } from '../vscommand';
 import { Command } from './command';
 import { AnalyzeResponse, ComponentTypeAdapter, ComponentTypeDescription, DevfileComponentType, Registry } from './componentType';
@@ -33,47 +32,6 @@ export class Odo {
         // no state
     }
 
-    /**
-     * Returns the URL of the API of the current active cluster,
-     * or undefined if there are no active clusters.
-     *
-     * @return the URL of the API of the current active cluster,
-     * or undefined if there are no active clusters
-     */
-    public async getActiveCluster(): Promise<string> {
-        const result: CliExitData = await this.execute(
-            Command.printOdoVersion(),
-            process.cwd(),
-            false,
-        );
-
-        const odoCluster = result.stdout
-            .trim()
-            .split('\n')
-            .filter((value) => value.includes('Server:'))
-            .map((value) => {
-                return value.substring(value.indexOf(':') + 1).trim();
-            });
-        if (odoCluster.length !== 0) {
-            void commands.executeCommand('setContext', 'isLoggedIn', true);
-            return odoCluster[0];
-        }
-
-        // odo didn't report an active cluster, try reading it from KubeConfig
-        try {
-            const kubeConfigCurrentCluster = new KubeConfigUtils().getCurrentCluster().server;
-            if (kubeConfigCurrentCluster) {
-                void commands.executeCommand('setContext', 'isLoggedIn', true);
-                return kubeConfigCurrentCluster;
-            }
-        } catch (e) {
-            // ignored
-        }
-
-        // no active cluster
-        void commands.executeCommand('setContext', 'isLoggedIn', false);
-    }
-
     public async getComponentTypes(): Promise<ComponentTypeAdapter[]> {
         // if kc is produced, KUBECONFIG env var is empty or pointing
 
diff --git a/test/integration/odoWrapper.test.ts b/test/integration/odoWrapper.test.ts
@@ -51,13 +51,6 @@ suite('./odo/odoWrapper.ts', function () {
         }
     });
 
-    suite('clusters', function () {
-        test('getActiveCluster()', async function () {
-            const activeCluster = await Odo.Instance.getActiveCluster();
-            expect(activeCluster).to.equal(clusterUrl);
-        });
-    });
-
     suite('components', function () {
         const project1 = 'my-test-project-1';
 
diff --git a/test/unit/explorer.test.ts b/test/unit/explorer.test.ts
@@ -7,7 +7,6 @@ import * as chai from 'chai';
 import * as sinonChai from 'sinon-chai';
 import { commands, Uri } from 'vscode';
 import { OpenShiftExplorer } from '../../src/explorer';
-import { Odo } from '../../src/odo/odoWrapper';
 import sinon = require('sinon');
 
 const {expect} = chai;
@@ -16,10 +15,6 @@ chai.use(sinonChai);
 suite('OpenShift Application Explorer', () => {
     const sandbox = sinon.createSandbox();
 
-    setup(() => {
-        sandbox.stub(Odo.prototype, 'getActiveCluster').resolves('cluster');
-    });
-
     teardown(() => {
         sandbox.restore();
     });
diff --git a/test/unit/extension.test.ts b/test/unit/extension.test.ts
@@ -15,8 +15,8 @@ import * as sinonChai from 'sinon-chai';
 import * as vscode from 'vscode';
 import { CommandText } from '../../src/base/command';
 import { Oc } from '../../src/oc/ocWrapper';
-import { Odo } from '../../src/odo/odoWrapper';
 import { Project } from '../../src/oc/project';
+import { Odo } from '../../src/odo/odoWrapper';
 import { Progress } from '../../src/util/progress';
 import path = require('path');
 
@@ -90,7 +90,6 @@ suite('openshift toolkit Extension', () => {
             return { error: undefined, stdout: '', stderr: ''};
         });
         sandbox.stub(Oc.prototype, 'getAllKubernetesObjects').resolves([]);
-        sandbox.stub(Odo.prototype, 'getActiveCluster').resolves('cluster');
         sandbox.stub(Oc.prototype, 'getProjects').resolves([projectItem]);
     });
 
diff --git a/test/unit/oc.test.ts b/test/unit/oc.test.ts
@@ -9,7 +9,6 @@ import * as sinonChai from 'sinon-chai';
 import { window } from 'vscode';
 import { Oc } from '../../src/oc/ocWrapper';
 import { Project } from '../../src/oc/project';
-import { Odo } from '../../src/odo/odoWrapper';
 import { ToolsConfig } from '../../src/tools';
 import { ChildProcessUtil } from '../../src/util/childProcessUtil';
 import { YamlFileCommands } from '../../src/yamlFileCommands';
@@ -47,7 +46,6 @@ suite('Oc', function() {
         execStub = sandbox.stub(ChildProcessUtil.prototype, 'execute');
         getActiveProjectStub = sandbox.stub(Oc.Instance, 'getActiveProject').resolves('my-project');
         detectOrDownloadStub = sandbox.stub(ToolsConfig, 'detect').resolves('path');
-        sandbox.stub(Odo.Instance, 'getActiveCluster').resolves('cluster');
         sandbox.stub(Oc.Instance, 'getProjects').resolves([projectItem]);
         sandbox.stub(Oc.Instance, 'canCreatePod').resolves(true);
     });
diff --git a/test/unit/odoWrapper.test.ts b/test/unit/odoWrapper.test.ts
@@ -163,7 +163,6 @@ suite('./odo/odoWrapper.ts', () => {
 
         test('getProjects returns empty list if an error occurs', async () => {
             const errorStub = sandbox.stub(window, 'showErrorMessage');
-            sandbox.stub(odoCli, 'getActiveCluster').resolves('https://localhost:8080');
             execStub.rejects(errorMessage);
             const result = await Oc.Instance.getProjects();
 
@@ -244,25 +243,4 @@ suite('./odo/odoWrapper.ts', () => {
         });
     });
 
-    suite('odo and oc current cluster detection integration', () => {
-        const clusterUrl = 'https://localhost:8443';
-
-        const odoVersionOutLoggedIn = [
-            'odo v0.0.15 (2f7ed497)',
-            '',
-            `Server: ${clusterUrl}`,
-            'Kubernetes: v1.11.0+d4cacc0'
-        ];
-
-        test('extension uses odo version to get cluster url', async () => {
-            sandbox.stub(Odo.prototype, 'execute').resolves({
-                error: undefined,
-                stdout: odoVersionOutLoggedIn.join('\n'),
-                stderr: ''
-            });
-            const cluster: string = await odoCli.getActiveCluster();
-            expect(cluster).equals(clusterUrl);
-        });
-
-    });
 });
diff --git a/test/unit/openshift/component.test.ts b/test/unit/openshift/component.test.ts
@@ -10,12 +10,12 @@ import * as sinon from 'sinon';
 import * as sinonChai from 'sinon-chai';
 import * as vscode from 'vscode';
 import { ComponentInfo, ComponentsTreeDataProvider } from '../../../src/componentsView';
+import { Oc } from '../../../src/oc/ocWrapper';
+import { Project } from '../../../src/oc/project';
 import { Command } from '../../../src/odo/command';
 import { ComponentTypeAdapter } from '../../../src/odo/componentType';
 import { CommandProvider } from '../../../src/odo/componentTypeDescription';
-import { Oc } from '../../../src/oc/ocWrapper';
 import { Odo } from '../../../src/odo/odoWrapper';
-import { Project } from '../../../src/oc/project';
 import { ComponentWorkspaceFolder, OdoWorkspace } from '../../../src/odo/workspace';
 import * as openShiftComponent from '../../../src/openshift/component';
 import * as Util from '../../../src/util/async';
@@ -130,7 +130,6 @@ suite('OpenShift/Component', function () {
         Component = pq('../../../src/openshift/component', {}).Component;
         termStub = sandbox.stub(OpenShiftTerminalManager.prototype, 'executeInTerminal');
         execStub = sandbox.stub(Odo.prototype, 'execute').resolves({ stdout: '', stderr: undefined, error: undefined });
-        sandbox.stub(Odo.prototype, 'getActiveCluster').resolves('cluster');
         sandbox.stub(Oc.prototype, 'getProjects').resolves([projectItem]);
         sandbox.stub(Odo.prototype, 'describeComponent').resolves(componentItem1.component);
         sandbox.stub(OdoWorkspace.prototype, 'getComponents').resolves([componentItem1]);
diff --git a/test/unit/openshift/nameValidator.test.ts b/test/unit/openshift/nameValidator.test.ts
@@ -5,7 +5,6 @@
 
 import * as chai from 'chai';
 import * as sinonChai from 'sinon-chai';
-import { Odo } from '../../../src/odo/odoWrapper';
 import * as NameValidator from '../../../src/openshift/nameValidator';
 import { wait } from '../../../src/util/async';
 import sinon = require('sinon');
@@ -18,7 +17,6 @@ suite('nameValidator', function () {
 
     setup(function () {
         sandbox = sinon.createSandbox();
-        sandbox.stub(Odo.prototype, 'getActiveCluster').resolves('cluster');
     });
 
     teardown(function () {
diff --git a/test/unit/openshift/project.test.ts b/test/unit/openshift/project.test.ts
@@ -8,9 +8,9 @@ import * as sinon from 'sinon';
 import * as sinonChai from 'sinon-chai';
 import * as vscode from 'vscode';
 import { CommandText } from '../../../src/base/command';
-import { Odo } from '../../../src/odo/odoWrapper';
-import { Oc} from '../../../src/oc/ocWrapper';
+import { Oc } from '../../../src/oc/ocWrapper';
 import { Project as OdoProject } from '../../../src/oc/project';
+import { Odo } from '../../../src/odo/odoWrapper';
 import { Project } from '../../../src/openshift/project';
 
 const {expect} = chai;
@@ -28,7 +28,6 @@ suite('OpenShift/Project', () => {
     setup(() => {
         projectItem = { name: 'project', active: true };
         sandbox = sinon.createSandbox();
-        sandbox.stub(Odo.prototype, 'getActiveCluster').resolves('cluster');
         sandbox.stub(Oc.prototype, 'getProjects').resolves([projectItem]);
         execStub = sandbox.stub(Odo.prototype, 'execute').resolves({error: undefined, stdout: '', stderr: ''});
         createProjectStub = sandbox.stub(Oc.prototype, 'createProject').resolves();
