Skip to content

Commit

Permalink
[Hub Generated] Review request for Microsoft.Cache to add version sta…
Browse files Browse the repository at this point in the history
…ble/2021-06-01 (Azure#15828)

* Adds base for updating Microsoft.Cache from version stable/2020-12-01 to version 2021-06-01

* Updates readme

* Updates API version in new specs and examples

* Adding managed identities param

* lint correction

* Introduce common-types definitions useful for services that support ManagedIdentity.

* Refactor latest redis.json to be the first usage of the new ManagedServiceIdentity definition from common-types.

* Fix spellCheck failures

* Fix model, redis service identity should be modeled as updatable.

* modifying example response

* ManagedServiceIdentityType should be modeled as string for extensibility.

* Add commontypes/resource-management/v3/managedidentity which models managed identity for services supporting both SystemAssignedIdentity and UserAssignedIdentity.

* fixing ROUNDTRIP_ADDITIONAL_PROPERTY s360 issue

* redisConfiguration changes, Add Identity to resp

* Fixing swagger lintdiff error

* Add a canonical SystemAssignedServiceIdentityType type definition which supports 'None', since that is required going forward. Also make the 'type' property required, since omitting it from the request would not be clear in intent.

* adding back additional properties

* prettier fix

* Add principalId and tenantId.

* Update patch responses to include 202 when requests are longrunning

* Adding swagger issue fixes made in last version

* adding space in System&UserAssigned identity type

* revert 78a8a87

* updating managedidentity type version

* adding example for 202 status code

* reverting 202 status code addition

Co-authored-by: Praveenkumar Ravikumar <prravikumar@microsoft.com>
Co-authored-by: Tim Lovell-Smith <tilovell@microsoft.com>
Co-authored-by: Chantal Olieman <choliema@microsoft.com>
  • Loading branch information
4 people authored and LeiWang3 committed Mar 31, 2022
1 parent c616a29 commit 700844d
Show file tree
Hide file tree
Showing 32 changed files with 3,849 additions and 7 deletions.
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"
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"parameters": {
"ruleName": "rule1",
"cacheName": "cache1",
"resourceGroupName": "rg1",
"api-version": "2021-06-01",
"subscriptionId": "subid"
},
"responses": {
"200": {},
"204": {}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"parameters": {
"ruleName": "rule1",
"cacheName": "cache1",
"resourceGroupName": "rg1",
"api-version": "2021-06-01",
"subscriptionId": "subid"
},
"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"
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"parameters": {
"cacheName": "cache1",
"resourceGroupName": "rg1",
"api-version": "2021-06-01",
"subscriptionId": "subid"
},
"responses": {
"200": {
"body": {
"value": [
{
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Cache/Redis/cache1/firewallRules/rule1",
"name": "rule1",
"type": "Microsoft.Cache/Redis/firewallRules",
"properties": {
"startIP": "192.168.1.1",
"endIP": "192.168.1.4"
}
},
{
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Cache/Redis/cache1/firewallRules/rule2",
"name": "rule2",
"type": "Microsoft.Cache/Redis/firewallRules",
"properties": {
"startIP": "192.169.1.0",
"endIP": "192.169.1.255"
}
}
]
}
}
}
}
Loading

0 comments on commit 700844d

Please sign in to comment.