add json output for catalog list services

Author: sudhirverma

src/odo.ts

@@ -99,7 +99,7 @@ export class Command {
         return `odo catalog list components`;
     }
     static listCatalogServices () {
-        return `odo catalog list services`;
+        return `odo catalog list services -o json`;
     }
     static listStorageNames(project: string, app: string, component: string) {
         return `odo storage list -o json`;
@@ -772,20 +772,30 @@ export class OdoImpl implements Odo {
     }
 
     public async getServiceTemplates(): Promise<string[]> {
+        // tslint:disable-next-line: prefer-const
+        let serviceTemplate: Array<string>;
+        let items: Array<any> = [];
         const result: cliInstance.CliExitData = await this.execute(Command.listCatalogServices(), Platform.getUserHomePath(), false);
-        if (result.error) {
-            throw new Error(result.stderr.trim());
+        try {
+            items = JSON.parse(result.stdout).items;
+        } catch (err) {
+            throw new Error(JSON.parse(result.stderr).message);
         }
-        return result.stdout.trim().split('\n').slice(1).map((value) => value.trim().replace(/\s{1,}/g, '|').split('|')[0]);
+        serviceTemplate = items.map((value: { metadata: { name: string; }; }) => value.metadata.name);
+        return serviceTemplate;
     }
 
     public async getServiceTemplatePlans(svcName: string): Promise<string[]> {
+        let items: Array<any>;
         const result: cliInstance.CliExitData = await this.execute(Command.listCatalogServices(), Platform.getUserHomePath());
-        const plans = result.stdout.trim().split('\n').slice(1).filter((value) => {
-                const data = value.trim().replace(/\s{1,}/g, '|').split('|');
-                return data[0] === svcName;
-            }).map((value) => value.trim().replace(/\s{1,}/g, '|').split('|')[1]);
-        return plans[0].split(',');
+        try {
+            items = JSON.parse(result.stdout).items;
+        } catch (err) {
+            // ignore
+        }
+        const stpObject: Array<any> = items.filter((value) => value.metadata.name === svcName);
+        const serviceTemplatePlans  = stpObject.map((value: { spec: { planList: any; }; }) => value.spec.planList)[0];
+        return serviceTemplatePlans;
     }
 
     async getServices(application: OpenShiftObject): Promise<OpenShiftObject[]> {

test/unit/odo.test.ts

@@ -267,18 +267,21 @@ suite("odo", () => {
         });
 
         test('getServiceTemplates throws exception if service catalog is not enabled', async () => {
-            const stderr = 'error message';
-            execStub.resolves({error: new Error(), stdout: '', stderr});
+            execStub.resolves({error: null, stdout: '', stderr:
+                JSON.stringify({
+                    kind: "Error",
+                    apiVersion: "odo.openshift.io/v1alpha1",
+                    message: "unable to list services because Service Catalog is not enabled in your cluster"
+                })
+            });
             let e: Error;
             try {
                 await odoCli.getServiceTemplates();
             } catch (err) {
                 e = err;
             }
 
-            expect(e, 'getServiceTemplates has not threw error').is.not.undefined;
-            expect(e.message, 'error has no message fields').is.not.undefined;
-            expect(e.message, 'message is not equal stdout stream output').equals(stderr);
+            expect(e.message).equals("unable to list services because Service Catalog is not enabled in your cluster");
 
         });
 
@@ -440,36 +443,46 @@ suite("odo", () => {
     });
 
     suite("service integration", () => {
-        const svc1 = 'svc1';
-        const svc2 = 'svc2';
-        const svc3 = 'svc3';
-
-        const odoPlans: string = [
-            `NAME      PLANS`,
-            `${svc1}   default,free,paid`,
-            `${svc2}   default,free`,
-            `${svc3}   default`
-        ].join('\n');
-        const data: CliExitData = { error: undefined, stderr: null, stdout: odoPlans };
+        const data: CliExitData = { error: undefined, stderr: null, stdout:
+            JSON.stringify({
+                kind: "ServiceTypeList",
+                apiVersion: "odo.openshift.io/v1alpha1",
+                metadata: {
+                    creationTimestamp: null
+                },
+                items: [
+                    {
+                        kind: "ServiceType",
+                        apiVersion: "odo.openshift.io/v1alpha1",
+                        metadata: {
+                            name: "cakephp-mysql-persistent",
+                            creationTimestamp: null
+                        },
+                        spec: {
+                            hidden: false,
+                            planList: [
+                                "default"
+                            ]
+                        }
+                    },
+                ]
+            })
+        };
 
         setup(() => {
             sandbox.stub(odo.OdoImpl.prototype, 'execute').resolves(data);
         });
 
         test("getServiceTemplates returns correct number of services", async () => {
             const result: string[] = await odoCli.getServiceTemplates();
-            assert.equal(result.length, 3);
-            assert.equal(result[0], svc1);
-            assert.equal(result[1], svc2);
-            assert.equal(result[2], svc3);
+            expect(result.length).equals(1);
+            expect(result[0]).equals("cakephp-mysql-persistent");
         });
 
         test("getServiceTemplatePlans returns correct number of plans for service", async () => {
-            const result: string[] = await odoCli.getServiceTemplatePlans(svc1);
-            assert.equal(result.length, 3);
+            const result: string[] = await odoCli.getServiceTemplatePlans("cakephp-mysql-persistent");
+            assert.equal(result.length, 1);
             assert.equal(result[0], 'default');
-            assert.equal(result[1], 'free');
-            assert.equal(result[2], 'paid');
         });
     });