From 38b428f12aa01a349961068ce99dac6c0f2b63b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Andr=C3=A9?= Date: Mon, 13 Jan 2025 17:34:55 +0100 Subject: [PATCH] [manila-csi-plugin] make auth more tolerant Remove dependency on a couple of fields where the logic was wrong. For example, these fields do not necessarily depend on a password being set, as we could be using application credentials. This prevents manila driver from entering an error state when it finds unnecessary fields in the clouds.yaml. It now simply ignores them. Fixes #2757. --- pkg/client/client.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/client/client.go b/pkg/client/client.go index e9be5312b2..626811937b 100644 --- a/pkg/client/client.go +++ b/pkg/client/client.go @@ -38,16 +38,16 @@ import ( type AuthOpts struct { AuthURL string `gcfg:"auth-url" mapstructure:"auth-url" name:"os-authURL" dependsOn:"os-password|os-trustID|os-applicationCredentialSecret|os-clientCertPath"` - 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"` + UserID string `gcfg:"user-id" mapstructure:"user-id" name:"os-userID" value:"optional"` + Username string `name:"os-userName" value:"optional"` Password string `name:"os-password" value:"optional" dependsOn:"os-domainID|os-domainName,os-projectID|os-projectName,os-userID|os-userName"` - TenantID string `gcfg:"tenant-id" mapstructure:"project-id" name:"os-projectID" value:"optional" dependsOn:"os-password|os-clientCertPath"` - TenantName string `gcfg:"tenant-name" mapstructure:"project-name" name:"os-projectName" value:"optional" dependsOn:"os-password|os-clientCertPath"` + TenantID string `gcfg:"tenant-id" mapstructure:"project-id" name:"os-projectID" value:"optional"` + TenantName string `gcfg:"tenant-name" mapstructure:"project-name" name:"os-projectName" value:"optional"` TrustID string `gcfg:"trust-id" mapstructure:"trust-id" name:"os-trustID" value:"optional"` TrusteeID string `gcfg:"trustee-id" mapstructure:"trustee-id" name:"os-trusteeID" value:"optional" dependsOn:"os-trustID"` TrusteePassword string `gcfg:"trustee-password" mapstructure:"trustee-password" name:"os-trusteePassword" value:"optional" dependsOn:"os-trustID"` - DomainID string `gcfg:"domain-id" mapstructure:"domain-id" name:"os-domainID" value:"optional" dependsOn:"os-password|os-clientCertPath"` - DomainName string `gcfg:"domain-name" mapstructure:"domain-name" name:"os-domainName" value:"optional" dependsOn:"os-password|os-clientCertPath"` + DomainID string `gcfg:"domain-id" mapstructure:"domain-id" name:"os-domainID" value:"optional"` + DomainName string `gcfg:"domain-name" mapstructure:"domain-name" name:"os-domainName" value:"optional"` TenantDomainID string `gcfg:"tenant-domain-id" mapstructure:"project-domain-id" name:"os-projectDomainID" value:"optional"` TenantDomainName string `gcfg:"tenant-domain-name" mapstructure:"project-domain-name" name:"os-projectDomainName" value:"optional"` UserDomainID string `gcfg:"user-domain-id" mapstructure:"user-domain-id" name:"os-userDomainID" value:"optional"`