Add Show logs command for ReplicationController (#1104)

* Add `Show logs` command for ReplicationController

Author: sudhirverma

package.json

@@ -103,6 +103,8 @@
     "onCommand:clusters.openshift.deploy.dc.showLog.palette",
     "onCommand:clusters.openshift.deploy.delete",
     "onCommand:clusters.openshift.deploy.delete.palette",
+    "onCommand:clusters.openshift.deploy.rcShowLog",
+    "onCommand:clusters.openshift.deploy.rcShowLog.palette",
     "onCommand:clusters.openshift.deployment.openConsole",
     "onCommand:clusters.openshift.imagestream.openConsole"
   ],
@@ -484,6 +486,16 @@
         "command": "clusters.openshift.build.openConsole",
         "title": "Open in Console"
       },
+      {
+        "command": "clusters.openshift.deploy.rcShowLog.palette",
+        "title": "Show Replica's Log",
+        "category": "OpenShift"
+      },
+      {
+        "command": "clusters.openshift.deploy.rcShowLog",
+        "title": "Show Log",
+        "category": "OpenShift"
+      },
       {
         "command": "clusters.openshift.deploy.delete.palette",
         "title": "Delete Replica",
@@ -567,6 +579,10 @@
           "command": "openshift.explorer.login",
           "when": "view == openshiftProjectExplorer"
         },
+        {
+          "command": "clusters.openshift.deploy.rcShowLog",
+          "when": "view == openshiftProjectExplorer"
+        },
         {
           "command": "openshift.app.delete",
           "when": "view == openshiftProjectExplorer"
@@ -700,9 +716,14 @@
           "group": "2@0",
           "when": "view == extension.vsKubernetesExplorer && viewItem =~ /openShift\\.resource\\.build.*/i"
         },
+        {
+          "command": "clusters.openshift.deploy.rcShowLog",
+          "group": "1@1",
+          "when": "view == extension.vsKubernetesExplorer && viewItem =~ /openShift\\.resource\\.rc.*/i"
+        },
         {
           "command": "clusters.openshift.deploy.delete",
-          "group": "1",
+          "group": "2@0",
           "when": "view == extension.vsKubernetesExplorer && viewItem =~ /openShift\\.resource\\.rc.*/i"
         },
         {

src/extension.ts

@@ -65,6 +65,8 @@ export async function activate(context: vscode.ExtensionContext) {
         vscode.commands.registerCommand('clusters.openshift.deploy.dc.showLog.palette', (context) => execute(DeploymentConfig.showLog, context)),
         vscode.commands.registerCommand('clusters.openshift.deploy.delete', (context) => execute(DeploymentConfig.delete, context)),
         vscode.commands.registerCommand('clusters.openshift.deploy.delete.palette', (context) => execute(DeploymentConfig.delete, context)),
+        vscode.commands.registerCommand('clusters.openshift.deploy.rcShowLog', (context) => execute(DeploymentConfig.rcShowLog, context)),
+        vscode.commands.registerCommand('clusters.openshift.deploy.rcShowLog.palette', (context) => execute(DeploymentConfig.rcShowLog, context)),
         vscode.commands.registerCommand('clusters.openshift.build.showLog', (context) => execute(Build.showLog, context)),
         vscode.commands.registerCommand('clusters.openshift.build.followLog', (context) => execute(Build.followLog, context)),
         vscode.commands.registerCommand('clusters.openshift.build.delete', (context) => execute(Build.delete, context)),

src/k8s/deployment.ts

@@ -28,6 +28,10 @@ export class Command {
     static delete(replica: String) {
         return `oc delete rc ${replica}`;
     }
+
+    static showLog(replica: string) {
+        return `oc logs rc/${replica}`;
+    }
 }
 
 export class DeploymentConfigNodeContributor implements ClusterExplorerV1.NodeContributor {
@@ -75,6 +79,14 @@ export class DeploymentConfig {
             'You have no replicas available');
     }
 
+    static async rcShowLog(context: { impl: any; }): Promise<string> {
+        const replica = await DeploymentConfig.selectReplica(context, "Select a Replica too see the logs");
+        if (replica) {
+            DeploymentConfig.odo.executeInTerminal(Command.showLog(replica));
+        }
+        return replica;
+    }
+
     static async showLog(context: { name: string; }): Promise<string> {
         let deployName: string = context ? context.name : null;
         if (!deployName) deployName = await common.selectResourceByName(DeploymentConfig.getDeploymentConfigNames("You have no DeploymentConfigs available to see log's"), "Select a DeploymentConfig too see log's");

test/unit/k8s/deployment.test.ts

@@ -63,6 +63,30 @@ suite('K8s/deployment', () => {
         }
     }`;
 
+    const context = {
+        id: "dummy",
+        impl: {
+            id: "rc/comp1-app-2",
+            kind: {
+                manifestKind: "ReplicationController",
+                abbreviation: "rc"
+            },
+            namespace: "myproject",
+            name: "comp1-app-2",
+            number: 2,
+            manifest: "ReplicationController",
+            metadata: undefined,
+            node: "rc",
+            resourceId: "rc/comp1-app-2"
+        },
+        resourceKind: {
+            manifestKind: "ReplicationController",
+            abbreviation: "rc"
+        },
+        nodeCategory: "kubernetes-explorer-node",
+        nodeType: "extension"
+    };
+
     setup(() => {
         sandbox = sinon.createSandbox();
         termStub =  sandbox.stub(OdoImpl.prototype, 'executeInTerminal');
@@ -167,30 +191,35 @@ suite('K8s/deployment', () => {
         });
     });
 
+    suite('Show Replica Log', () => {
+
+        setup(() => {
+            execStub.resolves({ error: null, stdout: mockData, stderr: '' });
+            const deploymentConfig = {label: "comp1-app"};
+            sandbox.stub(DeploymentConfig, 'getReplicaNames').resolves(["comp1-app-1", "comp1-app-2"]);
+            quickPickStub = sandbox.stub(vscode.window, 'showQuickPick');
+            quickPickStub.onFirstCall().resolves(deploymentConfig);
+            quickPickStub.onSecondCall().resolves("comp1-app-1");
+        });
+
+        test('works from context menu', async () => {
+            await DeploymentConfig.rcShowLog(context);
+            expect(termStub).calledOnceWith(Command.showLog("comp1-app-2"));
+        });
+
+        test('works with no context', async () => {
+            await DeploymentConfig.rcShowLog(null);
+            expect(termStub).calledOnceWith(Command.showLog('comp1-app-1'));
+        });
+
+        test('returns null when no replica selected', async () => {
+            quickPickStub.onSecondCall().resolves();
+            const result = await DeploymentConfig.rcShowLog(null);
+            expect(result).null;
+        });
+    });
+
     suite('Delete', ()=> {
-        const context = {
-            id: "dummy",
-            impl: {
-                id: "rc/comp1-app-2",
-                kind: {
-                    manifestKind: "ReplicationController",
-                    abbreviation: "rc"
-                },
-                namespace: "myproject",
-                name: "comp1-app-2",
-                number: 2,
-                manifest: "ReplicationController",
-                metadata: undefined,
-                node: "rc",
-                resourceId: "rc/comp1-app-2"
-            },
-            resourceKind: {
-                manifestKind: "ReplicationController",
-                abbreviation: "rc"
-            },
-            nodeCategory: "kubernetes-explorer-node",
-            nodeType: "extension"
-        };
 
         const deploymentData = `comp1-app-1\\ncomp1-app-2`;