github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 05:27:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #84992 from yutedz/openstack-passwd

Browse Source 
Move password retrieval to openstack_test.go
This commit is contained in:
Kubernetes Prow Robot 2019-11-09 16:53:40 -08:00 committed by GitHub
commit 0afc8423f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
staging/src/k8s.io/legacy-cloud-providers/openstack/openstack.go
View File

@ -221,7 +221,6 @@ func (cfg Config) toAuth3Options() tokens3.AuthOptions {
func configFromEnv() (cfg Config, ok bool) { func configFromEnv() (cfg Config, ok bool) {
cfg.Global.AuthURL = os.Getenv("OS_AUTH_URL") cfg.Global.AuthURL = os.Getenv("OS_AUTH_URL")
cfg.Global.Username = os.Getenv("OS_USERNAME") cfg.Global.Username = os.Getenv("OS_USERNAME")
cfg.Global.Password = os.Getenv("OS_PASSWORD")
cfg.Global.Region = os.Getenv("OS_REGION_NAME") cfg.Global.Region = os.Getenv("OS_REGION_NAME")
cfg.Global.UserID = os.Getenv("OS_USER_ID") cfg.Global.UserID = os.Getenv("OS_USER_ID")
cfg.Global.TrustID = os.Getenv("OS_TRUST_ID") cfg.Global.TrustID = os.Getenv("OS_TRUST_ID")

17
staging/src/k8s.io/legacy-cloud-providers/openstack/openstack_test.go
View File

@ -119,6 +119,8 @@ func TestReadConfig(t *testing.T) {
[Metadata] [Metadata]
search-order = configDrive, metadataService search-order = configDrive, metadataService
`)) `))
cfg.Global.Password = os.Getenv("OS_PASSWORD")
if err != nil { if err != nil {
t.Fatalf("Should succeed when a valid config is provided: %s", err) t.Fatalf("Should succeed when a valid config is provided: %s", err)
} }
@ -476,8 +478,17 @@ func TestNodeAddresses(t *testing.T) {
} }
} }
func configFromEnvWithPasswd() (cfg Config, ok bool) {
cfg, ok = configFromEnv()
if !ok {
return cfg, ok
}
cfg.Global.Password = os.Getenv("OS_PASSWORD")
return cfg, ok
}
func TestNewOpenStack(t *testing.T) { func TestNewOpenStack(t *testing.T) {
cfg, ok := configFromEnv() cfg, ok := configFromEnvWithPasswd()
if !ok { if !ok {
t.Skip("No config found in environment") t.Skip("No config found in environment")
} }
@ -489,7 +500,7 @@ func TestNewOpenStack(t *testing.T) {
} }
func TestLoadBalancer(t *testing.T) { func TestLoadBalancer(t *testing.T) {
cfg, ok := configFromEnv() cfg, ok := configFromEnvWithPasswd()
if !ok { if !ok {
t.Skip("No config found in environment") t.Skip("No config found in environment")
} }
@ -553,7 +564,7 @@ func TestZones(t *testing.T) {
var diskPathRegexp = regexp.MustCompile("/dev/disk/(?:by-id|by-path)/") var diskPathRegexp = regexp.MustCompile("/dev/disk/(?:by-id|by-path)/")
func TestVolumes(t *testing.T) { func TestVolumes(t *testing.T) {
cfg, ok := configFromEnv() cfg, ok := configFromEnvWithPasswd()
if !ok { if !ok {
t.Skip("No config found in environment") t.Skip("No config found in environment")
} }