Fix overwriting Passcode (#167)

Fix overwriting `Passcode`

What this PR does / why we need it
Remove reading passcode from OS_PASSCODE in Authenticate
Add passing Passcode through all credentials loading process
Which issue this PR fixes

Fix #166
Special notes for your reviewer

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

Author: outcatcher

openstack/client.go

@@ -3,7 +3,6 @@ package openstack
 import (
 	"fmt"
 	"net/url"
-	"os"
 	"reflect"
 	"regexp"
 	"strings"
@@ -113,8 +112,6 @@ func Authenticate(client *golangsdk.ProviderClient, options golangsdk.AuthOption
 	if isTokenAuthOptions {
 		switch chosen.ID {
 		case v3:
-			authOptions.Passcode = os.Getenv("OS_PASSCODE")
-
 			if authOptions.AgencyDomainName != "" && authOptions.AgencyName != "" {
 				return v3authWithAgency(client, endpoint, &authOptions, golangsdk.EndpointOpts{})
 			}

openstack/loader.go

@@ -129,6 +129,7 @@ func (e *Env) cloudFromEnv() *Cloud {
 			Username:          authOpts.Username,
 			UserID:            authOpts.UserID,
 			Password:          authOpts.Password,
+			Passcode:          authOpts.Passcode,
 			ProjectName:       authOpts.TenantName,
 			ProjectID:         authOpts.TenantID,
 			UserDomainName:    e.GetEnv("USER_DOMAIN_NAME"),
@@ -203,6 +204,9 @@ type AuthInfo struct {
 	// Password is the password of the user.
 	Password string `yaml:"password,omitempty" json:"password,omitempty"`
 
+	// Passcode for MFA.
+	Passcode string `yaml:"-" json:"-"`
+
 	// ProjectName is the common/human-readable name of a project.
 	// Users can be scoped to a project.
 	// ProjectName on its own is not enough to ensure a unique scope. It must
@@ -610,6 +614,7 @@ func AuthOptionsFromInfo(authInfo *AuthInfo, authType AuthType) (golangsdk.AuthO
 		DomainName:       authInfo.DomainName,
 		TenantID:         authInfo.ProjectID,
 		TenantName:       authInfo.ProjectName,
+		Passcode:         authInfo.Passcode,
 	}
 
 	explicitAuthType := getAuthType(authType)