Add possibility to create non-lazy Env (#77)

Add possibility to create non-lazy `Env`

Add optional lazy argument to NewEnv

Reviewed-by: None <None>
Reviewed-by: Rodion Gyrbu <fpsoff@outlook.com>
Reviewed-by: Anton Sidelnikov <None>

Author: outcatcher

openstack/client_test.go

@@ -64,6 +64,38 @@ func restoreBackup(t *testing.T, files ...string) {
 	}
 }
 
+func checkLazyness(t *testing.T, env Env, expected bool) {
+	authUrl0 := "http://url:0"
+	_ = os.Setenv("OS_AUTH_URL", authUrl0)
+	cloud0, err := env.Cloud()
+	th.AssertNoErr(t, err)
+	th.AssertEquals(t, authUrl0, cloud0.AuthInfo.AuthURL)
+
+	authUrl1 := "http://url:1"
+	_ = os.Setenv("OS_AUTH_URL", authUrl1)
+	cloud1, err := env.Cloud()
+	th.AssertNoErr(t, err)
+
+	th.AssertEquals(t, expected, authUrl0 == cloud1.AuthInfo.AuthURL)
+	th.AssertEquals(t, !expected, authUrl1 == cloud1.AuthInfo.AuthURL)
+}
+
+func TestLazyEnv(t *testing.T) {
+	t.Run("lazy", func(sub *testing.T) {
+		env := NewEnv("OS_", true)
+		checkLazyness(sub, env, true)
+	})
+	t.Run("not lazy", func(sub *testing.T) {
+		env := NewEnv("OS_", false)
+		checkLazyness(sub, env, false)
+	})
+	t.Run("default", func(sub *testing.T) {
+		env := NewEnv("OS_")
+		checkLazyness(sub, env, true)
+		sub.Log("Lazy by default")
+	})
+}
+
 func TestCloudYamlPaths(t *testing.T) {
 	_ = os.Setenv("OS_CLOUD", "useless_cloud")
 	home, _ := os.UserHomeDir()

openstack/loader.go

@@ -78,17 +78,21 @@ type env struct {
 	prefix string
 	cloud  *Cloud
 
-	// Unstable make env ignore lazy cloud loading and
+	// unstable make env ignore lazy cloud loading and
 	// refresh it every time it's requested
-	Unstable bool
+	unstable bool
 }
 
-// NewEnv create new <prefixed> env loader
-func NewEnv(prefix string) Env {
+// NewEnv create new <prefixed> env loader, lazy by default
+func NewEnv(prefix string, lazy ...bool) Env {
 	if prefix != "" && !strings.HasSuffix(prefix, "_") {
 		prefix += "_"
 	}
-	return &env{prefix: prefix}
+	unstable := false
+	if len(lazy) > 0 {
+		unstable = !lazy[0]
+	}
+	return &env{prefix: prefix, unstable: unstable}
 }
 
 func (e *env) Prefix() string {
@@ -453,7 +457,7 @@ func mergeWithVendors(cloudConfig *Config, vendorPath string) *Config {
 
 // Cloud get cloud merged from configuration and env variables
 func (e *env) Cloud() (*Cloud, error) {
-	if e.cloud == nil || e.Unstable {
+	if e.cloud == nil || e.unstable {
 		config, err := e.loadOpenstackConfig()
 		if err != nil {
 			return nil, fmt.Errorf("failed to authenticate client: %s", err)