[Redis] New Param added to choose redis version

src/RedisCache/RedisCache.Test/RedisCache.Test.csproj

@@ -12,11 +12,11 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Insights" Version="0.16.0-preview" />
-    <PackageReference Include="Microsoft.Azure.Management.Redis" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Azure.Management.Redis" Version="7.0.0" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\RedisCache\RedisCache.csproj" />
   </ItemGroup>
-
+	
 </Project>

src/RedisCache/RedisCache.Test/ScenarioTests/RedisCacheTests.ps1

@@ -13,7 +13,7 @@ function Test-RedisCache
     New-AzResourceGroup -Name $resourceGroupName -Location $location
 
     # Creating Cache
-    $cacheCreated = New-AzRedisCache -ResourceGroupName $resourceGroupName -Name $cacheName -Location $location -Size P1 -Sku Premium
+    $cacheCreated = New-AzRedisCache -ResourceGroupName $resourceGroupName -Name $cacheName -Location $location -Size P1 -Sku Premium -RedisVersion 6
 
     Assert-AreEqual $cacheName $cacheCreated.Name
     Assert-AreEqual $location $cacheCreated.Location
@@ -25,6 +25,7 @@ function Test-RedisCache
     Assert-AreEqual "creating" $cacheCreated.ProvisioningState
     Assert-AreEqual "6GB" $cacheCreated.Size
     Assert-AreEqual "Premium" $cacheCreated.Sku
+    Assert-AreEqual "6" $cacheCreated.RedisVersion.split(".")[0]
 
     Assert-NotNull $cacheCreated.PrimaryKey "PrimaryKey do not exists"
     Assert-NotNull $cacheCreated.SecondaryKey "SecondaryKey do not exists"
@@ -171,7 +172,7 @@ function Test-RedisCachePipeline
     }
 
     # Updating Cache using pipeline
-    Get-AzRedisCache -ResourceGroupName $resourceGroupName -Name $cacheName | Set-AzRedisCache -RedisConfiguration @{"maxmemory-policy" = "allkeys-random"} -EnableNonSslPort $false
+    Get-AzRedisCache -ResourceGroupName $resourceGroupName -Name $cacheName | Set-AzRedisCache -RedisConfiguration @{"maxmemory-policy" = "allkeys-random"} -EnableNonSslPort $false -RedisVersion 6
     $cacheUpdatedPiped = Get-AzRedisCache -Name $cacheName
 
     Assert-AreEqual $cacheName $cacheUpdatedPiped.Name
@@ -396,7 +397,7 @@ function Test-RedisCachePatchSchedules
 
     Remove-AzRedisCachePatchSchedule -ResourceGroupName $resourceGroupName -Name $cacheName
 
-    Assert-ThrowsContains {Get-AzRedisCachePatchSchedule -ResourceGroupName $resourceGroupName -Name $cacheName} "There are no patch schedules found for redis cache"
+    Assert-ThrowsContains {Get-AzRedisCachePatchSchedule -ResourceGroupName $resourceGroupName -Name $cacheName} "Operation returned an invalid status code 'NotFound'"
 
     ############################# Bug fix in set redis cache related to EnableNonSslPort ##########################################
     $cacheUpdated = Set-AzRedisCache -ResourceGroupName $resourceGroupName -Name $cacheName -EnableNonSslPort $true

src/RedisCache/RedisCache/ChangeLog.md

@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Added `RedisVersion` parameter in `New-AzRedisCache` and `Set-AzRedisCache`
 
 ## Version 1.4.0
 * Made `New-AzRedisCache` and `Set-AzRedisCache` cmdlets not fail because of permission issue related to registering Microsoft.Cache RP

src/RedisCache/RedisCache/Commands/NewAzureRedisCache.cs

@@ -80,6 +80,9 @@ public class NewAzureRedisCache : RedisCacheCmdletBase
         [Parameter(ValueFromPipelineByPropertyName = true, Mandatory = false, HelpMessage = "List of zones.")]
         public string[] Zone { get; set; }
 
+        [Parameter(ValueFromPipelineByPropertyName = true, Mandatory = false, HelpMessage = "Redis version. Valid values: 4, 6")]
+        public string RedisVersion { get; set; }
+
         public override void ExecuteCmdlet()
         {
             Utility.ValidateResourceGroupAndResourceName(ResourceGroupName, Name);
@@ -133,14 +136,30 @@ public override void ExecuteCmdlet()
                     throw;
                 }
             }
+            catch (ErrorResponseException ex)
+            {
+                if (ex.Body.Error.Code == "ResourceNotFound" || ex.Message.Contains("ResourceNotFound"))
+                {
+                    // cache does not exists so go ahead and create one
+                }
+                else if (ex.Body.Error.Code == "ResourceGroupNotFound" || ex.Message.Contains("ResourceGroupNotFound"))
+                {
+                    // resource group not found, let create throw error don't throw from here
+                }
+                else
+                {
+                    // all other exceptions should be thrown
+                    throw;
+                }
+            }
 
             ConfirmAction(
               string.Format(Resources.CreateRedisCache, Name),
               Name,
               () =>
               {
                   var redisResource = CacheClient.CreateCache(ResourceGroupName, Name, Location, skuFamily, skuCapacity, Sku,
-                      RedisConfiguration, EnableNonSslPort, TenantSettings, ShardCount, MinimumTlsVersion, SubnetId, StaticIP, Tag, Zone);
+                      RedisConfiguration, EnableNonSslPort, TenantSettings, ShardCount, MinimumTlsVersion, SubnetId, StaticIP, Tag, Zone, RedisVersion);
                   var redisAccessKeys = CacheClient.GetAccessKeys(ResourceGroupName, Name);
                   WriteObject(new RedisCacheAttributesWithAccessKeys(redisResource, redisAccessKeys, ResourceGroupName));
               });

src/RedisCache/RedisCache/Commands/SetAzureRedisCache.cs

@@ -62,6 +62,9 @@ public class SetAzureRedisCache : RedisCacheCmdletBase
         [PSArgumentCompleter(TlsStrings.OneFullStopZero, TlsStrings.OneFullStopOne, TlsStrings.OneFullStopTwo)]
         public string MinimumTlsVersion { get; set; }
 
+        [Parameter(ValueFromPipelineByPropertyName = true, Mandatory = false, HelpMessage = "Redis version. Valid values: 4, 6")]
+        public string RedisVersion { get; set; }
+
         [Parameter(ValueFromPipelineByPropertyName = true, Mandatory = false, HelpMessage = "A hash table which represents tags.")]
         public Hashtable Tag { get; set; }
 
@@ -116,7 +119,7 @@ public override void ExecuteCmdlet()
               () =>
               {
                   var redisResource = CacheClient.UpdateCache(ResourceGroupName, Name, skuFamily, skuCapacity,
-                      skuName, RedisConfiguration, EnableNonSslPort, TenantSettings, ShardCount, MinimumTlsVersion, Tag);
+                      skuName, RedisConfiguration, EnableNonSslPort, TenantSettings, ShardCount, MinimumTlsVersion, RedisVersion, Tag);
                   var redisAccessKeys = CacheClient.GetAccessKeys(ResourceGroupName, Name);
                   WriteObject(new RedisCacheAttributesWithAccessKeys(redisResource, redisAccessKeys, ResourceGroupName));
               });

src/RedisCache/RedisCache/Models/RedisCacheClient.cs

@@ -46,7 +46,8 @@ public RedisCacheClient(IAzureContext context)
         public RedisCacheClient() { }
 
         public RedisResource CreateCache(string resourceGroupName, string cacheName, string location, string skuFamily, int skuCapacity, string skuName,
-                Hashtable redisConfiguration, bool? enableNonSslPort, Hashtable tenantSettings, int? shardCount, string minimumTlsVersion, string subnetId, string staticIP, Hashtable tags, IList<string> zones)
+                Hashtable redisConfiguration, bool? enableNonSslPort, Hashtable tenantSettings, int? shardCount, string minimumTlsVersion, string subnetId,
+                string staticIP, Hashtable tags, IList<string> zones, String redisVersion)
         {
             try
             {
@@ -63,7 +64,8 @@ public RedisResource CreateCache(string resourceGroupName, string cacheName, str
                     Name = skuName,
                     Family = skuFamily,
                     Capacity = skuCapacity
-                }
+                },
+                RedisVersion = redisVersion
             };
 
             if (zones != null && zones.Count != 0)
@@ -128,7 +130,7 @@ public RedisResource CreateCache(string resourceGroupName, string cacheName, str
         }
 
         public RedisResource UpdateCache(string resourceGroupName, string cacheName, string skuFamily, int skuCapacity, string skuName,
-                Hashtable redisConfiguration, bool? enableNonSslPort, Hashtable tenantSettings, int? shardCount, string MinimumTlsVersion, Hashtable tags)
+                Hashtable redisConfiguration, bool? enableNonSslPort, Hashtable tenantSettings, int? shardCount, string MinimumTlsVersion, string redisVersion, Hashtable tags)
         {
             try
             {
@@ -166,6 +168,7 @@ public RedisResource UpdateCache(string resourceGroupName, string cacheName, str
             }
 
             parameters.EnableNonSslPort = enableNonSslPort;
+            parameters.RedisVersion = redisVersion;
 
             if (tenantSettings != null)
             {
@@ -230,7 +233,7 @@ public IPage<RedisResource> ListCaches(string resourceGroupName)
         {
             if (string.IsNullOrEmpty(resourceGroupName))
             {
-                return _client.Redis.List();
+                return _client.Redis.ListBySubscription();
             }
             else
             {
@@ -242,7 +245,7 @@ public IPage<RedisResource> ListCachesUsingNextLink(string resourceGroupName, st
         {
             if (string.IsNullOrEmpty(resourceGroupName))
             {
-                return _client.Redis.ListNext(nextPageLink: nextLink);
+                return _client.Redis.ListBySubscriptionNext(nextPageLink: nextLink);
             }
             else
             {
@@ -339,12 +342,12 @@ internal RedisFirewallRule GetFirewallRule(string resourceGroupName, string cach
 
         internal IPage<RedisFirewallRule> ListFirewallRules(string resourceGroupName, string cacheName)
         {
-            return _client.FirewallRules.ListByRedisResource(resourceGroupName, cacheName);
+            return _client.FirewallRules.List(resourceGroupName, cacheName);
         }
 
         internal IPage<RedisFirewallRule> ListFirewallRules(string nextLink)
         {
-            return _client.FirewallRules.ListByRedisResourceNext(nextLink);
+            return _client.FirewallRules.ListNext(nextLink);
         }
 
         internal void RemoveFirewallRule(string resourceGroupName, string cacheName, string ruleName)

src/RedisCache/RedisCache/RedisCache.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <PsModuleName>RedisCache</PsModuleName>
@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Insights" Version="0.16.0-preview" />
-    <PackageReference Include="Microsoft.Azure.Management.Redis" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Azure.Management.Redis" Version="7.0.0" />
   </ItemGroup>
 
 </Project>

src/RedisCache/RedisCache/help/New-AzRedisCache.md

@@ -17,8 +17,8 @@ Creates a Redis Cache.
 New-AzRedisCache -ResourceGroupName <String> -Name <String> -Location <String> [-Size <String>] [-Sku <String>]
  [-RedisConfiguration <Hashtable>] [-EnableNonSslPort <Boolean>] [-TenantSettings <Hashtable>]
  [-ShardCount <Int32>] [-MinimumTlsVersion <String>] [-SubnetId <String>] [-StaticIP <String>]
- [-Tag <Hashtable>] [-Zone <String[]>] [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm]
- [<CommonParameters>]
+ [-Tag <Hashtable>] [-Zone <String[]>] [-RedisVersion <String>] [-DefaultProfile <IAzureContextContainer>]
+ [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -226,6 +226,21 @@ Accept pipeline input: True (ByPropertyName)
 Accept wildcard characters: False
 ```
 
+### -RedisVersion
+Redis version. Valid values: 4, 6
+
+```yaml
+Type: System.String
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: True (ByPropertyName)
+Accept wildcard characters: False
+```
+
 ### -ResourceGroupName
 Specifies the name of the resource group in which to create the Redis Cache.
 

src/RedisCache/RedisCache/help/Set-AzRedisCache.md

@@ -16,7 +16,7 @@ Modifies a Redis Cache.
 ```
 Set-AzRedisCache [-ResourceGroupName <String>] -Name <String> [-Size <String>] [-Sku <String>]
  [-RedisConfiguration <Hashtable>] [-EnableNonSslPort <Boolean>] [-TenantSettings <Hashtable>]
- [-ShardCount <Int32>] [-MinimumTlsVersion <String>] [-Tag <Hashtable>]
+ [-ShardCount <Int32>] [-MinimumTlsVersion <String>] [-RedisVersion <String>] [-Tag <Hashtable>]
  [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
@@ -168,6 +168,21 @@ Accept pipeline input: True (ByPropertyName)
 Accept wildcard characters: False
 ```
 
+### -RedisVersion
+Redis version. Valid values: 4, 6
+
+```yaml
+Type: System.String
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: True (ByPropertyName)
+Accept wildcard characters: False
+```
+
 ### -ResourceGroupName
 Specifies the name of the resource group that contains the Redis Cache.