rename default urls

Author: Eslam-Nawara

pkg/environment/config.go

@@ -36,14 +36,17 @@ type Config struct {
 	GraphQL       []string `json:"graphql_urls"`
 	KycURL        string   `json:"kyc_url"`
 	RegistrarURL  string   `json:"registrar_url"`
-	FlistURL      string   `json:"flist_url"`
-	V4FlistURL    string   `json:"v4_flist_url"`
-	HubURL        string   `json:"hub_url"`
-	V4HubURL      string   `json:"v4_hub_url"`
-	HubStorage    string   `json:"hub_storage"`
-	V4HubStorage  string   `json:"v4_hub_storage"`
 	BinRepo       string   `json:"bin_repo"`
 	GeoipURLs     []string `json:"geoip_urls"`
+
+	FlistURL   string `json:"flist_url"`
+	V4FlistURL string `json:"v4_flist_url"`
+
+	HubURL   string `json:"hub_url"`
+	V4HubURL string `json:"v4_hub_url"`
+
+	HubStorage   string `json:"hub_storage"`
+	V4HubStorage string `json:"v4_hub_storage"`
 }
 
 // Merge, updates current config with cfg merging and override config

pkg/environment/environment.go

@@ -18,11 +18,11 @@ import (
 const (
 	baseExtendedURL = "https://raw.githubusercontent.com/threefoldtech/zos-config/main/"
 
-	hubURL   = "https://hub.threefold.me"
-	v4HubURL = "https://v4.hub.threefold.me"
+	defaultHubURL   = "https://hub.threefold.me"
+	defaultV4HubURL = "https://v4.hub.threefold.me"
 
-	flistURL   = "redis://hub.threefold.me:9900"
-	v4FlistURL = "redis://v4.hub.threefold.me:9940"
+	defaultFlistURL   = "redis://hub.threefold.me:9900"
+	defaultV4FlistURL = "redis://v4.hub.threefold.me:9940"
 
 	defaultHubStorage   = "zdb://hub.threefold.me:9900"
 	defaultV4HubStorage = "zdb://v4.hub.threefold.me:9940"
@@ -55,11 +55,12 @@ type Environment struct {
 	RunningMode RunMode
 
 	FlistURL   string
-	HubURL     string
-	V4HubURL   string
 	HubStorage string
 	BinRepo    string
 
+	HubURL   string
+	V4HubURL string
+
 	FarmID pkg.FarmID
 	Orphan bool
 
@@ -142,9 +143,9 @@ var (
 			"https://activation.dev.grid.tf/activation/activate",
 			"https://activation.02.dev.grid.tf/activation/activate",
 		},
-		FlistURL:   flistURL,
-		HubURL:     hubURL,
-		V4HubURL:   v4HubURL,
+		FlistURL:   defaultFlistURL,
+		HubURL:     defaultHubURL,
+		V4HubURL:   defaultV4HubURL,
 		HubStorage: defaultHubStorage,
 		BinRepo:    "tf-zos-v3-bins.dev",
 		GraphQL: []string{
@@ -170,9 +171,9 @@ var (
 			"https://activation.test.grid.tf/activation/activate",
 			"https://activation.02.test.grid.tf/activation/activate",
 		},
-		FlistURL:   flistURL,
-		HubURL:     hubURL,
-		V4HubURL:   v4HubURL,
+		FlistURL:   defaultFlistURL,
+		HubURL:     defaultHubURL,
+		V4HubURL:   defaultV4HubURL,
 		HubStorage: defaultHubStorage,
 		BinRepo:    "tf-zos-v3-bins.test",
 		GraphQL: []string{
@@ -198,9 +199,9 @@ var (
 			"https://activation.qa.grid.tf/activation/activate",
 			"https://activation.02.qa.grid.tf/activation/activate",
 		},
-		FlistURL:   flistURL,
-		HubURL:     hubURL,
-		V4HubURL:   v4HubURL,
+		FlistURL:   defaultFlistURL,
+		HubURL:     defaultHubURL,
+		V4HubURL:   defaultV4HubURL,
 		HubStorage: defaultHubStorage,
 		BinRepo:    "tf-zos-v3-bins.qanet",
 		GraphQL: []string{
@@ -226,19 +227,19 @@ var (
 			// "wss://relay.02.grid.tf",
 		},
 		ActivationURL: []string{
-			"https://activation.grid.threefold.me/activation/activate",
 			"https://activation.grid.tf/activation/activate",
 			"https://activation.02.grid.tf/activation/activate",
+			"https://activation.grid.threefold.me/activation/activate",
 		},
-		FlistURL:   flistURL,
-		HubURL:     hubURL,
-		V4HubURL:   v4HubURL,
+		FlistURL:   defaultFlistURL,
+		HubURL:     defaultHubURL,
+		V4HubURL:   defaultV4HubURL,
 		HubStorage: defaultHubStorage,
 		BinRepo:    "tf-zos-v3-bins",
 		GraphQL: []string{
-			"https://graphql.grid.threefold.me/graphql",
 			"https://graphql.grid.tf/graphql",
 			"https://graphql.02.grid.tf/graphql",
+			"https://graphql.grid.threefold.me/graphql",
 		},
 		KycURL:       "https://kyc.threefold.me",
 		RegistrarURL: "https://registrar.prod4.threefold.me",
@@ -326,29 +327,24 @@ func getEnvironmentFromParams(params kernel.Params) (Environment, error) {
 	if err != nil {
 		// maybe the node can't reach the internet right now
 		// this will enforce node to skip config
+		// or we can keep retrying untill it can fetch config
 		config = Config{}
 	}
 
-	if substrate, ok := params.Get("substrate"); ok {
-		if len(substrate) > 0 {
-			env.SubstrateURL = substrate
-		}
+	if substrate, ok := params.Get("substrate"); ok && len(substrate) > 0 {
+		env.SubstrateURL = substrate
 	} else if substrate := config.SubstrateURL; len(substrate) > 0 {
 		env.SubstrateURL = substrate
 	}
 
-	if relay, ok := params.Get("relay"); ok {
-		if len(relay) > 0 {
-			env.relaysURLs = relay
-		}
+	if relay, ok := params.Get("relay"); ok && len(relay) > 0 {
+		env.relaysURLs = relay
 	} else if relay := config.RelaysURLs; len(relay) > 0 {
 		env.relaysURLs = relay
 	}
 
-	if activation, ok := params.Get("activation"); ok {
-		if len(activation) > 0 {
-			env.ActivationURL = activation
-		}
+	if activation, ok := params.Get("activation"); ok && len(activation) > 0 {
+		env.ActivationURL = activation
 	} else if activation := config.ActivationURL; len(activation) > 0 {
 		env.ActivationURL = activation
 	}
@@ -392,7 +388,7 @@ func getEnvironmentFromParams(params kernel.Params) (Environment, error) {
 
 	// if the node running v4 chage urls to use v4 hub
 	if params.IsV4() {
-		env.FlistURL = v4FlistURL
+		env.FlistURL = defaultV4FlistURL
 		if flist := config.V4FlistURL; len(flist) > 0 {
 			env.FlistURL = flist
 		}

pkg/upgrade/hub/hub.go

@@ -98,11 +98,10 @@ func (h *HubClient) StorageURL() string {
 // StorageURL return hub storage url
 func (h *HubClient) HubBaseURL() string {
 	env := environment.MustGet()
-	hubBaseURL := env.HubURL
 	if kernel.GetParams().IsV4() {
 		return env.V4HubURL
 	}
-	return hubBaseURL
+	return env.HubURL
 }
 
 // Info gets flist info from hub

pkg/upgrade/upgrade_test.go

@@ -21,8 +21,7 @@ func TestUpgraderDownload(t *testing.T) {
 	}
 
 	env := environment.MustGet()
-	hubStorage := env.HubStorage
-	err := Storage(hubStorage)(up)
+	err := Storage(env.HubStorage)(up)
 	require.NoError(err)
 
 	const repo = "azmy.3bot"