Devfile Registries list need not contain Default Devfile Registry.

- When the Devfile Registries list contains other registries, it should
  be permitted to remove the Default Devfile Registry
- Switch between http/https.get(..) depending on URL protocol

Signed-off-by: Roland Grunberg <[email protected]>

Author: rgrunber

src/devfile-registry/devfileRegistryWrapper.ts

@@ -2,7 +2,8 @@
  *  Copyright (c) Red Hat, Inc. All rights reserved.
  *  Licensed under the MIT License. See LICENSE file in the project root for license information.
  *-----------------------------------------------------------------------------------------------*/
-import * as https from 'https';
+import { get as httpGet } from 'http';
+import { get as httpsGet } from 'https';
 import * as YAML from 'js-yaml';
 import { ExecutionContext } from '../cli';
 import { Registry } from '../odo/componentType';
@@ -143,11 +144,17 @@ export class DevfileRegistry {
 
     private static async _get(url: string, abortTimeout?: number, abortController?: AbortController): Promise<string> {
         return new Promise<string>((resolve, reject) => {
+            let request = httpGet;
+            try {
+                request = new URL(url).protocol.startsWith('https') ? httpsGet : httpGet;
+            } catch (err) {
+                // continue
+            }
             const signal = abortController?.signal;
             const timeout = abortTimeout ? abortTimeout : 5000;
             const options = { rejectUnauthorized: false, signal, timeout };
             let result: string = '';
-            https.get(url, options, (response) => {
+            request(url, options, (response) => {
                 if (response.statusCode < 500) {
                     response.on('data', (d) => {
                         result = result.concat(d);
@@ -181,4 +188,4 @@ export class DevfileRegistry {
         this.executionContext = new ExecutionContext();
     }
 
-}
+}

src/odo/odoPreference.ts

@@ -120,16 +120,11 @@ export class OdoPreference {
             const odoPreferenceFile = await fs.readFile(odoPreferenceFilePath, 'utf8');
             const odoPreferences = parse(odoPreferenceFile) as OdoPreferenceObject;
 
-            // If `odoPreferences.OdoSettings.RegistryList` is `null` or doesn't contain the `DefaultDevfileRegistry` item
-            // we have to recover at least the 'DefaultDevfileRegistry` item on it because this whole list will be replaced
-            if (!odoPreferences.OdoSettings.RegistryList) {
+            // If `odoPreferences.OdoSettings.RegistryList` is `null` or doesn't contain any registry item
+            // we should recover the 'DefaultDevfileRegistry` item on it
+            if (!odoPreferences.OdoSettings.RegistryList || odoPreferences.OdoSettings.RegistryList.length === 0) {
                 odoPreferences.OdoSettings.RegistryList = OdoPreference.DefaultOdoPreference.OdoSettings.RegistryList;
                 isToBeReWritten = true;
-            } else {
-                if (!odoPreferences.OdoSettings.RegistryList.find((r) => r.Name === OdoPreference.DEFAULT_DEVFILE_REGISTRY_NAME)) {
-                    odoPreferences.OdoSettings.RegistryList.push(OdoPreference.DefaultOdoPreference.OdoSettings.RegistryList[0]);
-                    isToBeReWritten = true;
-                }
             }
 
             mergedPreference = { ...mergedPreference, ...odoPreferences };
@@ -172,4 +167,4 @@ export class OdoPreference {
             );
         }
     }
-}
+}

src/openshift/cluster.ts

@@ -5,7 +5,8 @@
 
 import { CoreV1Api, KubeConfig, KubernetesObject, V1Secret, V1ServiceAccount } from '@kubernetes/client-node';
 import { Cluster as KcuCluster, Context as KcuContext, User } from '@kubernetes/client-node/dist/config_types';
-import * as https from 'https';
+import { get as httpGet } from 'http';
+import { get as httpsGet } from 'https';
 import { Disposable, ExtensionContext, QuickInputButtons, QuickPickItem, QuickPickItemButtonEvent, QuickPickItemKind, ThemeIcon, Uri, commands, env, window, workspace } from 'vscode';
 import { CommandText } from '../base/command';
 import { CliChannel } from '../cli';
@@ -666,9 +667,15 @@ export class Cluster extends OpenShiftItem implements Disposable {
      */
     static async pingCluster(url: string, abortController: AbortController): Promise<boolean> {
         return new Promise<boolean>((resolve, reject) => {
+            let request = httpGet;
+            try {
+                request = new URL(url).protocol.startsWith('https') ? httpsGet : httpGet;
+            } catch (err) {
+                // continue
+            }
             const signal = abortController?.signal;
             const options = { rejectUnauthorized: false, signal };
-            https.get(`${url}/api`, options, (response) => {
+            request(`${url}/api`, options, (response) => {
                 if (response.statusCode < 500) {
                     resolve(true);
                 } else {
@@ -1243,4 +1250,4 @@ export class Cluster extends OpenShiftItem implements Disposable {
         }
         return Cluster.tokenLogin(server, true, kcu.currentContext, pipelineToken);
     }
-}
+}