Remove experimental warning, setting and fix log commands for podman

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

Author: dgolovin

package.json

@@ -1562,12 +1562,6 @@
                         "description": "Show OpenShift Toolkit Experimental Features.",
                         "type": "boolean",
                         "default": true
-                    },
-                    "openshiftToolkit.devModeRunOnPodman": {
-                        "order": 2,
-                        "description": "Show warning about experimental feature",
-                        "type": "boolean",
-                        "default": true
                     }
                 }
             }

src/odo/command.ts

@@ -288,17 +288,23 @@ export class Command {
             new CommandOption('--details'),
             new CommandOption('--devfile', component),
             new CommandOption('--devfile-registry', registry),
-            new CommandOption('-o', 'json', false)
+            new CommandOption('-o', 'json', false),
         ]
         );
     }
 
-    static showLog(): CommandText {
-        return new CommandText('odo', 'logs', [new CommandOption('--dev')]);
+    static showLog(platform?: string): CommandText {
+        const result = new CommandText('odo', 'logs', [
+            new CommandOption('--dev'),
+        ]);
+        if (platform) {
+            result.addOption(new CommandOption('--platform', platform));
+        }
+        return result;
     }
 
-    static showLogAndFollow(): CommandText {
-        return Command.showLog().addOption(new CommandOption('--follow'));
+    static showLogAndFollow(platform?: string): CommandText {
+        return Command.showLog(platform).addOption(new CommandOption('--follow'));
     }
 
     static listComponentPorts(project: string, app: string, component: string): CommandText {
@@ -307,8 +313,7 @@ export class Command {
             new CommandOption('--namespace', project),
             // see https://kubernetes.io/docs/reference/kubectl/jsonpath/ for examples
             new CommandOption('-o', 'jsonpath="{range .spec.ports[*]}{.port}{\',\'}{end}"', false)
-        ]
-        );
+        ]);
     }
 
     @verbose

src/openshift/component.ts

@@ -194,27 +194,6 @@ export class Component extends OpenShiftItem {
 
     @vsCommand('openshift.component.dev.onPodman')
     static async devOnPodman(component: ComponentWorkspaceFolder) {
-        if (workspace.getConfiguration('openshiftToolkit').get('devModeRunOnPodman')) {
-            let choice = 'Cancel';
-            do {
-                const choices = ['About Podman', 'Continue', 'Continue and don\'t ask again'];
-                choice = await window.showWarningMessage(
-                    'The command \'Start Dev on Podman\' is experimental. It requires Podman to be installed and configured. It isn\'t guaranteed to work.',
-                    ...choices);
-                switch (choice) {
-                    case choices[0]: // open link to external site with podman documentation
-                        await commands.executeCommand('vscode.open', Uri.parse('https://docs.podman.io/en/latest/index.html'));
-                        break;
-                    case choices[1]: // continue with execution
-                        break;
-                    case choices[2]: // save request to not show warning again
-                        await workspace.getConfiguration('openshiftToolkit').update('devModeRunOnPodman', false);
-                        break;
-                    default:
-                        return;
-                }
-            } while (choice === 'About Podman')
-        }
         return Component.dev(component, 'podman');
     }
 
@@ -390,10 +369,14 @@ export class Component extends OpenShiftItem {
             .get<boolean>('useWebviewInsteadOfTerminalView');
     }
 
-    static createExperimentalEnv(componentFolder) {
+    static createExperimentalEnv(componentFolder: ComponentWorkspaceFolder) {
         return Component.getComponentDevState(componentFolder).runOn ? {ODO_EXPERIMENTAL_MODE: 'true'} : {};
     }
 
+    static getDevPlatform(componentFolder: ComponentWorkspaceFolder): string {
+        return Component.getComponentDevState(componentFolder).runOn;
+    }
+
     @vsCommand('openshift.component.describe', true)
     static async describe(componentFolder: ComponentWorkspaceFolder): Promise<string> {
         const command = Command.describeComponent;
@@ -407,11 +390,12 @@ export class Component extends OpenShiftItem {
     @vsCommand('openshift.component.log', true)
     static log(componentFolder: ComponentWorkspaceFolder): Promise<string> {
         const componentName = componentFolder.component.devfileData.devfile.metadata.name;
+        const showLogCmd = Command.showLog(Component.getDevPlatform(componentFolder));
         if (Component.isUsingWebviewEditor()) {
-            LogViewLoader.loadView(`${componentName} Log`, Command.showLog, componentFolder, Component.createExperimentalEnv(componentFolder));
+            LogViewLoader.loadView(`${componentName} Log`, showLogCmd, componentFolder);
         } else {
             void Component.odo.executeInTerminal(
-                Command.showLog(),
+                showLogCmd,
                 componentFolder.contextPath,
                 `OpenShift: Show '${componentName}' Component Log`);
         }
@@ -421,11 +405,12 @@ export class Component extends OpenShiftItem {
     @vsCommand('openshift.component.followLog', true)
     static followLog(componentFolder: ComponentWorkspaceFolder): Promise<string> {
         const componentName = componentFolder.component.devfileData.devfile.metadata.name;
+        const showLogCmd = Command.showLogAndFollow(Component.getDevPlatform(componentFolder));
         if (Component.isUsingWebviewEditor()) {
-            LogViewLoader.loadView(`${componentName} Follow Log`, Command.showLogAndFollow, componentFolder);
+            LogViewLoader.loadView(`${componentName} Follow Log`, showLogCmd, componentFolder);
         } else {
             void Component.odo.executeInTerminal(
-                Command.showLogAndFollow(),
+                showLogCmd,
                 componentFolder.contextPath,
                 `OpenShift: Follow '${componentName}' Component Log`);
         }

src/webview/log/LogViewLoader.ts

@@ -17,7 +17,7 @@ export default class LogViewLoader {
         return extensions.getExtension(ExtensionID).extensionPath
     }
 
-    static async loadView(title: string, cmdFunction: () => CommandText, target: ComponentWorkspaceFolder, addEnv: any = {}): Promise<WebviewPanel> {
+    static async loadView(title: string, cmd: CommandText, target: ComponentWorkspaceFolder, addEnv: any = {}): Promise<WebviewPanel> {
         const localResourceRoot = Uri.file(path.join(LogViewLoader.extensionPath, 'out', 'logViewer'));
 
         const panel = window.createWebviewPanel('logView', title, ViewColumn.One, {
@@ -27,8 +27,6 @@ export default class LogViewLoader {
         });
         panel.iconPath = Uri.file(path.join(LogViewLoader.extensionPath, "images/context/cluster-node.png"));
 
-        const cmd = cmdFunction();
-
         // TODO: When webview is going to be ready?
         panel.webview.html = LogViewLoader.getWebviewContent(LogViewLoader.extensionPath, `${cmd}`.replace(/\\/g, '\\\\'), panel);