diff --git a/pkg/provider/types/parameters.go b/pkg/provider/types/parameters.go index 6ece41f9c..a567b5f6d 100644 --- a/pkg/provider/types/parameters.go +++ b/pkg/provider/types/parameters.go @@ -5,6 +5,7 @@ import ( "strings" "gopkg.in/yaml.v2" + "k8s.io/klog/v2" ) // GetKeyVaultName returns the key vault name @@ -42,6 +43,12 @@ func GetUserAssignedIdentityID(parameters map[string]string) string { // GetTenantID returns the tenant ID func GetTenantID(parameters map[string]string) string { + // ref: https://github.com/Azure/secrets-store-csi-driver-provider-azure/issues/857 + tenantID := strings.TrimSpace(parameters["tenantID"]) + if tenantID != "" { + return tenantID + } + klog.V(3).Info("tenantId is deprecated and will be removed in a future release. Use 'tenantID' instead") return strings.TrimSpace(parameters[TenantIDParameter]) } diff --git a/pkg/provider/types/parameters_test.go b/pkg/provider/types/parameters_test.go index 6e46eac16..4ad632f67 100644 --- a/pkg/provider/types/parameters_test.go +++ b/pkg/provider/types/parameters_test.go @@ -293,6 +293,20 @@ func TestGetTenantID(t *testing.T) { }, expected: "test", }, + { + name: "new tenantID parameter", + parameters: map[string]string{ + "tenantID": "test", + }, + expected: "test", + }, + { + name: "new tenantID parameter with spaces", + parameters: map[string]string{ + "tenantID": " test ", + }, + expected: "test", + }, } for _, test := range tests { diff --git a/pkg/provider/types/types.go b/pkg/provider/types/types.go index f37bb5e47..c832e0993 100644 --- a/pkg/provider/types/types.go +++ b/pkg/provider/types/types.go @@ -38,6 +38,8 @@ const ( // UserAssignedIdentityIDParameter is the name of the user assigned identity ID parameter UserAssignedIdentityIDParameter = "userAssignedIdentityID" // TenantIDParameter is the name of the tenant ID parameter + // TODO(aramase): change this from tenantId to tenantID after v1.2 release + // ref: https://github.com/Azure/secrets-store-csi-driver-provider-azure/issues/857 TenantIDParameter = "tenantId" // CloudEnvFileNameParameter is the name of the cloud env file name parameter CloudEnvFileNameParameter = "cloudEnvFileName"