Unlink a component with multiple port (#1265)

Author: sudhirverma

src/odo.ts

@@ -225,8 +225,8 @@ export class Command {
     static getComponentJson(project: string, app: string, component: string) {
         return `oc get service ${component}-${app} --namespace ${project} -o json`;
     }
-    static unlinkComponents(project: string, app: string, comp1: string, comp2: string) {
-        return `odo unlink --project ${project} --app ${app} ${comp2} --component ${comp1}`;
+    static unlinkComponents(project: string, app: string, comp1: string, comp2: string, port: string) {
+        return `odo unlink --project ${project} --app ${app} ${comp2} --port ${port} --component ${comp1}`;
     }
     static unlinkService(project: string, app: string, service: string, comp: string) {
         return `odo unlink --project ${project} --app ${app} ${service} --component ${comp}`;

src/openshift/component.ts

@@ -97,13 +97,24 @@ export class Component extends OpenShiftItem {
         }
     }
 
+    static async getLinkPort(component: OpenShiftObject, compName: string) {
+        const compData = await Component.odo.execute(Command.describeComponentJson(component.getParent().getParent().getName(), component.getParent().getName(), compName), component.contextPath ? component.contextPath.fsPath : Platform.getUserHomePath());
+        return JSON.parse(compData.stdout);
+    }
+
     static async unlinkAllComponents(component: OpenShiftObject) {
         const linkComponent = await Component.getLinkData(component);
         const getLinkComponent = linkComponent['status'].linkedComponents;
         if (getLinkComponent) {
-            Object.keys(getLinkComponent).forEach(async key => {
-                await Component.odo.execute(Command.unlinkComponents(component.getParent().getParent().getName(), component.getParent().getName(), key, component.getName()), component.contextPath.fsPath);
-            });
+            for (const key of Object.keys(getLinkComponent)) {
+                const getLinkPort = await Component.getLinkPort(component, key);
+                const getPort = getLinkPort['status'].linkedComponents[component.getName()];
+                if (getPort) {
+                    for (const port of getPort) {
+                        await Component.odo.execute(Command.unlinkComponents(component.getParent().getParent().getName(), component.getParent().getName(), key, component.getName(), port), component.contextPath.fsPath);
+                    }
+                }
+            }
         }
     }
 
@@ -177,8 +188,11 @@ export class Component extends OpenShiftItem {
         });
         const compName = await window.showQuickPick(linkCompName, {placeHolder: "Select a Component to unlink", ignoreFocusOut: true});
         if (!compName) return null;
+        const getLinkPort = linkComponent['status'].linkedComponents[compName];
+        const port = await window.showQuickPick(getLinkPort, {placeHolder: "Select a Port"});
+        if (!port) return null;
         return Progress.execFunctionWithProgress(`Unlinking Component`,
-            () => Component.odo.execute(Command.unlinkComponents(component.getParent().getParent().getName(), component.getParent().getName(), component.getName(), compName), component.contextPath.fsPath)
+            () => Component.odo.execute(Command.unlinkComponents(component.getParent().getParent().getName(), component.getParent().getName(), component.getName(), compName, port), component.contextPath.fsPath)
                 .then(() => `Component '${compName}' has been successfully unlinked from the Component '${component.getName()}'`)
                 .catch((err) => Promise.reject(`Failed to unlink Component with error '${err}'`))
         );

test/unit/openshift/component.test.ts

@@ -528,6 +528,7 @@ suite('OpenShift/Component', () => {
 
         test('errors when a command fails', async () => {
             quickPickStub.onFirstCall().resolves('comp2');
+            quickPickStub.onSecondCall().resolves('8080');
             execStub.onFirstCall().rejects(errorMessage);
             let savedErr: any;