Add support to binary file for component creation (#347)

Author: mohitsuman

src/openshift/component.ts

@@ -15,24 +15,31 @@ export class Component extends OpenShiftItem {
     static async create(application: OpenShiftObject): Promise<string> {
         // should use QuickPickItem with label and description
         const sourceTypes: vscode.QuickPickItem[] = [
-        {
-            label: 'Git Repository',
-            description: 'Use an existing git repository as a source for the component'
-        },
-        {
-            label: 'Workspace Directory',
-            description: 'Use workspace directory as a source for the component'
-        }];
+            {
+                label: 'Git Repository',
+                description: 'Use an existing git repository as a source for the component'
+            },
+            {
+                label: 'Binary File',
+                description: 'Use binary file as a source for the component'
+            },
+            {
+                label: 'Workspace Directory',
+                description: 'Use workspace directory as a source for the component'
+            }
+        ];
         const componentSource = await vscode.window.showQuickPick(sourceTypes, {
             placeHolder: "Select source type for component"
         });
         if (!componentSource) return null;
 
         let command: Promise<string>;
         if (componentSource.label === 'Git Repository') {
-            command = Component.createGit(application);
+            command = Component.createFromGit(application);
+        } else if (componentSource.label === 'Binary File') {
+            command = Component.createFromBinary(application);
         } else {
-            command = Component.createLocal(application);
+            command = Component.createFromLocal(application);
         }
         return command.catch((err) => Promise.reject(`Failed to create component with error '${err}'`));
     }
@@ -131,7 +138,7 @@ export class Component extends OpenShiftItem {
         return null;
     }
 
-    private static async createLocal(application: OpenShiftObject): Promise<string> {
+    private static async createFromLocal(application: OpenShiftObject): Promise<string> {
         const folder = await vscode.window.showWorkspaceFolderPick({
             placeHolder: 'Select the target workspace folder'
         });
@@ -167,7 +174,7 @@ export class Component extends OpenShiftItem {
         .then(() => `Component '${componentName}' successfully created`);
     }
 
-    private static async createGit(application: OpenShiftObject): Promise<string> {
+    private static async createFromGit(application: OpenShiftObject): Promise<string> {
         const repoURI = await vscode.window.showInputBox({prompt: 'Git repository URI', validateInput:
             (value: string) => {
                 if (validator.isEmpty(value.trim())) {
@@ -211,4 +218,38 @@ export class Component extends OpenShiftItem {
         .then(() => Component.explorer.refresh(application))
         .then(() => `Component '${componentName}' successfully created`);
     }
+
+    private static async createFromBinary(application: OpenShiftObject): Promise<string> {
+        const binaryFile = await vscode.window.showOpenDialog({
+            openLabel: 'Select the binary file'
+        });
+
+        if (!binaryFile) return null;
+
+        const componentName = await vscode.window.showInputBox({prompt: "Component name", validateInput: (value: string) => {
+            if (validator.isEmpty(value.trim())) {
+                return 'Empty component name';
+            }
+        }});
+
+        if (!componentName) return null;
+
+        const componentTypeName = await vscode.window.showQuickPick(Component.odo.getComponentTypes(), {placeHolder: "Component type"});
+
+        if (!componentTypeName) return null;
+
+        const componentTypeVersion = await vscode.window.showQuickPick(Component.odo.getComponentTypeVersions(componentTypeName), {placeHolder: "Component type Version"});
+
+        if (!componentTypeVersion) return null;
+
+        const project = application.getParent();
+        return Progress.execWithProgress({
+            cancellable: false,
+            location: vscode.ProgressLocation.Notification,
+            title: `Creating new component '${componentName}'`
+        }, [{command: `odo create ${componentTypeName}:${componentTypeVersion} ${componentName} --binary ${binaryFile} --app ${application.getName()} --project ${project.getName()}`, increment: 100}
+        ], Component.odo)
+        .then(() => Component.explorer.refresh(application))
+        .then(() => `Component '${componentName}' successfully created`);
+    }
 }

test/openshift/component.test.ts

@@ -92,6 +92,13 @@ suite('Openshift/Component', () => {
                 expect(result).null;
             });
 
+            test('returns null when no component name selected', async () => {
+                inputStub.resolves();
+                const result = await Component.create(appItem);
+
+                expect(result).null;
+            });
+
             test('returns null when no component type selected', async () => {
                 quickPickStub.onSecondCall().resolves();
                 const result = await Component.create(appItem);
@@ -164,6 +171,55 @@ suite('Openshift/Component', () => {
                 expect(commandStub).calledOnceWith('git.clone', uri);
             });
         });
+
+        suite('from binary file', () => {
+            let fileStub: sinon.SinonStub;
+            const filePath = 'test/sample.war';
+
+            setup(() => {
+                quickPickStub.onFirstCall().resolves({ label: 'Binary File' });
+                fileStub = sandbox.stub(vscode.window, 'showOpenDialog').resolves(filePath);
+                inputStub.resolves(componentItem.getName());
+            });
+
+            test('happy path works', async () => {
+                const steps = [
+                    {command: `odo create ${componentType}:${version} ${componentItem.getName()} --binary ${filePath} --app ${appItem.getName()} --project ${projectItem.getName()}`, increment: 100}
+                ];
+                const result = await Component.create(appItem);
+
+                expect(result).equals(`Component '${componentItem.getName()}' successfully created`);
+                expect(progressStub).calledOnceWith(sinon.match.object, steps);
+            });
+
+            test('returns null when no binary file selected', async () => {
+                fileStub.resolves();
+                const result = await Component.create(appItem);
+
+                expect(result).null;
+            });
+
+            test('returns null when no component name selected', async () => {
+                inputStub.resolves();
+                const result = await Component.create(appItem);
+
+                expect(result).null;
+            });
+
+            test('returns null when no component type selected', async () => {
+                quickPickStub.onSecondCall().resolves();
+                const result = await Component.create(appItem);
+
+                expect(result).null;
+            });
+
+            test('returns null when no component type version selected', async () => {
+                quickPickStub.onThirdCall().resolves();
+                const result = await Component.create(appItem);
+
+                expect(result).null;
+            });
+        });
     });
 
     suite('del', () => {