Add duplicate mount path validation for storage (#1946)

Signed-off-by: Denis Golovin [email protected]

Author: dgolovin

src/odo.ts

@@ -29,6 +29,7 @@ import { Command } from './odo/command';
 import { BuilderImage } from './odo/builderImage';
 import { ImageStream } from './odo/imageStream';
 import { VsCommandError } from './vscommand';
+import { Storage } from './odo/storage';
 
 import bs = require('binary-search');
 
@@ -217,7 +218,7 @@ export class OpenShiftApplication extends OpenShiftObjectImpl {
 }
 
 export class OpenShiftStorage extends OpenShiftObjectImpl {
-    constructor(parent: OpenShiftObject, name: string) {
+    constructor(parent: OpenShiftObject, name: string, public readonly mountPath: string) {
         super(parent, name, ContextType.STORAGE, 'storage-node.png', TreeItemCollapsibleState.None);
     }
 
@@ -341,7 +342,7 @@ export interface Odo {
     getComponentChildren(component: OpenShiftObject): Promise<OpenShiftObject[]>;
     getRoutes(component: OpenShiftObject): Promise<OpenShiftObject[]>;
     getComponentPorts(component: OpenShiftObject): Promise<odo.Port[]>;
-    getStorageNames(component: OpenShiftObject): Promise<OpenShiftObject[]>;
+    getStorageNames(component: OpenShiftObject): Promise<OpenShiftStorage[]>;
     getServiceTemplates(): Promise<string[]>;
     getServiceTemplatePlans(svc: string): Promise<string[]>;
     getServices(application: OpenShiftObject): Promise<OpenShiftObject[]>;
@@ -732,13 +733,13 @@ export class OdoImpl implements Odo {
             .map((value) => new OpenShiftUrl(component, value.metadata.name));
     }
 
-    async getStorageNames(component: OpenShiftObject): Promise<OpenShiftObject[]> {
-        return (await this.getComponentChildren(component)).filter((value) => value.contextValue === ContextType.STORAGE);
+    async getStorageNames(component: OpenShiftObject): Promise<OpenShiftStorage[]> {
+        return (await this.getComponentChildren(component)).filter((value) => value.contextValue === ContextType.STORAGE) as OpenShiftStorage[];
     }
 
     public async _getStorageNames(component: OpenShiftObject): Promise<OpenShiftObject[]> {
         const result: cliInstance.CliExitData = await this.execute(Command.listStorageNames(), component.contextPath ? component.contextPath.fsPath : Platform.getUserHomePath());
-        return this.loadItems<Storage>(result).map<OpenShiftObject>((value) => new OpenShiftStorage(component, value.metadata.name));
+        return this.loadItems<Storage>(result).map<OpenShiftObject>((value) => new OpenShiftStorage(component, value.metadata.name, value.spec.path));
     }
 
     public async getServiceTemplates(): Promise<string[]> {
@@ -1003,7 +1004,7 @@ export class OdoImpl implements Odo {
 
     public async createStorage(component: OpenShiftObject, name: string, mountPath: string, size: string): Promise<OpenShiftObject> {
         await this.execute(Command.createStorage(name, mountPath, size), component.contextPath.fsPath);
-        return this.insertAndReveal(new OpenShiftStorage(component, name));
+        return this.insertAndReveal(new OpenShiftStorage(component, name, mountPath));
     }
 
     public async deleteStorage(storage: OpenShiftObject): Promise<OpenShiftObject> {

src/openshift/storage.ts

@@ -26,7 +26,11 @@ export class Storage extends OpenShiftItem {
 
         const mountPath = await window.showInputBox({prompt: 'Specify the mount path',
         ignoreFocusOut: true,
-        validateInput: (value: string) => {
+        validateInput: async (value: string) => {
+            const storages = await storageList;
+            if (storages.find(storage => storage.mountPath === value)) {
+                return 'Mount path is already taken';
+            }
             if (isEmpty(value.trim())) {
                 return 'Invalid mount path';
             }

test/unit/odo.test.ts

@@ -401,11 +401,17 @@ suite('odo', () => {
                             {
                                 metadata: {
                                     name: 'storage1'
+                                },
+                                spec: {
+                                    path: '/mnt/path1'
                                 }
                             },
                             {
                                 metadata: {
                                     name: 'storage2'
+                                },
+                                spec: {
+                                    path: '/mnt/path1'
                                 }
                             }
                         ]
@@ -426,11 +432,17 @@ suite('odo', () => {
                             {
                                 metadata: {
                                     name: 'route1'
+                                },
+                                spec: {
+                                    path: '/mnt/path1'
                                 }
                             },
                             {
                                 metadata: {
                                     name: 'route2'
+                                },
+                                spec: {
+                                    path: '/mnt/path2'
                                 }
                             }
                         ]
@@ -448,12 +460,18 @@ suite('odo', () => {
                 items: [
                     {
                         metadata: {
-                            name: 'route1'
+                            name: 'storage1'
+                        },
+                        spec: {
+                            path: '/mnt/path1'
                         }
                     },
                     {
                         metadata: {
-                            name: 'route2'
+                            name: 'storage2'
+                        },
+                        spec: {
+                            path: '/mnt/path2'
                         }
                     }
                 ]
@@ -462,20 +480,20 @@ suite('odo', () => {
                 items: [
                     {
                         metadata: {
-                            name: 'storage1'
+                            name: 'route1'
                         }
                     },
                     {
                         metadata: {
-                            name: 'storage2'
+                            name: 'route2'
                         }
                     }
                 ]
             }), stderr: ''});
             const result = await odoCli.getComponentChildren(component);
 
-            expect(result[2].getName()).deep.equals('route1');
-            expect(result[0].getName()).deep.equals('storage1');
+            expect(result[2].getName()).deep.equals('storage1');
+            expect(result[0].getName()).deep.equals('route1');
         });
     });