@@ -13,7 +13,7 @@ function Test-RedisCache
1313 New-AzResourceGroup - Name $resourceGroupName - Location $location
1414
1515 # Creating Cache
16- $cacheCreated = New-AzRedisCache - ResourceGroupName $resourceGroupName - Name $cacheName - Location $location - Size P1 - Sku Premium - RedisVersion 6
16+ $cacheCreated = New-AzRedisCache - ResourceGroupName $resourceGroupName - Name $cacheName - Location $location - Size P1 - Sku Premium - RedisVersion latest
1717
1818 Assert-AreEqual $cacheName $cacheCreated.Name
1919 Assert-AreEqual $location $cacheCreated.Location
@@ -25,7 +25,7 @@ function Test-RedisCache
2525 Assert-AreEqual " creating" $cacheCreated.ProvisioningState
2626 Assert-AreEqual " 6GB" $cacheCreated.Size
2727 Assert-AreEqual " Premium" $cacheCreated.Sku
28- Assert-AreEqual " 6" $cacheCreated.RedisVersion.split (" ." )[0 ]
28+ Assert-AreEqual " 6" $cacheCreated.RedisVersion.split (" ." )[0 ] # May need to update if 'latest' is > 6
2929
3030 Assert-NotNull $cacheCreated.PrimaryKey " PrimaryKey do not exists"
3131 Assert-NotNull $cacheCreated.SecondaryKey " SecondaryKey do not exists"
@@ -530,14 +530,17 @@ function Test-ImportExportReboot
530530
531531 # Tests ExportRMAzureRedisCache
532532 Export-AzRedisCache - Name $cacheName - Prefix $prefix - Container $sasKeyForContainer
533+ # Tests export with ManagedIdentity fails when managed identity not enabled on storage account/cache
534+ Assert-Throws {Export-AzRedisCache - Name $cacheName - Prefix $prefix - Container $sasKeyForContainer - PreferredDataArchiveAuthMethod ManagedIdentity}
533535
534536 # Get SAS token for blob
535537 $sasKeyForBlob = " "
536538 Get-SasForBlob $resourceGroupName $storageName $storageContainerName $prefix ([ref ]$sasKeyForBlob )
537539
538540 # Tests ImportAzureRmRedisCache
539541 Import-AzRedisCache - Name $cacheName - Files @ ($sasKeyForBlob ) - Force
540-
542+ # Tests import with ManagedIdentity fails when managed identity not enabled on storage account/cache
543+ Assert-Throws {Import-AzRedisCache - Name $cacheName - Files @ ($sasKeyForBlob ) - Force - PreferredDataArchiveAuthMethod ManagedIdentity}
541544 # ############################ Tests ResetRMAzureRedisCache #############################
542545 $rebootType = " PrimaryNode"
543546 Reset-AzRedisCache - Name $cacheName - RebootType $rebootType - Force
@@ -647,6 +650,10 @@ function Test-GeoReplication
647650 Assert-AreEqual " creating" $linkCreated.ProvisioningState
648651 Assert-AreEqual $cacheName1 $linkCreated.PrimaryServerName
649652 Assert-AreEqual $cacheName2 $linkCreated.SecondaryServerName
653+ Assert-NotNull $linkCreated.PrimaryHostName
654+ Assert-NotNull $linkCreated.GeoReplicatedPrimaryHostName
655+ Assert-NotNull $linkCreated.ServerRole
656+ Assert-NotNull $linkCreated.LinkedRedisCacheLocation
650657
651658 # ############################ GetAzureRedisCacheLink #############################
652659 # Get single links and wait for creation to comeplte
@@ -667,10 +674,13 @@ function Test-GeoReplication
667674 $linkGet = Get-AzRedisCacheLink - Name $cacheName1
668675 Assert-AreEqual $cacheName1 $linkGet [0 ].PrimaryServerName
669676 Assert-AreEqual $cacheName2 $linkGet [0 ].SecondaryServerName
677+ Assert-AreEqual $linkGet.ServerRole " Secondary"
678+ Assert-AreEqual $linkGet.LinkedRedisCacheLocation $location2
670679 $linkGet = Get-AzRedisCacheLink - Name $cacheName2
671680 Assert-AreEqual $cacheName1 $linkGet [0 ].PrimaryServerName
672681 Assert-AreEqual $cacheName2 $linkGet [0 ].SecondaryServerName
673-
682+ Assert-AreEqual $linkGet.ServerRole " Primary"
683+ Assert-AreEqual $linkGet.LinkedRedisCacheLocation $location1
674684 # Get links where server is primary
675685 $linkGet = Get-AzRedisCacheLink - PrimaryServerName $cacheName1
676686 Assert-AreEqual $cacheName1 $linkGet [0 ].PrimaryServerName
@@ -894,7 +904,7 @@ function Test-ManagedIdentity
894904 New-AzResourceGroup - Name $resourceGroupName - Location $location
895905
896906 # Creating Cache
897- $cacheCreated = New-AzRedisCache - ResourceGroupName $resourceGroupName - Name $cacheName - Location $location - Size 1 GB - Sku Standard - IdentityType SystemAssignedUserAssigned - UserAssignedIdentity " /subscriptions/0ee2a145-4d40-44f4-b764-67b40274f1ac/resourceGroups/prn -rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/test" , " /subscriptions/0ee2a145-4d40-44f4-b764-67b40274f1ac/resourceGroups/prn -rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/test2 "
907+ $cacheCreated = New-AzRedisCache - ResourceGroupName $resourceGroupName - Name $cacheName - Location $location - Size 1 GB - Sku Standard - IdentityType SystemAssignedUserAssigned - UserAssignedIdentity " /subscriptions/3919658b-68ae-4509-8c17-6a2238340ae7/resourcegroups/tolani -rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/test-uami " , " /subscriptions/3919658b-68ae-4509-8c17-6a2238340ae7/resourcegroups/tolani -rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/test-uami2 "
898908
899909 Assert-AreEqual $cacheName $cacheCreated.Name
900910 Assert-AreEqual $location $cacheCreated.Location
@@ -904,8 +914,8 @@ function Test-ManagedIdentity
904914 Assert-NotNull $cacheCreated.SystemAssignedIdentity.Item (" PrincipalId" )
905915 Assert-NotNull $cacheCreated.SystemAssignedIdentity.Item (" TenantId" )
906916 Assert-AreEqual 2 $cacheCreated.UserAssignedIdentity.Count
907- Assert-AreEqual $True ($cacheCreated.UserAssignedIdentity -contains " /subscriptions/0ee2a145-4d40-44f4-b764-67b40274f1ac/resourceGroups/prn -rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/test" )
908- Assert-AreEqual $True ($cacheCreated.UserAssignedIdentity -contains " /subscriptions/0ee2a145-4d40-44f4-b764-67b40274f1ac/resourceGroups/prn -rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/test2 " )
917+ Assert-AreEqual $True ($cacheCreated.UserAssignedIdentity -contains " /subscriptions/3919658b-68ae-4509-8c17-6a2238340ae7/resourcegroups/tolani -rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/test-uami " )
918+ Assert-AreEqual $True ($cacheCreated.UserAssignedIdentity -contains " /subscriptions/3919658b-68ae-4509-8c17-6a2238340ae7/resourcegroups/tolani -rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/test-uami2 " )
909919
910920
911921 $cacheCreated = Get-AzRedisCache - ResourceGroupName $resourceGroupName - Name $cacheName
@@ -914,8 +924,8 @@ function Test-ManagedIdentity
914924 Assert-NotNull $cacheCreated.SystemAssignedIdentity.Item (" PrincipalId" )
915925 Assert-NotNull $cacheCreated.SystemAssignedIdentity.Item (" TenantId" )
916926 Assert-AreEqual 2 $cacheCreated.UserAssignedIdentity.Count
917- Assert-AreEqual $True ($cacheCreated.UserAssignedIdentity -contains " /subscriptions/0ee2a145-4d40-44f4-b764-67b40274f1ac/resourceGroups/prn -rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/test" )
918- Assert-AreEqual $True ($cacheCreated.UserAssignedIdentity -contains " /subscriptions/0ee2a145-4d40-44f4-b764-67b40274f1ac/resourceGroups/prn -rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/test2 " )
927+ Assert-AreEqual $True ($cacheCreated.UserAssignedIdentity -contains " /subscriptions/3919658b-68ae-4509-8c17-6a2238340ae7/resourcegroups/tolani -rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/test-uami " )
928+ Assert-AreEqual $True ($cacheCreated.UserAssignedIdentity -contains " /subscriptions/3919658b-68ae-4509-8c17-6a2238340ae7/resourcegroups/tolani -rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/test-uami2 " )
919929
920930
921931 # In loop to check if cache exists
@@ -932,15 +942,15 @@ function Test-ManagedIdentity
932942
933943
934944 # Test updating user assigned identity
935- $cacheCreated = Set-AzRedisCache - ResourceGroupName $resourceGroupName - Name $cacheName - IdentityType SystemAssignedUserAssigned - UserAssignedIdentity " /subscriptions/0ee2a145-4d40-44f4-b764-67b40274f1ac/resourceGroups/prn -rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/test2 "
945+ $cacheCreated = Set-AzRedisCache - ResourceGroupName $resourceGroupName - Name $cacheName - IdentityType SystemAssignedUserAssigned - UserAssignedIdentity " /subscriptions/3919658b-68ae-4509-8c17-6a2238340ae7/resourcegroups/tolani -rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/test-uami2 "
936946
937947 Assert-AreEqual " SystemAssignedUserAssigned" $cacheCreated.IdentityType
938948 Assert-NotNull $cacheCreated.SystemAssignedIdentity.Item (" PrincipalId" )
939949 Assert-NotNull $cacheCreated.SystemAssignedIdentity.Item (" TenantId" )
940950 Assert-AreEqual 1 $cacheCreated.UserAssignedIdentity.Count
941- Assert-AreEqual $True ($cacheCreated.UserAssignedIdentity -contains " /subscriptions/0ee2a145-4d40-44f4-b764-67b40274f1ac/resourceGroups/prn -rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/test2 " )
951+ Assert-AreEqual $True ($cacheCreated.UserAssignedIdentity -contains " /subscriptions/3919658b-68ae-4509-8c17-6a2238340ae7/resourcegroups/tolani -rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/test-uami2 " )
942952
943- Start-TestSleep - Seconds 60
953+ Start-TestSleep - Seconds 200
944954 # Test removing user assigned identity
945955 $cacheCreated = Set-AzRedisCache - ResourceGroupName $resourceGroupName - Name $cacheName - IdentityType SystemAssigned
946956
@@ -949,16 +959,16 @@ function Test-ManagedIdentity
949959 Assert-NotNull $cacheCreated.SystemAssignedIdentity.Item (" TenantId" )
950960 Assert-Null $cacheCreated.UserAssignedIdentity
951961
952- Start-TestSleep - Seconds 60
962+ Start-TestSleep - Seconds 200
953963 # Test removing system assigned identity
954- $cacheCreated = Set-AzRedisCache - ResourceGroupName $resourceGroupName - Name $cacheName - IdentityType UserAssigned - UserAssignedIdentity " /subscriptions/0ee2a145-4d40-44f4-b764-67b40274f1ac/resourceGroups/prn -rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/test2 "
964+ $cacheCreated = Set-AzRedisCache - ResourceGroupName $resourceGroupName - Name $cacheName - IdentityType UserAssigned - UserAssignedIdentity " /subscriptions/3919658b-68ae-4509-8c17-6a2238340ae7/resourcegroups/tolani -rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/test-uami2 "
955965
956966 Assert-AreEqual " UserAssigned" $cacheCreated.IdentityType
957967 Assert-Null $cacheCreated.SystemAssignedIdentity
958968 Assert-AreEqual 1 $cacheCreated.UserAssignedIdentity.Count
959- Assert-AreEqual $True ($cacheCreated.UserAssignedIdentity -contains " /subscriptions/0ee2a145-4d40-44f4-b764-67b40274f1ac/resourceGroups/prn -rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/test2 " )
969+ Assert-AreEqual $True ($cacheCreated.UserAssignedIdentity -contains " /subscriptions/3919658b-68ae-4509-8c17-6a2238340ae7/resourcegroups/tolani -rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/test-uami2 " )
960970
961- Start-TestSleep - Seconds 60
971+ Start-TestSleep - Seconds 200
962972 # Test removing identity
963973 $cacheCreated = Set-AzRedisCache - ResourceGroupName $resourceGroupName - Name $cacheName - IdentityType None
964974
0 commit comments