Fix default registry support (#3941)

* fix: default registry support

Signed-off-by: jingfu wang <jingfu.j.wang@ibm.com>

* tests: fix unit tests

Signed-off-by: jingfu wang <jingfu.j.wang@ibm.com>

pkg/preference/preference.go

@@ -216,16 +216,17 @@ func NewPreferenceInfo() (*PreferenceInfo, error) {
 		Filename:   preferenceFile,
 	}
 
+	// Default devfile registry
+	defaultRegistryList := []Registry{
+		{
+			Name:   DefaultDevfileRegistryName,
+			URL:    DefaultDevfileRegistryURL,
+			Secure: false,
+		},
+	}
+
 	// If the preference file doesn't exist then we return with default preference
 	if _, err = os.Stat(preferenceFile); os.IsNotExist(err) {
-		// Handle user has preference file but doesn't use dynamic registry before
-		defaultRegistryList := []Registry{
-			{
-				Name:   DefaultDevfileRegistryName,
-				URL:    DefaultDevfileRegistryURL,
-				Secure: false,
-			},
-		}
 		c.OdoSettings.RegistryList = &defaultRegistryList
 		return &c, nil
 	}
@@ -235,6 +236,11 @@ func NewPreferenceInfo() (*PreferenceInfo, error) {
 		return nil, err
 	}
 
+	// Handle user has preference file but doesn't use dynamic registry before
+	if c.OdoSettings.RegistryList == nil {
+		c.OdoSettings.RegistryList = &defaultRegistryList
+	}
+
 	return &c, nil
 }
 

pkg/preference/preference_test.go

@@ -7,6 +7,8 @@ import (
 	"reflect"
 	"strconv"
 	"testing"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 func TestNew(t *testing.T) {
@@ -26,8 +28,22 @@ func TestNew(t *testing.T) {
 		{
 			name: "Test filename is being set",
 			output: &PreferenceInfo{
-				Filename:   tempConfigFile.Name(),
-				Preference: NewPreference(),
+				Filename: tempConfigFile.Name(),
+				Preference: Preference{
+					TypeMeta: metav1.TypeMeta{
+						Kind:       preferenceKind,
+						APIVersion: preferenceAPIVersion,
+					},
+					OdoSettings: OdoSettings{
+						RegistryList: &[]Registry{
+							{
+								Name:   DefaultDevfileRegistryName,
+								URL:    DefaultDevfileRegistryURL,
+								Secure: false,
+							},
+						},
+					},
+				},
 			},
 			success: true,
 		},