From 73d576dab5a34cdbb01e4a0e522c106f9cd9849f Mon Sep 17 00:00:00 2001
From: jiuker <2818723467@qq.com>
Date: Thu, 11 Jan 2024 22:47:50 +0800
Subject: [PATCH] change the test order

---
 internal/keystore/azure/key-vault.go      | 5 +++--
 internal/keystore/azure/key-vault_test.go | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/internal/keystore/azure/key-vault.go b/internal/keystore/azure/key-vault.go
index d20f146a..a9d84902 100644
--- a/internal/keystore/azure/key-vault.go
+++ b/internal/keystore/azure/key-vault.go
@@ -417,8 +417,9 @@ func ConnectWithCredentials(_ context.Context, endpoint string, creds Credential
 // instance using an Azure managed identity.
 func ConnectWithIdentity(_ context.Context, endpoint string, msi ManagedIdentity) (*Store, error) {
 	if os.Getenv("AZURE_CLIENT_API_VERSION") != "7.2" {
-		os.Setenv("AZURE_CLIENT_ID", msi.ClientID)
-		cred, err := azidentity.NewDefaultAzureCredential(nil)
+		cred, err := azidentity.NewManagedIdentityCredential(&azidentity.ManagedIdentityCredentialOptions{
+			ID: azidentity.ClientID(msi.ClientID),
+		})
 		if err != nil {
 			return nil, fmt.Errorf("azure: failed to create default Azure credential: %v", err)
 		}
diff --git a/internal/keystore/azure/key-vault_test.go b/internal/keystore/azure/key-vault_test.go
index 57c18d74..199c8c37 100644
--- a/internal/keystore/azure/key-vault_test.go
+++ b/internal/keystore/azure/key-vault_test.go
@@ -11,6 +11,7 @@ func TestConnectWithCredentials(t *testing.T) {
 	TenantID := os.Getenv("TenantID")
 	Secret := os.Getenv("Secret")
 	EndPoint := os.Getenv("EndPoint")
+	ManagedIdentityClientID := os.Getenv("ManagedIdentityClientID")
 	if ClientID == "" || TenantID == "" || Secret == "" || EndPoint == "" {
 		t.Skip("Skipping test due to missing credentials")
 	}
@@ -21,11 +22,11 @@ func TestConnectWithCredentials(t *testing.T) {
 		return
 	}
 	os.Setenv("AZURE_CLIENT_API_VERSION", "7.4")
-	c3, err := ConnectWithIdentity(ctx, EndPoint, ManagedIdentity{ClientID: ClientID})
+	c2, err := ConnectWithIdentity(ctx, EndPoint, ManagedIdentity{ClientID: ManagedIdentityClientID})
 	if err != nil {
 		return
 	}
-	c2, err := ConnectWithCredentials(ctx, EndPoint, Credentials{TenantID: TenantID, ClientID: ClientID, Secret: Secret})
+	c3, err := ConnectWithCredentials(ctx, EndPoint, Credentials{TenantID: TenantID, ClientID: ClientID, Secret: Secret})
 	if err != nil {
 		return
 	}