add e2e test for resourceID

Author: cvvz

test/e2e/testsuites/pre_provisioned_provided_credentials_tester.go

@@ -114,14 +114,14 @@ func (t *PreProvisionedProvidedCredentiasTest) Run(client clientset.Interface, n
 
 			run()
 
-			// test for managed identity
+			// test for managed identity(objectID)
 			// e2e-vmss test job uses msi blobfuse-csi-driver-e2e-test-id, other jobs use service principal
 			objectID, err = kvClient.GetMSIObjectID(context.TODO(), "blobfuse-csi-driver-e2e-test-id")
 			if err != nil {
 				return
 			}
 
-			ginkgo.By("Run for managed identity")
+			ginkgo.By(fmt.Sprintf("Run for managed identity (objectID %s)", objectID))
 			pod.Volumes[n].Attrib = map[string]string{
 				"azurestorageauthtype":         "MSI",
 				"azurestorageidentityobjectid": objectID,
@@ -135,6 +135,22 @@ func (t *PreProvisionedProvidedCredentiasTest) Run(client clientset.Interface, n
 			framework.ExpectNoError(err, fmt.Sprintf("Error AssignRole (roleDefID(%s)) to objectID(%s) to access resource (resourceID(%s)), error: %v", roleDefID, objectID, resourceID, err))
 
 			run()
+
+			// test for managed identity(resourceID)
+			resourceID, err = kvClient.GetMSIResourceID(context.TODO(), "blobfuse-csi-driver-e2e-test-id")
+			if err != nil {
+				return
+			}
+			ginkgo.By(fmt.Sprintf("Run for managed identity (resourceID %s)", resourceID))
+			pod.Volumes[n].Attrib = map[string]string{
+				"azurestorageauthtype":           "MSI",
+				"azurestorageidentityresourceid": resourceID,
+			}
+			secretData = map[string]string{
+				"azurestorageaccountname": accountName,
+			}
+
+			run()
 		}
 	}
 }

test/utils/azure/keyvault_helper.go

@@ -298,3 +298,17 @@ func (kvc *KeyVaultClient) GetMSIObjectID(ctx context.Context, identityName stri
 
 	return id.UserAssignedIdentityProperties.PrincipalID.String(), err
 }
+
+func (kvc *KeyVaultClient) GetMSIResourceID(ctx context.Context, identityName string) (string, error) {
+	msiClient, err := kvc.getMSIUserAssignedIDClient()
+	if err != nil {
+		return "", err
+	}
+
+	id, err := msiClient.Get(ctx, kvc.Cred.ResourceGroup, identityName)
+	if err != nil {
+		return "", err
+	}
+
+	return *id.ID, err
+}