Skip to content

Commit

Permalink
Changes that define Microsoft.Cache/redis 2018-03-01 API. (202 Accept…
Browse files Browse the repository at this point in the history
…ed on DELETE, minimumTlsVersion)
  • Loading branch information
TimLovellSmith committed Mar 8, 2018
1 parent fcf32fe commit f4e7a2a
Show file tree
Hide file tree
Showing 26 changed files with 103 additions and 40 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parameters": {
"api-version": "2017-10-01",
"api-version": "2018-03-01",
"subscriptionId": "subid",
"parameters": {
"type": "Microsoft.Cache/Redis",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
"parameters": {
"name": "cache1",
"resourceGroupName": "rg1",
"api-version": "2017-10-01",
"api-version": "2018-03-01",
"subscriptionId": "subid",
"parameters": {
"location": "West US",
"zones":["1"],
"zones": [ "1" ],
"properties": {
"sku": {
"name": "Premium",
Expand All @@ -19,7 +19,8 @@
"maxmemory-policy": "allkeys-lru"
},
"subnetId": "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Network/virtualNetworks/network1/subnets/subnet1",
"staticIP": "192.168.0.5"
"staticIP": "192.168.0.5",
"minimumTlsVersion": "1.2"
}
}
},
Expand Down Expand Up @@ -50,7 +51,8 @@
},
"hostName": "cache1.redis.cache.windows.net",
"port": 6379,
"sslPort": 6380
"sslPort": 6380,
"minimumTlsVersion": "1.2"
}
}
},
Expand Down Expand Up @@ -82,7 +84,8 @@
},
"hostName": "cache1.redis.cache.windows.net",
"port": 6379,
"sslPort": 6380
"sslPort": 6380,
"minimumTlsVersion": "1.2"
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,16 @@
"parameters": {
"name": "cache1",
"resourceGroupName": "rg1",
"api-version": "2017-10-01",
"api-version": "2018-03-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
Expand Up @@ -2,7 +2,7 @@
"parameters": {
"name": "cache1",
"resourceGroupName": "rg1",
"api-version": "2017-10-01",
"api-version": "2018-03-01",
"subscriptionId": "subid",
"parameters": {
"format": "RDB",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"ruleName": "rule1",
"cacheName": "cache1",
"resourceGroupName": "rg1",
"api-version": "2017-02-01",
"api-version": "2018-03-01",
"subscriptionId": "subid",
"parameters": {
"properties": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"ruleName": "rule1",
"cacheName": "cache1",
"resourceGroupName": "rg1",
"api-version": "2017-02-01",
"api-version": "2018-03-01",
"subscriptionId": "subid"
},
"responses": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"ruleName": "rule1",
"cacheName": "cache1",
"resourceGroupName": "rg1",
"api-version": "2017-02-01",
"api-version": "2018-03-01",
"subscriptionId": "subid"
},
"responses": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"parameters": {
"cacheName": "cache1",
"resourceGroupName": "rg1",
"api-version": "2017-02-01",
"api-version": "2018-03-01",
"subscriptionId": "subid"
},
"responses": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"parameters": {
"name": "cache1",
"resourceGroupName": "rg1",
"api-version": "2017-10-01",
"api-version": "2018-03-01",
"subscriptionId": "subid",
"parameters": {
"shardId": 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"parameters": {
"name": "cache1",
"resourceGroupName": "rg1",
"api-version": "2017-10-01",
"api-version": "2018-03-01",
"subscriptionId": "subid"
},
"responses": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"parameters": {
"name": "cache1",
"resourceGroupName": "rg1",
"api-version": "2017-10-01",
"api-version": "2018-03-01",
"subscriptionId": "subid",
"parameters": {
"format": "RDB",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
"name": "cache1",
"resourceGroupName": "rg1",
"linkedServerName": "cache2",
"api-version": "2017-10-01",
"api-version": "2018-03-01",
"subscriptionId": "subid",
"parameters": {
"properties": {
"linkedRedisCacheId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Cache/Redis/cache2",
"linkedRedisCacheLocation": "West US",
"serverRole": "Secondary"
"linkedRedisCacheId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Cache/Redis/cache2",
"linkedRedisCacheLocation": "West US",
"serverRole": "Secondary"
}
}
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"name": "cache1",
"resourceGroupName": "rg1",
"linkedServerName": "cache2",
"api-version": "2017-10-01",
"api-version": "2018-03-01",
"subscriptionId": "subid"
},
"responses": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"parameters": {
"name": "cache1",
"resourceGroupName": "rg1",
"api-version": "2017-10-01",
"api-version": "2018-03-01",
"subscriptionId": "subid",
"linkedServerName": "cache2"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"parameters": {
"name": "cache1",
"resourceGroupName": "rg1",
"api-version": "2017-10-01",
"api-version": "2018-03-01",
"subscriptionId": "subid"
},
"responses": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parameters": {
"api-version": "2017-10-01",
"api-version": "2018-03-01",
"subscriptionId": "subid"
},
"responses": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parameters": {
"api-version": "2017-10-01",
"api-version": "2018-03-01",
"resourceGroupName": "rg1",
"subscriptionId": "subid"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"parameters": {
"name": "cache1",
"resourceGroupName": "rg1",
"api-version": "2017-10-01",
"api-version": "2018-03-01",
"subscriptionId": "subid"
},
"responses": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"parameters": {
"name": "cache1",
"resourceGroupName": "rg1",
"api-version": "2017-10-01",
"api-version": "2018-03-01",
"subscriptionId": "subid",
"history": "5000"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"name": "cache1",
"resourceGroupName": "rg1",
"default": "default",
"api-version": "2017-10-01",
"api-version": "2018-03-01",
"subscriptionId": "subid",
"parameters": {
"properties": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"name": "cache1",
"resourceGroupName": "rg1",
"default": "default",
"api-version": "2017-10-01",
"api-version": "2018-03-01",
"subscriptionId": "subid"
},
"responses": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"name": "cache1",
"resourceGroupName": "rg1",
"default": "default",
"api-version": "2017-10-01",
"api-version": "2018-03-01",
"subscriptionId": "subid"
},
"responses": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"parameters": {
"name": "cache1",
"resourceGroupName": "rg1",
"api-version": "2017-10-01",
"api-version": "2018-03-01",
"subscriptionId": "subid",
"parameters": {
"keyType": "Primary"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"parameters": {
"name": "cache1",
"resourceGroupName": "rg1",
"api-version": "2017-10-01",
"api-version": "2018-03-01",
"subscriptionId": "subid",
"parameters": {
"properties": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"info": {
"title": "RedisManagementClient",
"description": "REST API for Azure Redis Cache Service.",
"version": "2017-10-01"
"version": "2018-03-01"
},
"host": "management.azure.com",
"schemes": [
Expand Down Expand Up @@ -187,13 +187,13 @@
],
"responses": {
"201": {
"description": "The new redis cache was successfully created. Check provisioningStatus to see detailed status.",
"description": "The new redis cache was successfully created. Check provisioningState to see detailed status.",
"schema": {
"$ref": "#/definitions/RedisResource"
}
},
"200": {
"description": "The existing redis cache was successfully updated. Check provisioningStatus to see detailed status.",
"description": "The existing redis cache was successfully updated. Check provisioningState to see detailed status.",
"schema": {
"$ref": "#/definitions/RedisResource"
}
Expand Down Expand Up @@ -242,7 +242,7 @@
],
"responses": {
"200": {
"description": "The existing redis cache was successfully updated. Check provisioningStatus to see detailed status.",
"description": "The existing redis cache was successfully updated. Check provisioningState to see detailed status.",
"schema": {
"$ref": "#/definitions/RedisResource"
}
Expand Down Expand Up @@ -283,10 +283,13 @@
],
"responses": {
"200": {
"description": ""
"description": "The redis cache was successfully deleted."
},
"202": {
"description": "The redis cache 'delete' operation was successfully enqueued; follow the Location header to poll for final outcome."
},
"204": {
"description": ""
"description": "The redis cache was successfully deleted."
}
}
},
Expand Down Expand Up @@ -323,7 +326,7 @@
],
"responses": {
"200": {
"description": "",
"description": "The redis cache was successfully found.",
"schema": {
"$ref": "#/definitions/RedisResource"
}
Expand Down Expand Up @@ -1307,6 +1310,19 @@
"type": "integer",
"format": "int32",
"description": "The number of shards to be created on a Premium Cluster Cache."
},
"minimumTlsVersion": {
"type": "string",
"description": "Optional: requires clients to use a specified TLS version (or higher) to connect (e,g, '1.0', '1.1', '1.2')",
"enum": [
"1.0",
"1.1",
"1.2"
],
"x-ms-enum": {
"name": "TlsVersion",
"modelAsString": true
}
}
},
"description": "Create/Update/Get common properties of the redis cache.",
Expand Down Expand Up @@ -1365,7 +1381,25 @@
"provisioningState": {
"readOnly": true,
"type": "string",
"description": "Redis instance provisioning status."
"description": "Redis instance provisioning status.",
"enum": [
"Creating",
"Deleting",
"Disabled",
"Failed",
"Linking",
"Provisioning",
"RecoveringScaleFailure",
"Scaling",
"Succeeded",
"Unlinking",
"Unprovisioning",
"Updating"
],
"x-ms-enum": {
"name": "ProvisioningState",
"modelAsString": true
}
},
"hostName": {
"readOnly": true,
Expand Down
Loading

0 comments on commit f4e7a2a

Please sign in to comment.