Skip to content

Commit 7578e6d

Browse files
koderjokerKanchan JoshiYanaXu
authored
Change pattern for access policy (#24769)
* Change pattern for access policy * Update change log * Use two space identation * Update src/RedisCache/RedisCache/ChangeLog.md Remove extra line Co-authored-by: Yan Xu <[email protected]> * Update src/RedisCache/RedisCache/ChangeLog.md Remove version number Co-authored-by: Yan Xu <[email protected]> --------- Co-authored-by: Kanchan Joshi <[email protected]> Co-authored-by: Yan Xu <[email protected]>
1 parent 79f6444 commit 7578e6d

File tree

9 files changed

+2038
-1378
lines changed

9 files changed

+2038
-1378
lines changed

‎src/RedisCache/RedisCache.Management.Sdk/Generated/AccessPolicyOperations.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -171,9 +171,9 @@ internal AccessPolicyOperations (RedisManagementClient client)
171171
{
172172
throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.MinLength, "accessPolicyName", 3);
173173
}
174-
if (!System.Text.RegularExpressions.Regex.IsMatch(accessPolicyName, "^([a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9]|[a-zA-Z0-9])$"))
174+
if (!System.Text.RegularExpressions.Regex.IsMatch(accessPolicyName, "^([a-zA-Z0-9][a-zA-Z0-9- ]*[a-zA-Z0-9]|[a-zA-Z0-9])$"))
175175
{
176-
throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.Pattern, "accessPolicyName", "^([a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9]|[a-zA-Z0-9])$");
176+
throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.Pattern, "accessPolicyName", "^([a-zA-Z0-9][a-zA-Z0-9- ]*[a-zA-Z0-9]|[a-zA-Z0-9])$");
177177
}
178178
}
179179
if (this.Client.ApiVersion == null)
@@ -659,9 +659,9 @@ internal AccessPolicyOperations (RedisManagementClient client)
659659
{
660660
throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.MinLength, "accessPolicyName", 3);
661661
}
662-
if (!System.Text.RegularExpressions.Regex.IsMatch(accessPolicyName, "^([a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9]|[a-zA-Z0-9])$"))
662+
if (!System.Text.RegularExpressions.Regex.IsMatch(accessPolicyName, "^([a-zA-Z0-9][a-zA-Z0-9- ]*[a-zA-Z0-9]|[a-zA-Z0-9])$"))
663663
{
664-
throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.Pattern, "accessPolicyName", "^([a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9]|[a-zA-Z0-9])$");
664+
throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.Pattern, "accessPolicyName", "^([a-zA-Z0-9][a-zA-Z0-9- ]*[a-zA-Z0-9]|[a-zA-Z0-9])$");
665665
}
666666
}
667667
if (this.Client.ApiVersion == null)
@@ -940,9 +940,9 @@ internal AccessPolicyOperations (RedisManagementClient client)
940940
{
941941
throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.MinLength, "accessPolicyName", 3);
942942
}
943-
if (!System.Text.RegularExpressions.Regex.IsMatch(accessPolicyName, "^([a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9]|[a-zA-Z0-9])$"))
943+
if (!System.Text.RegularExpressions.Regex.IsMatch(accessPolicyName, "^([a-zA-Z0-9][a-zA-Z0-9- ]*[a-zA-Z0-9]|[a-zA-Z0-9])$"))
944944
{
945-
throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.Pattern, "accessPolicyName", "^([a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9]|[a-zA-Z0-9])$");
945+
throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.Pattern, "accessPolicyName", "^([a-zA-Z0-9][a-zA-Z0-9- ]*[a-zA-Z0-9]|[a-zA-Z0-9])$");
946946
}
947947
}
948948
if (this.Client.ApiVersion == null)

‎src/RedisCache/RedisCache.Management.Sdk/Generated/Models/RedisCacheAccessPolicyAssignment.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,9 @@ public virtual void Validate()
103103

104104
if (this.AccessPolicyName != null)
105105
{
106-
if (!System.Text.RegularExpressions.Regex.IsMatch(this.AccessPolicyName, "^([a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9]|[a-zA-Z0-9])$"))
106+
if (!System.Text.RegularExpressions.Regex.IsMatch(this.AccessPolicyName, "^([a-zA-Z0-9][a-zA-Z0-9- ]*[a-zA-Z0-9]|[a-zA-Z0-9])$"))
107107
{
108-
throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.Pattern, "AccessPolicyName", "^([a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9]|[a-zA-Z0-9])$");
108+
throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.Pattern, "AccessPolicyName", "^([a-zA-Z0-9][a-zA-Z0-9- ]*[a-zA-Z0-9]|[a-zA-Z0-9])$");
109109
}
110110
}
111111
}

‎src/RedisCache/RedisCache.Management.Sdk/Generated/Models/RedisCacheAccessPolicyAssignmentProperties.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,9 @@ public virtual void Validate()
102102

103103
if (this.AccessPolicyName != null)
104104
{
105-
if (!System.Text.RegularExpressions.Regex.IsMatch(this.AccessPolicyName, "^([a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9]|[a-zA-Z0-9])$"))
105+
if (!System.Text.RegularExpressions.Regex.IsMatch(this.AccessPolicyName, "^([a-zA-Z0-9][a-zA-Z0-9- ]*[a-zA-Z0-9]|[a-zA-Z0-9])$"))
106106
{
107-
throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.Pattern, "AccessPolicyName", "^([a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9]|[a-zA-Z0-9])$");
107+
throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.Pattern, "AccessPolicyName", "^([a-zA-Z0-9][a-zA-Z0-9- ]*[a-zA-Z0-9]|[a-zA-Z0-9])$");
108108
}
109109
}
110110
}

‎src/RedisCache/RedisCache.Management.Sdk/Generated/PrivateEndpointConnectionsOperations.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,8 @@ internal PrivateEndpointConnectionsOperations (RedisManagementClient client)
511511

512512
}
513513
/// <summary>
514-
/// Update the state of specified private endpoint connection associated with the redis cache.
514+
/// Update the state of specified private endpoint connection associated with
515+
/// the redis cache.
515516
/// </summary>
516517
/// <param name='resourceGroupName'>
517518
/// The name of the resource group. The name is case insensitive.

‎src/RedisCache/RedisCache.Management.Sdk/Generated/RedisOperations.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,8 @@ internal RedisOperations (RedisManagementClient client)
462462

463463
}
464464
/// <summary>
465-
/// Create or replace (overwrite/recreate, with potential downtime) an existing Redis cache.
465+
/// Create or replace (overwrite/recreate, with potential downtime) an existing
466+
/// Redis cache.
466467
/// </summary>
467468
/// <param name='resourceGroupName'>
468469
/// The name of the resource group. The name is case insensitive.

‎src/RedisCache/RedisCache.Management.Sdk/README.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,29 @@ input-file:
3030
output-folder: Generated
3131

3232
namespace: Microsoft.Azure.Management.RedisCache
33+
34+
directive:
35+
- from: swagger-document
36+
where: $.definitions.RedisCacheAccessPolicyAssignmentProperties.properties.accessPolicyName
37+
transform: >-
38+
return {
39+
"type": "string",
40+
"description": "The name of the access policy that is being assigned",
41+
"pattern": "^([a-zA-Z0-9][a-zA-Z0-9- ]*[a-zA-Z0-9]|[a-zA-Z0-9])$"
42+
}
43+
44+
- from: swagger-document
45+
where: $.parameters.AccessPolicyNameParameter
46+
transform: >-
47+
return {
48+
"name": "accessPolicyName",
49+
"in": "path",
50+
"required": true,
51+
"type": "string",
52+
"description": "The name of the access policy that is being added to the Redis cache.",
53+
"x-ms-parameter-location": "method",
54+
"pattern": "^([a-zA-Z0-9][a-zA-Z0-9- ]*[a-zA-Z0-9]|[a-zA-Z0-9])$",
55+
"minLength": 3,
56+
"maxLength": 63
57+
}
3358
```

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

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1005,7 +1005,7 @@ function Test-MicrosoftEntraAuthCache
10051005
# Setup
10061006
$resourceGroupName = "PowerShellTest-21"
10071007
# Generate random cache name
1008-
$cacheName = "redisteam511"
1008+
$cacheName = "redisteam512"
10091009
$location = Get-Location -providerNamespace "Microsoft.Cache" -resourceType "redis" -preferredLocation "West US"
10101010
$accessPolicyName = "testAccessPolicy"
10111011
$accessPolicyAssignmentName = "testAccessPolicyAssignment"
@@ -1064,16 +1064,23 @@ function Test-MicrosoftEntraAuthCache
10641064
Assert-AreEqual $accessPolicyName $accessPolicy.AccessPolicyName
10651065
Assert-AreEqual "+get allkeys" $accessPolicy.Permission
10661066

1067-
# Create an access policy assigment
1067+
# Create an access policy assignment with custom access policy
10681068
$accessPolicyAssignment = New-AzRedisCacheAccessPolicyAssignment -Name $cacheName -AccessPolicyAssignmentName $accessPolicyAssignmentName -AccessPolicyName $accessPolicyName -ObjectId "69d700c5-ca77-4335-947e-4f823dd00e1a" -ObjectIdAlias "kj-aad-testing"
10691069
Assert-AreEqual $accessPolicyAssignmentName $accessPolicyAssignment.AccessPolicyAssignmentName
10701070
Assert-AreEqual $accessPolicyName $accessPolicyAssignment.AccessPolicyName
10711071
Assert-AreEqual "69d700c5-ca77-4335-947e-4f823dd00e1a" $accessPolicyAssignment.ObjectId
10721072
Assert-AreEqual "kj-aad-testing" $accessPolicyAssignment.ObjectIdAlias
10731073

1074+
# Create an access policy assignment with built-in access policy
1075+
$accessPolicyAssignment = New-AzRedisCacheAccessPolicyAssignment -Name $cacheName -AccessPolicyAssignmentName "builtinAccessPolicyAssignment" -AccessPolicyName "Data Owner" -ObjectId "69d700c5-ca77-4335-947e-4f823dd00e1b" -ObjectIdAlias "kj-aad-testing-builtin"
1076+
Assert-AreEqual "builtinAccessPolicyAssignment" $accessPolicyAssignment.AccessPolicyAssignmentName
1077+
Assert-AreEqual "Data Owner" $accessPolicyAssignment.AccessPolicyName
1078+
Assert-AreEqual "69d700c5-ca77-4335-947e-4f823dd00e1b" $accessPolicyAssignment.ObjectId
1079+
Assert-AreEqual "kj-aad-testing-builtin" $accessPolicyAssignment.ObjectIdAlias
1080+
10741081
# List access policy assignments
10751082
$accessPolicyAssignments = Get-AzRedisCacheAccessPolicyAssignment -Name $cacheName
1076-
Assert-AreEqual 1 $accessPolicyAssignments.Count
1083+
Assert-AreEqual 2 $accessPolicyAssignments.Count
10771084

10781085
# Update access policy assignment
10791086
$accessPolicyAssignment = New-AzRedisCacheAccessPolicyAssignment -Name $cacheName -AccessPolicyAssignmentName $accessPolicyAssignmentName -AccessPolicyName $accessPolicyName -ObjectId "69d700c5-ca77-4335-947e-4f823dd00e1a" -ObjectIdAlias "aad testing app"
@@ -1091,7 +1098,7 @@ function Test-MicrosoftEntraAuthCache
10911098

10921099
# List access policy assignments
10931100
$accessPolicyAssignments = Get-AzRedisCacheAccessPolicyAssignment -Name $cacheName
1094-
Assert-AreEqual 0 $accessPolicyAssignments.Count
1101+
Assert-AreEqual 1 $accessPolicyAssignments.Count
10951102

10961103
# Delete access policy
10971104
Assert-True {Remove-AzRedisCacheAccessPolicy -Name $cacheName -AccessPolicyName $accessPolicyName -PassThru} "Removing access policy failed."

‎src/RedisCache/RedisCache.Test/SessionRecords/Microsoft.Azure.Commands.RedisCache.Test.ScenarioTests.RedisCacheTests/TestMicrosoftEntraAuthCache.json

Lines changed: 1987 additions & 1362 deletions
Large diffs are not rendered by default.

‎src/RedisCache/RedisCache/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
- Additional information about change #1
1919
-->
2020
## Upcoming Release
21+
* Fixed pattern for access policy resource names
2122

2223
## Version 1.9.0
2324
* Upgraded API version to 2023-08-01

0 commit comments

Comments
 (0)