add v4hub url to env

Author: Eslam-Nawara

pkg/environment/environment.go

@@ -56,6 +56,7 @@ type Environment struct {
 
 	FlistURL   string
 	HubURL     string
+	V4HubURL   string
 	HubStorage string
 	BinRepo    string
 
@@ -143,6 +144,7 @@ var (
 		},
 		FlistURL:   flistURL,
 		HubURL:     hubURL,
+		V4HubURL:   v4HubURL,
 		HubStorage: defaultHubStorage,
 		BinRepo:    "tf-zos-v3-bins.dev",
 		GraphQL: []string{
@@ -170,6 +172,7 @@ var (
 		},
 		FlistURL:   flistURL,
 		HubURL:     hubURL,
+		V4HubURL:   v4HubURL,
 		HubStorage: defaultHubStorage,
 		BinRepo:    "tf-zos-v3-bins.test",
 		GraphQL: []string{
@@ -197,6 +200,7 @@ var (
 		},
 		FlistURL:   flistURL,
 		HubURL:     hubURL,
+		V4HubURL:   v4HubURL,
 		HubStorage: defaultHubStorage,
 		BinRepo:    "tf-zos-v3-bins.qanet",
 		GraphQL: []string{
@@ -228,6 +232,7 @@ var (
 		},
 		FlistURL:   flistURL,
 		HubURL:     hubURL,
+		V4HubURL:   v4HubURL,
 		HubStorage: defaultHubStorage,
 		BinRepo:    "tf-zos-v3-bins",
 		GraphQL: []string{
@@ -368,22 +373,35 @@ func getEnvironmentFromParams(params kernel.Params) (Environment, error) {
 		env.GeoipURLs = geoip
 	}
 
+	if flist := config.FlistURL; len(flist) > 0 {
+		env.FlistURL = flist
+	}
+
+	if storage := config.HubStorage; len(storage) > 0 {
+		env.HubStorage = storage
+	}
+
+	if hub := config.HubURL; len(hub) > 0 {
+		env.HubURL = hub
+	}
+
+	// some modules needs v3 hub url even if the node is of v4
+	if hub := config.V4HubURL; len(hub) > 0 {
+		env.V4HubURL = hub
+	}
+
 	// if the node running v4 chage urls to use v4 hub
 	if params.IsV4() {
 		env.FlistURL = v4FlistURL
 		if flist := config.V4FlistURL; len(flist) > 0 {
 			env.FlistURL = flist
 		}
 
-		env.HubURL = v4HubURL
-		if hub := config.V4HubURL; len(hub) > 0 {
-			env.HubURL = hub
-		}
-
 		env.HubStorage = defaultV4HubStorage
 		if storage := config.V4HubStorage; len(storage) > 0 {
 			env.HubStorage = storage
 		}
+
 	}
 
 	if farmSecret, ok := params.Get("secret"); ok {

pkg/primitives/zdb/zdb.go

@@ -29,7 +29,6 @@ import (
 )
 
 const (
-	// https://hub.grid.tf/api/flist/tf-autobuilder/threefoldtech-0-db-development.flist/light
 	// To get the latest symlink pointer
 	flistRepo           = "tf-autobuilder"
 	flistName           = "threefoldtech-0-db-release-v2.0.8-55737c9202.flist"
@@ -290,7 +289,7 @@ func (p *Manager) createZdbContainer(ctx context.Context, device pkg.Device) err
 	)
 
 	env := environment.MustGet()
-	zdbFlistURL, err := url.JoinPath(env.FlistURL, flistRepo, flistName)
+	zdbFlistURL, err := url.JoinPath(env.HubURL, flistRepo, flistName)
 	if err != nil {
 		return errors.Wrap(err, "failed to construct zdb flist url")
 	}
@@ -394,7 +393,7 @@ func (p *Manager) createZdbContainerLight(ctx context.Context, device pkg.Device
 	)
 
 	env := environment.MustGet()
-	zdbFlistURL, err := url.JoinPath(env.FlistURL, flistRepo, flistName)
+	zdbFlistURL, err := url.JoinPath(env.HubURL, flistRepo, flistName)
 	if err != nil {
 		return errors.Wrap(err, "failed to construct zdb flist url")
 	}
@@ -952,7 +951,7 @@ func (p *Manager) initialize(ctx context.Context) error {
 	)
 	// fetching extected hash
 	env := environment.MustGet()
-	zdbFlistURL, err := url.JoinPath(env.FlistURL, flistRepo, flistName)
+	zdbFlistURL, err := url.JoinPath(env.HubURL, flistRepo, flistName)
 	if err != nil {
 		return errors.Wrap(err, "failed to construct zdb flist url")
 	}
@@ -1019,7 +1018,7 @@ func (p *Manager) initializeLight(ctx context.Context) error {
 	)
 	// fetching extected hash
 	env := environment.MustGet()
-	zdbFlistURL, err := url.JoinPath(env.FlistURL, flistRepo, flistName)
+	zdbFlistURL, err := url.JoinPath(env.HubURL, flistRepo, flistName)
 	if err != nil {
 		return errors.Wrap(err, "failed to construct zdb flist url")
 	}

pkg/upgrade/hub/hub.go

@@ -16,6 +16,7 @@ import (
 	"github.com/rs/zerolog/log"
 	"github.com/threefoldtech/0-fs/meta"
 	"github.com/threefoldtech/zosbase/pkg/environment"
+	"github.com/threefoldtech/zosbase/pkg/kernel"
 )
 
 const (
@@ -97,11 +98,11 @@ func (h *HubClient) StorageURL() string {
 // StorageURL return hub storage url
 func (h *HubClient) HubBaseURL() string {
 	env := environment.MustGet()
-	return env.HubURL
-	// if kernel.GetParams().IsV4() {
-	// 	return hubv4BaseURL
-	// }
-	// return hubBaseURL
+	hubBaseURL := env.HubURL
+	if kernel.GetParams().IsV4() {
+		return env.V4HubURL
+	}
+	return hubBaseURL
 }
 
 // Info gets flist info from hub
@@ -302,9 +303,10 @@ func (b *Regular) Files(repo string) ([]FileInfo, error) {
 	}
 	env := environment.MustGet()
 	baseURL := env.HubURL
-	// if kernel.GetParams().IsV4() {
-	// 	baseURL = hubv4BaseURL
-	// }
+	if kernel.GetParams().IsV4() {
+		baseURL = env.V4HubURL
+	}
+
 	u, err := url.Parse(baseURL)
 	if err != nil {
 		panic("invalid base url")