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
- Replace usage of https.get(..) with fetch

Signed-off-by: Roland Grunberg <rgrunber@redhat.com>

Author: rgrunber

src/devfile-registry/devfileRegistryWrapper.ts

@@ -142,31 +142,26 @@ export class DevfileRegistry {
     }
 
     private static async _get(url: string, abortTimeout?: number, abortController?: AbortController): Promise<string> {
+        const timeoutVal = abortTimeout ? abortTimeout : 5000;
+        const controller = new AbortController();
+        const signal = controller.signal;
+
+        const timeout = setTimeout(() => {
+            controller.abort();
+        }, timeoutVal);
+
         return new Promise<string>((resolve, reject) => {
-            const signal = abortController?.signal;
-            const timeout = abortTimeout ? abortTimeout : 5000;
-            const options = { rejectUnauthorized: false, signal, timeout };
-            let result: string = '';
-            https.get(url, options, (response) => {
-                if (response.statusCode < 500) {
-                    response.on('data', (d) => {
-                        result = result.concat(d);
-                    });
-                    response.resume();
-                    response.on('end', () => {
-                        if (!response.complete) {
-                            reject(new Error(`The connection was terminated while the message was still being sent: ${response.statusMessage}`));
-                        } else {
-                            resolve(result);
-                        }
-                    });
-                } else {
-                    reject(new Error(`Connect error: ${response.statusMessage}`));
+            fetch(url, { signal }).then(response => {
+                if (!response.ok) {
+                    reject(`Connect error: ${response.statusText}`);
                 }
-            }).on('error', (e) => {
-                reject(new Error(`Connect error: ${e}`));
-            }).on('success', (s) => {
+                return response.text();
+            }).then(result => {
                 resolve(result);
+            }).catch(error => {
+                reject(new Error(`Connect error: ${error}`));
+            }).finally(() => {
+                clearTimeout(timeout);
             });
         });
     }
@@ -181,4 +176,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 {
             );
         }
     }
-}
+}