Skip to content
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.

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

[Hub Generated] Review request for Microsoft.Cache to add version stable/2021-06-01 #15828

Merged
merged 32 commits into from
Dec 15, 2021
Merged
Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
9e91c69
Adds base for updating Microsoft.Cache from version stable/2020-12-01…
gorandom Aug 27, 2021
0de646b
Updates readme
gorandom Aug 27, 2021
0547d73
Updates API version in new specs and examples
gorandom Aug 27, 2021
20dda7a
Adding managed identities param
Aug 27, 2021
650b466
lint correction
Aug 27, 2021
d011ce5
Introduce common-types definitions useful for services that support M…
TimLovellSmith Sep 2, 2021
cfd9686
Merge branch 'common-types/userAssignedIdentity' into dev-redis-Micro…
TimLovellSmith Sep 2, 2021
e336b3c
Refactor latest redis.json to be the first usage of the new ManagedSe…
TimLovellSmith Sep 2, 2021
8b6daa7
Fix spellCheck failures
TimLovellSmith Sep 2, 2021
4f014d2
Fix model, redis service identity should be modeled as updatable.
TimLovellSmith Sep 2, 2021
ae33d6a
modifying example response
Sep 3, 2021
388f217
ManagedServiceIdentityType should be modeled as string for extensibil…
TimLovellSmith Sep 8, 2021
3e6f5d2
Merge branch 'dev-redis-Microsoft.Cache-2021-06-01' of https://github…
TimLovellSmith Sep 8, 2021
4369a55
Add commontypes/resource-management/v3/managedidentity which models m…
TimLovellSmith Sep 8, 2021
f1a98bc
fixing ROUNDTRIP_ADDITIONAL_PROPERTY s360 issue
Sep 9, 2021
c28437c
redisConfiguration changes, Add Identity to resp
Sep 9, 2021
f73b780
Fixing swagger lintdiff error
Sep 9, 2021
0bf870d
Add a canonical SystemAssignedServiceIdentityType type definition whi…
TimLovellSmith Sep 10, 2021
bcc7cac
Merge branch 'add-commontypes-managedidentity' into dev-redis-Microso…
TimLovellSmith Sep 10, 2021
1ebb260
adding back additional properties
Sep 10, 2021
9dbeb8b
Merge branch 'dev-redis-Microsoft.Cache-2021-06-01' of https://github…
Sep 10, 2021
58c249f
prettier fix
Sep 10, 2021
225b073
Add principalId and tenantId.
TimLovellSmith Sep 10, 2021
bf86391
Update patch responses to include 202 when requests are longrunning
chantalolieman Sep 22, 2021
71e11cd
Adding swagger issue fixes made in last version
Oct 11, 2021
85cf815
Merge remote-tracking branch 'origin/main' into dev-redis-Microsoft.C…
TimLovellSmith Oct 21, 2021
78a8a87
adding space in System&UserAssigned identity type
Nov 25, 2021
537558f
revert 78a8a8725558df64729569ccf38b2b83e3fb93b7
Nov 26, 2021
573e1dd
Merge branch 'Azure:main' into dev-redis-Microsoft.Cache-2021-06-01
gorandom Dec 7, 2021
f8c878e
updating managedidentity type version
Dec 7, 2021
850e5a3
adding example for 202 status code
Dec 7, 2021
3235838
reverting 202 status code addition
Dec 14, 2021
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
1 change: 1 addition & 0 deletions custom-words.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1083,6 +1083,7 @@ localmapview
localrun
localsearch
Lockdown
managedidentity
loganalytics
loggerid
logio
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
{
"swagger": "2.0",
"info": {
"version": "3.0",
"title": "Common types"
},
"paths": {},
"definitions": {
"UserAssignedIdentities": {
"title": "User-Assigned Identities",
"description": "The set of user assigned identities associated with the resource. The userAssignedIdentities dictionary keys will be ARM resource ids in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}. The dictionary values can be empty objects ({}) in requests.",
"type": "object",
"additionalProperties": {
"$ref": "#/definitions/UserAssignedIdentity"
}
},
"UserAssignedIdentity": {
"type": "object",
"description": "User assigned identity properties",
"properties": {
"principalId": {
"description": "The principal ID of the assigned identity.",
"format": "uuid",
"type": "string",
"readOnly": true
},
"clientId": {
"description": "The client ID of the assigned identity.",
"format": "uuid",
"type": "string",
"readOnly": true
}
}
},
"ManagedServiceIdentityType": {
"description": "Type of managed service identity (where both SystemAssigned and UserAssigned types are allowed).",
"enum": [
"None",
"SystemAssigned",
"UserAssigned",
"SystemAssigned,UserAssigned"
],
"type": "string",
"x-ms-enum": {
"name": "ManagedServiceIdentityType",
"modelAsString": false
TimLovellSmith marked this conversation as resolved.
Show resolved Hide resolved
}
},
"ManagedServiceIdentity": {
"description": "Managed service identity (system assigned and/or user assigned identities)",
"type": "object",
"properties": {
"principalId": {
"readOnly": true,
"format": "uuid",
"type": "string",
"description": "The service principal ID of the system assigned identity. This property will only be provided for a system assigned identity."
},
"tenantId": {
"readOnly": true,
"format": "uuid",
"type": "string",
"description": "The tenant ID of the system assigned identity. This property will only be provided for a system assigned identity."
},
"type": {
"$ref": "#/definitions/ManagedServiceIdentityType"
},
"userAssignedIdentities": {
"$ref": "#/definitions/UserAssignedIdentities"
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"parameters": {
"api-version": "2021-06-01",
"subscriptionId": "subid",
"parameters": {
"type": "Microsoft.Cache/Redis",
"name": "cacheName"
}
},
"responses": {
"200": {}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,205 @@
{
"parameters": {
"name": "cache1",
"resourceGroupName": "rg1",
"api-version": "2021-06-01",
"subscriptionId": "subid",
"parameters": {
"location": "West US",
"zones": [
"1"
],
"properties": {
"sku": {
"name": "Premium",
"family": "P",
"capacity": 1
},
"redisVersion": "4",
"enableNonSslPort": true,
"shardCount": 2,
"replicasPerPrimary": 2,
"redisConfiguration": {
"maxmemory-policy": "allkeys-lru"
},
"subnetId": "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Network/virtualNetworks/network1/subnets/subnet1",
"staticIP": "192.168.0.5",
"minimumTlsVersion": "1.2"
}
}
},
"responses": {
"201": {
"body": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Cache/Redis/cache1",
"location": "West US",
"zones": [
"1"
],
"name": "cache1",
"type": "Microsoft.Cache/Redis",
"tags": {},
"properties": {
"accessKeys": {
"primaryKey": "<primaryKey>",
"secondaryKey": "<secondaryKey>"
},
"provisioningState": "Succeeded",
"redisVersion": "4.0.14",
"sku": {
"name": "Premium",
"family": "P",
"capacity": 1
},
"enableNonSslPort": false,
"replicasPerMaster": 2,
"replicasPerPrimary": 2,
"redisConfiguration": {
"maxmemory-policy": "allkeys-lru"
},
"hostName": "cache1.redis.cache.windows.net",
"port": 6379,
"sslPort": 6380,
"minimumTlsVersion": "1.2",
"instances": [
{
"sslPort": 15000,
"nonSslPort": 13000,
"zone": "1",
"shardId": 0,
"isMaster": true,
"isPrimary": true
},
{
"sslPort": 15001,
"nonSslPort": 13001,
"zone": "1",
"shardId": 0,
"isMaster": false,
"isPrimary": false
},
{
"sslPort": 15002,
"nonSslPort": 13002,
"zone": "1",
"shardId": 0,
"isMaster": false,
"isPrimary": false
},
{
"sslPort": 15003,
"nonSslPort": 13003,
"zone": "1",
"shardId": 1,
"isMaster": true,
"isPrimary": true
},
{
"sslPort": 15004,
"nonSslPort": 13004,
"zone": "1",
"shardId": 1,
"isMaster": false,
"isPrimary": false
},
{
"sslPort": 15005,
"nonSslPort": 13005,
"zone": "1",
"shardId": 1,
"isMaster": false,
"isPrimary": false
}
]
}
}
},
"200": {
"body": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Cache/Redis/cache1",
"location": "West US",
"zones": [
"1"
],
"name": "cache1",
"type": "Microsoft.Cache/Redis",
"tags": {},
"properties": {
"accessKeys": {
"primaryKey": "<primaryKey>",
"secondaryKey": "<secondaryKey>"
},
"provisioningState": "Succeeded",
"redisVersion": "3.0",
"sku": {
"name": "Premium",
"family": "P",
"capacity": 1
},
"enableNonSslPort": false,
"replicasPerMaster": 2,
"replicasPerPrimary": 2,
"redisConfiguration": {
"maxclients": "1000",
"maxmemory-reserved": "50",
"maxmemory-delta": "50"
},
"hostName": "cache1.redis.cache.windows.net",
"port": 6379,
"sslPort": 6380,
"minimumTlsVersion": "1.2",
"instances": [
{
"sslPort": 15000,
"nonSslPort": 13000,
"zone": "1",
"shardId": 0,
"isMaster": true,
"isPrimary": true
},
{
"sslPort": 15001,
"nonSslPort": 13001,
"zone": "1",
"shardId": 0,
"isMaster": false,
"isPrimary": false
},
{
"sslPort": 15002,
"nonSslPort": 13002,
"zone": "1",
"shardId": 0,
"isMaster": false,
"isPrimary": false
},
{
"sslPort": 15003,
"nonSslPort": 13003,
"zone": "1",
"shardId": 1,
"isMaster": true,
"isPrimary": true
},
{
"sslPort": 15004,
"nonSslPort": 13004,
"zone": "1",
"shardId": 1,
"isMaster": false,
"isPrimary": false
},
{
"sslPort": 15005,
"nonSslPort": 13005,
"zone": "1",
"shardId": 1,
"isMaster": false,
"isPrimary": false
}
]
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"parameters": {
"name": "cache1",
"resourceGroupName": "rg1",
"api-version": "2021-06-01",
"subscriptionId": "subid"
},
"responses": {
"200": {},
"202": {
"headers": {
"location": "https://management.azure.com/subscriptions/subid/providers/Microsoft.Cache/...pathToOperationResult..."
}
},
"204": {}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"parameters": {
"subscriptionId": "{subscriptionId}",
"resourceGroupName": "rgtest01",
"cacheName": "cachetest01",
"privateEndpointConnectionName": "pectest01",
"api-version": "2021-06-01"
},
"responses": {
"200": {},
"204": {}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"parameters": {
"name": "cache1",
"resourceGroupName": "rg1",
"api-version": "2021-06-01",
"subscriptionId": "subid",
"parameters": {
"format": "RDB",
"prefix": "datadump1",
"container": "https://contosostorage.blob.core.window.net/urltoBlobContainer?sasKeyParameters"
}
},
"responses": {
"200": {},
"202": {
"headers": {
"location": "https://management.azure.com/subscriptions/subid/providers/Microsoft.Cache/...pathToOperationResult..."
}
},
"204": {}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{
"parameters": {
"ruleName": "rule1",
"cacheName": "cache1",
"resourceGroupName": "rg1",
"api-version": "2021-06-01",
"subscriptionId": "subid",
"parameters": {
"properties": {
"startIP": "192.168.1.1",
"endIP": "192.168.1.4"
}
}
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Cache/Redis/cache1/firewallRules/rule1",
"name": "cache1/rule1",
"type": "Microsoft.Cache/Redis/firewallRules",
"properties": {
"startIP": "192.168.1.1",
"endIP": "192.168.1.4"
}
}
},
"201": {
"body": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Cache/Redis/cache1/firewallRules/rule1",
"name": "cache1/rule1",
"type": "Microsoft.Cache/Redis/firewallRules",
"properties": {
"startIP": "192.168.1.1",
"endIP": "192.168.1.4"
}
}
}
}
}
Loading