Allow auth-url to partially depend on applicationCredentialSecret (#1185)

brtkwr · web-flow · commit 5a6ca97a9469 · 2020-09-03T19:15:41.000-07:00
Without this fix, authentication using application credential fails
since the validator checks for presence of os-password and os-trustID.
diff --git a/pkg/cloudprovider/providers/openstack/openstack.go b/pkg/cloudprovider/providers/openstack/openstack.go
@@ -187,7 +187,7 @@ type OpenStack struct {
 }
 
 type AuthOpts struct {
-	AuthURL          string `gcfg:"auth-url" mapstructure:"auth-url" name:"os-authURL" dependsOn:"os-password|os-trustID"`
+	AuthURL          string `gcfg:"auth-url" mapstructure:"auth-url" name:"os-authURL" dependsOn:"os-password|os-trustID|os-applicationCredentialSecret"`
 	UserID           string `gcfg:"user-id" mapstructure:"user-id" name:"os-userID" value:"optional" dependsOn:"os-password"`
 	Username         string `name:"os-userName" value:"optional" dependsOn:"os-password"`
 	Password         string `name:"os-password" value:"optional" dependsOn:"os-domainID|os-domainName,os-projectID|os-projectName,os-userID|os-userName"`

Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,7 @@ type OpenStack struct {`
`187`	`187`	`}`
`188`	`188`
`189`	`189`	`type AuthOpts struct {`
`190`		- AuthURL string `gcfg:"auth-url" mapstructure:"auth-url" name:"os-authURL" dependsOn:"os-password\|os-trustID"`
	`190`	+ AuthURL string `gcfg:"auth-url" mapstructure:"auth-url" name:"os-authURL" dependsOn:"os-password\|os-trustID\|os-applicationCredentialSecret"`
`191`	`191`	UserID string `gcfg:"user-id" mapstructure:"user-id" name:"os-userID" value:"optional" dependsOn:"os-password"`
`192`	`192`	Username string `name:"os-userName" value:"optional" dependsOn:"os-password"`
`193`	`193`	Password string `name:"os-password" value:"optional" dependsOn:"os-domainID\|os-domainName,os-projectID\|os-projectName,os-userID\|os-userName"`