Replace @clusterRequired

Signed-off-by: Jessica He <jhe@redhat.com>

Author: JessicaJHee

src/odo.ts

@@ -71,6 +71,7 @@ export interface Odo {
     removeRegistry(name: string): Promise<void>;
     describeComponent(contextPath: string, experimental?: boolean): Promise<ComponentDescription | undefined>;
     analyze(contextPath: string): Promise<AnalyzeResponse[]>;
+    canCreatePod(): Promise<boolean>;
 
     /**
      * Returns the URL of the API of the current active cluster,
@@ -97,7 +98,6 @@ export interface Odo {
 }
 
 export class OdoImpl implements Odo {
-
     private static cli: cliInstance.Cli = cliInstance.CliChannel.getInstance();
 
     private static instance: Odo;
@@ -341,6 +341,18 @@ export class OdoImpl implements Odo {
     public async deleteComponentConfiguration(componentPath: string): Promise<void> {
         await this.execute(Command.deleteComponentConfiguration(), componentPath);
     }
+
+    public async canCreatePod(): Promise<boolean> {
+        try {
+            const result: cliInstance.CliExitData = await this.execute(Command.canCreatePod());
+            if (result.stdout === 'yes') {
+                return true;
+            }
+        } catch {
+            //ignore
+        }
+        return false;
+    }
 }
 
 export function getInstance(): Odo {

src/odo/command.ts

@@ -311,4 +311,8 @@ export class Command {
             new CommandOption('-f'),
         ]);
     }
+
+    static canCreatePod(): CommandText {
+        return new CommandText('oc auth can-i create pod');
+    }
 }

src/openshift/component.ts

@@ -21,7 +21,7 @@ import { selectWorkspaceFolder } from '../util/workspace';
 import { VsCommandError, vsCommand } from '../vscommand';
 import GitImportLoader from '../webview/git-import/gitImportLoader';
 import LogViewLoader from '../webview/log/LogViewLoader';
-import OpenShiftItem from './openshiftItem';
+import OpenShiftItem, { clusterRequired } from './openshiftItem';
 import DescribeViewLoader from '../webview/describe/describeViewLoader';
 
 function createCancelledResult(stepName: string): any {
@@ -204,7 +204,7 @@ export class Component extends OpenShiftItem {
     }
 
     @vsCommand('openshift.component.dev')
-    //@clusterRequired() check for user is logged in should be implemented from scratch
+    @clusterRequired()
     static async dev(component: ComponentWorkspaceFolder, runOn?: undefined | 'podman') {
         const cs = Component.getComponentDevState(component);
         cs.devStatus = ComponentContextState.DEV_STARTING;
@@ -294,7 +294,7 @@ export class Component extends OpenShiftItem {
     }
 
     @vsCommand('openshift.component.exitDevMode')
-    //  @clusterRequired()
+    @clusterRequired()
     static async exitDevMode(component: ComponentWorkspaceFolder): Promise<void> {
         const componentState = Component.componentStates.get(component.contextPath)
         if (componentState) {
@@ -304,7 +304,7 @@ export class Component extends OpenShiftItem {
     }
 
     @vsCommand('openshift.component.forceExitDevMode')
-    // @clusterRequired()
+    @clusterRequired()
     static forceExitDevMode(component: ComponentWorkspaceFolder): Promise<void> {
         const componentState = Component.componentStates.get(component.contextPath)
         if (componentState.devProcess && componentState.devProcess.exitCode === null) {
@@ -314,7 +314,7 @@ export class Component extends OpenShiftItem {
     }
 
     @vsCommand('openshift.component.openInBrowser')
-    // @clusterRequired()
+    @clusterRequired()
     static async openInBrowser(component: ComponentWorkspaceFolder): Promise<string | null | undefined> {
         const componentDescription = await Component.odo.describeComponent(component.contextPath, !!Component.getComponentDevState(component).runOn);
         if (componentDescription.devForwardedPorts?.length === 1) {

src/openshift/openshiftItem.ts

@@ -132,18 +132,18 @@ export function clusterRequired() {
         }
 
         descriptor[fnKey] = async function (...args: any[]): Promise<any> {
-            let activeCluster = await getInstance().getActiveCluster();
-            if (!activeCluster) {
+            let hasActiveCluster = await getInstance().canCreatePod();
+            if (!hasActiveCluster) {
                 const lOrC = await window.showInformationMessage('Login in to a Cluster to run this command.', 'Login', 'Cancel');
                 if (lOrC === 'Login') {
                     const loginResult = await commands.executeCommand('openshift.explorer.login');
                     if (typeof loginResult === 'string') {
                         window.showInformationMessage(loginResult);
                     }
-                    activeCluster = await getInstance().getActiveCluster();
+                    hasActiveCluster = await getInstance().canCreatePod();
                 }
             }
-            if (activeCluster) {
+            if (hasActiveCluster) {
                 return fn.apply(this, args);
             }
         };

test/integration/odo.test.ts

@@ -131,6 +131,7 @@ suite('odo integration', function () {
         });
 
         suiteTeardown(async function () {
+            await odo.execute(Command.odoLoginWithUsernamePassword(clusterUrl, username, password));
             const newWorkspaceFolders = workspace.workspaceFolders.filter((workspaceFolder) => {
                 const fsPath = workspaceFolder.uri.fsPath;
                 return (fsPath !== tmpFolder1.fsPath && fsPath !== tmpFolder2.fsPath);
@@ -158,6 +159,16 @@ suite('odo integration', function () {
             expect(analysis2).to.exist;
             expect(analysis2[0].devfile).to.equal('go');
         });
+
+        test('canCreatePod()', async function () {
+            const canCreatePod1 = await odo.canCreatePod();
+            expect(canCreatePod1).to.exist;
+            expect(canCreatePod1).to.equal(true);
+            await odo.execute(Command.odoLogout());
+            const canCreatePod2 = await odo.canCreatePod();
+            expect(canCreatePod2).to.exist;
+            expect(canCreatePod2).to.equal(false);
+        });
     });
 
     suite('services', function () {