Skip to content

Use format: arm-id in Redis and RedisEnterprise where appropriate #25517

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 13, 2023
Merged

Use format: arm-id in Redis and RedisEnterprise where appropriate #25517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions specification/redis/resource-manager/Microsoft.Cache/stable/2023-04-01/redis.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2042,6 +2042,17 @@
},
"subnetId": {
"type": "string",
"format": "arm-id",
"x-ms-arm-id-details": {
"allowedResources": [
{
"type": "Microsoft.Network/virtualNetworks/subnets"
},
{
"type": "Microsoft.ClassicNetwork/virtualNetworks/subnets"
Copy link
Member

@TimLovellSmith TimLovellSmith Sep 13, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nonblocking question since from conservatism point of view its fine...
Is ClassicNetwork still supported? I think the plan is to deprecate it soon?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure, but I don't think it hurts to have it here as all this is really saying is that "we would accept ClassicNetwork if you give it to us" - even if you can't make new ones maybe legacy existing ones are still allowed for a while?

Agree that it might be nice to be able to remove this once it really is deprecated, though not sure how to actually accomplish that in practice when the time comes.

}
]
},
"pattern": "^/subscriptions/[^/]*/resourceGroups/[^/]*/providers/Microsoft.(ClassicNetwork|Network)/virtualNetworks/[^/]*/subnets/[^/]*$",
"description": "The full resource ID of a subnet in a virtual network to deploy the Redis cache in. Example format: /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/Microsoft.{Network|ClassicNetwork}/VirtualNetworks/vnet1/subnets/subnet1"
},
Expand Down Expand Up @@ -2601,6 +2612,14 @@
"id": {
"readOnly": true,
"type": "string",
"format": "arm-id",
"x-ms-arm-id-details": {
"allowedResources": [
{
"type": "Microsoft.Cache/redis/linkedServers"
}
]
},
"description": "Linked server Id."
}
}
Expand Down Expand Up @@ -2657,6 +2676,14 @@
"properties": {
"linkedRedisCacheId": {
"type": "string",
"format": "arm-id",
"x-ms-arm-id-details": {
"allowedResources": [
{
"type": "Microsoft.Cache/redis"
}
]
},
"description": "Fully qualified resourceId of the linked redis cache."
},
"linkedRedisCacheLocation": {
Expand Down
18 changes: 17 additions & 1 deletion ...n/redisenterprise/resource-manager/Microsoft.Cache/stable/2023-07-01/redisenterprise.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1700,6 +1700,14 @@
"properties": {
"id": {
"type": "string",
"format": "arm-id",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we need to also add make changes in "ForceUnlinkParameters" properties, since it also have array of redis databases

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should I think add this attribute whenever we use arm-id for databases ARM ID.
"x-ms-arm-id-details": {
"allowedResources": [
{
"type": "Microsoft.Cache/redisEnterprise/databases"
}
]
}

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added the x-ms-arm-id-details here w/ entry "Microsoft.Cache/redisEnterprise/databases" and also added for ForceUnlinkParameters.

"x-ms-arm-id-details": {
"allowedResources": [
{
"type": "Microsoft.Cache/redisEnterprise/databases"
}
]
},
"x-ms-mutability": [
"read",
"create"
Expand Down Expand Up @@ -1833,7 +1841,15 @@
"ids": {
"type": "array",
"items": {
"type": "string"
"type": "string",
"format": "arm-id",
"x-ms-arm-id-details": {
"allowedResources": [
{
"type": "Microsoft.Cache/redisEnterprise/databases"
}
]
}
},
"description": "The resource IDs of the database resources to be unlinked."
}
Expand Down