rename auth methods and provide shortnames

Signed-off-by: Bernd Verst <github@bernd.dev>
dapr · Nov 9, 2023 · 508cc30 · 508cc30
1 parent e2cdb65
commit 508cc30
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/internal/authentication/azure/auth.go b/internal/authentication/azure/auth.go
@@ -185,21 +185,21 @@ func (s EnvironmentSettings) addCLIProvider(timeout time.Duration, creds *[]azco
 
 func (s EnvironmentSettings) addProviderByAuthMethodName(authMethod string, creds *[]azcore.TokenCredential, errs *[]error) {
 	switch authMethod {
-	case "serviceprincipal":
+	case "clientcredentials", "creds":
 		s.addClientCredentialsProvider(creds, errs)
-	case "certificate":
+	case "clientcertificate", "cert":
 		s.addClientCertificateProvider(creds, errs)
-	case "workloadidentity":
+	case "workloadidentity", "wi":
 		s.addWorkloadIdentityProvider(creds, errs)
-	case "managedidentity":
+	case "managedidentity", "mi":
 		s.addManagedIdentityProvider(1*time.Second, creds, errs)
-	case "cli":
+	case "commandlineinterface", "cli":
 		s.addCLIProvider(30*time.Second, creds, errs)
 	}
 }
 
-func getAzureAuthMethods() [6]string {
-	return [...]string{"serviceprincipal", "certificate", "workloadidentity", "managedidentity", "cli", "none"}
+func getAzureAuthMethods() []string {
+	return []string{"clientcredentials", "creds", "clientcertificate", "cert", "workloadidentity", "wi", "managedidentity", "mi", "commandlineinterface", "cli", "none"}
 }
 
 // GetTokenCredential returns an azcore.TokenCredential retrieved from the order specified via

diff --git a/internal/authentication/azure/auth_test.go b/internal/authentication/azure/auth_test.go
@@ -245,7 +245,7 @@ func TestFallbackToMSIandInAllowedList(t *testing.T) {
 		map[string]string{
 			"azureClientId":    fakeClientID,
 			"vaultName":        "vaultName",
-			"azureAuthMethods": "serviceprincipal,certificate,workloadidentity,managedIdentity",
+			"azureAuthMethods": "clientcredentials,clientcertificate,workloadidentity,managedIdentity",
 		},
 	)
 	assert.NoError(t, err)
@@ -265,7 +265,7 @@ func TestFallbackToMSIandNotInAllowedList(t *testing.T) {
 		map[string]string{
 			"azureClientId":    fakeClientID,
 			"vaultName":        "vaultName",
-			"azureAuthMethods": "serviceprincipal,certificate,workloadidentity",
+			"azureAuthMethods": "clientcredentials,clientcertificate,workloadidentity",
 		},
 	)
 	assert.NoError(t, err)
@@ -282,7 +282,7 @@ func TestFallbackToMSIandInvalidAuthMethod(t *testing.T) {
 		map[string]string{
 			"azureClientId":    fakeClientID,
 			"vaultName":        "vaultName",
-			"azureAuthMethods": "serviceprincipal,certificate,workloadidentity,managedIdentity,cli,SUPERAUTH",
+			"azureAuthMethods": "clientcredentials,clientcertificate,workloadidentity,managedIdentity,cli,SUPERAUTH",
 		},
 	)
 	require.NoError(t, err)