fix: use tenantID instead of tenantId in parameters (#898)

Signed-off-by: Anish Ramasekar <anish.ramasekar@gmail.com>

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])
 }
 

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 {

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"