Add single configuration loader (#5)

* Add single configuration loader

Refactor AuthOptionsFromEnv

Fix miss-prints in related files

Author: outcatcher

auth_aksk_options.go

@@ -27,10 +27,10 @@ type AKSKAuthOptions struct {
 	BssDomain   string
 	BssDomainID string
 
-	AccessKey string //Access Key
-	SecretKey string //Secret key
+	AccessKey string // Access Key
+	SecretKey string // Secret key
 
-	// AgencyNmae is the name of agnecy
+	// AgencyName is the name of agency
 	AgencyName string
 
 	// AgencyDomainName is the name of domain who created the agency

auth_options.go

@@ -82,7 +82,7 @@ type AuthOptions struct {
 	// authentication token ID.
 	TokenID string `json:"-"`
 
-	// AgencyNmae is the name of agnecy
+	// AgencyName is the name of agency
 	AgencyName string `json:"-"`
 
 	// AgencyDomainName is the name of domain who created the agency

openstack/auth_env.go

@@ -1,13 +1,9 @@
 package openstack
 
 import (
-	"os"
-
-	golangsdk "github.com/opentelekomcloud/gophertelekomcloud"
+	"github.com/opentelekomcloud/gophertelekomcloud"
 )
 
-var nilOptions = golangsdk.AuthOptions{}
-
 /*
 AuthOptionsFromEnv fills out an identity.AuthOptions structure with the
 settings found on the various OpenStack OS_* environment variables.
@@ -29,51 +25,25 @@ by sourcing an `openrc` file), then:
 	opts, err := openstack.AuthOptionsFromEnv()
 	provider, err := openstack.AuthenticatedClient(opts)
 */
-func AuthOptionsFromEnv() (golangsdk.AuthOptions, error) {
-	authURL := os.Getenv("OS_AUTH_URL")
-	username := os.Getenv("OS_USERNAME")
-	userID := os.Getenv("OS_USERID")
-	password := os.Getenv("OS_PASSWORD")
-	tenantID := os.Getenv("OS_TENANT_ID")
-	tenantName := os.Getenv("OS_TENANT_NAME")
-	domainID := os.Getenv("OS_DOMAIN_ID")
-	domainName := os.Getenv("OS_DOMAIN_NAME")
-
-	// If OS_PROJECT_ID is set, overwrite tenantID with the value.
-	if v := os.Getenv("OS_PROJECT_ID"); v != "" {
-		tenantID = v
-	}
-
-	// If OS_PROJECT_NAME is set, overwrite tenantName with the value.
-	if v := os.Getenv("OS_PROJECT_NAME"); v != "" {
-		tenantName = v
-	}
-
-	if authURL == "" {
-		err := golangsdk.ErrMissingInput{Argument: "authURL"}
-		return nilOptions, err
-	}
-
-	if username == "" && userID == "" {
-		err := golangsdk.ErrMissingInput{Argument: "username"}
-		return nilOptions, err
-	}
-
-	if password == "" {
-		err := golangsdk.ErrMissingInput{Argument: "password"}
-		return nilOptions, err
+func AuthOptionsFromEnv(envs ...*env) (golangsdk.AuthOptions, error) {
+	e := NewEnv(defaultPrefix)
+	if len(envs) > 0 {
+		e = envs[0]
 	}
 
 	ao := golangsdk.AuthOptions{
-		IdentityEndpoint: authURL,
-		UserID:           userID,
-		Username:         username,
-		Password:         password,
-		TenantID:         tenantID,
-		TenantName:       tenantName,
-		DomainID:         domainID,
-		DomainName:       domainName,
+		IdentityEndpoint: e.GetEnv("AUTH_URL"),
+		Username:         e.GetEnv("USERNAME"),
+		UserID:           e.GetEnv("USERID", "USER_ID"),
+		Password:         e.GetEnv("PASSWORD"),
+		DomainID:         e.GetEnv("DOMAIN_ID"),
+		DomainName:       e.GetEnv("DOMAIN_NAME"),
+		TenantID:         e.GetEnv("PROJECT_ID", "TENANT_ID"),
+		TenantName:       e.GetEnv("PROJECT_NAME", "TENANT_NAME"),
+		TokenID:          e.GetEnv("TOKEN", "TOKEN_ID"),
+		AgencyName:       e.GetEnv("AGENCY_NAME", "TARGET_AGENCY_NAME"),
+		AgencyDomainName: e.GetEnv("AGENCY_DOMAIN_NAME", "TARGET_DOMAIN_NAME"),
+		DelegatedProject: e.GetEnv("DELEGATED_PROJECT", "TARGET_DOMAIN_NAME"),
 	}
-
 	return ao, nil
 }

openstack/client.go

@@ -91,8 +91,8 @@ Example:
 		Region: os.Getenv("OS_REGION_NAME"),
 	})
 */
-func AuthenticatedClient(options golangsdk.AuthOptions) (*golangsdk.ProviderClient, error) {
-	client, err := NewClient(options.IdentityEndpoint)
+func AuthenticatedClient(options golangsdk.AuthOptionsProvider) (*golangsdk.ProviderClient, error) {
+	client, err := NewClient(options.GetIdentityEndpoint())
 	if err != nil {
 		return nil, err
 	}