Always use --registry option when creating component

This PR fixes #2141.

Signed-off-by: Denis Golovin dgolovin@redhat.com

Author: dgolovin

src/odo.ts

@@ -358,7 +358,7 @@ export interface Odo {
     createApplication(application: OpenShiftObject): Promise<OpenShiftObject>;
     deleteApplication(application: OpenShiftObject): Promise<OpenShiftObject>;
     createComponentFromGit(application: OpenShiftObject, type: string, version: string, name: string, repoUri: string, context: Uri, ref: string): Promise<OpenShiftObject>;
-    createComponentFromFolder(application: OpenShiftObject, type: string, version: string, name: string, path: Uri, starterName?: string, useExistingDevfile?: boolean): Promise<OpenShiftObject>;
+    createComponentFromFolder(application: OpenShiftObject, type: string, version: string, registryName: string, name: string, path: Uri, starterName?: string, useExistingDevfile?: boolean): Promise<OpenShiftObject>;
     createComponentFromBinary(application: OpenShiftObject, type: string, version: string, name: string, path: Uri, context: Uri): Promise<OpenShiftObject>;
     deleteComponent(component: OpenShiftObject): Promise<OpenShiftObject>;
     undeployComponent(component: OpenShiftObject): Promise<OpenShiftObject>;
@@ -889,8 +889,8 @@ export class OdoImpl implements Odo {
         return application;
     }
 
-    public async createComponentFromFolder(application: OpenShiftObject, type: string, version: string, name: string, location: Uri, starter: string = undefined, useExistingDevfile = false): Promise<OpenShiftObject> {
-        await this.execute(Command.createLocalComponent(application.getParent().getName(), application.getName(), type, version, name, location.fsPath, starter, useExistingDevfile), location.fsPath);
+    public async createComponentFromFolder(application: OpenShiftObject, type: string, version: string, registryName: string, name: string, location: Uri, starter: string = undefined, useExistingDevfile = false): Promise<OpenShiftObject> {
+        await this.execute(Command.createLocalComponent(application.getParent().getName(), application.getName(), type, version, registryName, name, location.fsPath, starter, useExistingDevfile), location.fsPath);
         if (workspace.workspaceFolders && application.getParent().getParent()) { // if there are workspace folders and cluster is accessible
             const targetApplication = (await this.getApplications(application.getParent())).find((value) => value === application);
             if (!targetApplication) {

src/odo/catalog.ts

@@ -3,6 +3,18 @@
  *  Licensed under the MIT License. See LICENSE file in the project root for license information.
  *-----------------------------------------------------------------------------------------------*/
 
+export interface Registry {
+    Name: string;
+    URL: string;
+    Secure: boolean;
+}
+
+export const DefaultRegistry: Registry = {
+    Name: 'DefaultDevfileRegistry',
+    URL: 'https://github.com/odo-devfiles/registry',
+    Secure: false
+};
+
 export interface ComponentDescription {
     schemaVersion: string;
     metadata: {

src/odo/command.ts

@@ -391,6 +391,7 @@ export class Command {
         app: string,
         type = '', // will use empty string in case of undefined type passed in
         version: string,
+        registryName: string,
         name: string,
         folder: string,
         starter: string = undefined,
@@ -400,6 +401,9 @@ export class Command {
         if (version) {
             cTxt.addOption(new CommandOption('--s2i'));
         }
+        if (registryName) {
+            cTxt.addOption(new CommandOption('--registry', registryName));
+        }
         cTxt.addOption(new CommandOption('--context', folder))
             .addOption(new CommandOption('--app', app))
             .addOption(new CommandOption('--project', project));

src/openshift/component.ts

@@ -698,8 +698,9 @@ export class Component extends OpenShiftItem {
                 `Creating new Component '${componentName}'`,
                 () => Component.odo.createComponentFromFolder(
                     application,
-                    componentType? componentType.name : undefined, // in case of using existing devfile
-                    componentType? componentType.version : undefined,
+                    componentType?.name, // in case of using existing devfile
+                    componentType?.version,
+                    componentType?.registryName,
                     componentName,
                     folder,
                     createStarter,
@@ -1034,7 +1035,13 @@ export class Component extends OpenShiftItem {
                     const gitRef = bcJson.spec.source.git.ref || 'master';
                     await Component.odo.execute(Command.createGitComponent(prjName, appName, compTypeName, compTypeVersion, compName, gitUrl, gitRef), workspaceFolder.fsPath);
                 } else { // componentType === ComponentType.Local
-                    await Component.odo.execute(Command.createLocalComponent(prjName, appName, componentJson.metadata.labels['app.kubernetes.io/name'], componentJson.metadata.labels['app.openshift.io/runtime-version'], compName, workspaceFolder.fsPath));
+                    await Component.odo.execute(Command.createLocalComponent(
+                        prjName,
+                        appName,
+                        componentJson.metadata.labels['app.kubernetes.io/name'],
+                        componentJson.metadata.labels['app.openshift.io/runtime-version'],
+                        undefined,
+                        compName, workspaceFolder.fsPath));
                 }
                 // import storage if present
                 if (componentJson.spec.template.spec.containers[0].volumeMounts) {

test/integration/command.test.ts

@@ -183,6 +183,7 @@ suite('odo commands integration', () => {
                     newAppName,
                     'nodejs',
                     'latest',
+                    undefined,
                     newNodeJsComponent,
                     componentLocation
                 )

test/unit/openshift/component.test.ts

@@ -148,7 +148,7 @@ suite('OpenShift/Component', () => {
                 expect(result.toString()).equals(`Component '${componentItem.getName()}' successfully created. To deploy it on cluster, perform 'Push' action.`);
                 expect(progressFunctionStub).calledOnceWith(
                     `Creating new Component '${componentItem.getName()}'`);
-                expect(execStub).calledWith(Command.createLocalComponent(appItem.getParent().getName(), appItem.getName(), componentType.name, version, componentItem.getName(), folder.uri.fsPath));
+                expect(execStub).calledWith(Command.createLocalComponent(appItem.getParent().getName(), appItem.getName(), componentType.name, version, undefined, componentItem.getName(), folder.uri.fsPath));
             });
 
             test('returns null when no option is selected from quick pick', async () => {