Skip to content

Update Cache Contract to include useFromLocation #11098

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
njuCZ merged 1 commit into from
Oct 12, 2020
Merged

Update Cache Contract to include useFromLocation #11098

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
13 changes: 12 additions & 1 deletion ...ment/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/definitions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1595,14 +1595,20 @@
"description": "Runtime connection string to cache",
"maxLength": 300
},
"useFromLocation": {
"type": "string",
"description": "Location identifier to use cache from (should be either 'default' or valid Azure region identifier)",
"maxLength": 256
},
"resourceId": {
"type": "string",
"description": "Original uri of entity in external system cache points to",
"maxLength": 2000
}
},
"required": [
"connectionString"
"connectionString",
"useFromLocation"
],
"description": "Properties of the Cache contract."
},
Expand All @@ -1628,6 +1634,11 @@
"description": "Runtime connection string to cache",
"maxLength": 300
},
"useFromLocation": {
"type": "string",
"description": "Location identifier to use cache from (should be either 'default' or valid Azure region identifier)",
"maxLength": 256
},
"resourceId": {
"type": "string",
"description": "Original uri of entity in external system cache points to",
Expand Down
25 changes: 14 additions & 11 deletions ...Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementCreateCache.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,37 +4,40 @@
"resourceGroupName": "rg1",
"api-version": "2020-06-01-preview",
"subscriptionId": "subid",
"cacheId": "westindia",
"cacheId": "c1",
"parameters": {
"properties": {
"connectionString": "contoso5.redis.cache.windows.net,ssl=true,password=...",
"connectionString": "apim.redis.cache.windows.net:6380,password=xc,ssl=True,abortConnect=False",
"description": "Redis cache instances in West India",
"resourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Cache/Redis/contoso5"
"useFromLocation": "default",
"resourceId": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Cache/redis/apimservice1"
}
}
},
"responses": {
"201": {
"body": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/caches/westindia",
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/caches/c1",
"type": "Microsoft.ApiManagement/service/caches",
"name": "westindia",
"name": "c1",
"properties": {
"connectionString": "{{5c68d535a40f7e61103cd285}}}",
"useFromLocation": "default",
"description": "Redis cache instances in West India",
"resourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Cache/Redis/contoso5"
"connectionString": "{{5f7fbca77a891a2200f3db38}}",
"resourceId": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Cache/redis/apimservice1"
}
}
},
"200": {
"body": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/caches/westindia",
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/caches/c1",
"type": "Microsoft.ApiManagement/service/caches",
"name": "westindia",
"name": "c1",
"properties": {
"connectionString": "{{5c68d535a40f7e61103cd285}}}",
"useFromLocation": "default",
"description": "Redis cache instances in West India",
"resourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Cache/Redis/contoso5"
"connectionString": "{{5f7fbca77a891a2200f3db38}}",
"resourceId": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Cache/redis/apimservice1"
}
}
}
Expand Down
11 changes: 6 additions & 5 deletions ...er/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementGetCache.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,19 @@
"resourceGroupName": "rg1",
"api-version": "2020-06-01-preview",
"subscriptionId": "subid",
"cacheId": "westindia"
"cacheId": "c1"
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/caches/westindia",
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/caches/c1",
"type": "Microsoft.ApiManagement/service/caches",
"name": "westindia",
"name": "c1",
"properties": {
"connectionString": "{{5c68d535a40f7e61103cd285}}}",
"useFromLocation": "default",
"description": "Redis cache instances in West India",
"resourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Cache/Redis/contoso5"
"connectionString": "{{5f7fbca77a891a2200f3db38}}",
"resourceId": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Cache/redis/apimservice1"
}
}
}
Expand Down
9 changes: 5 additions & 4 deletions .../Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementListCaches.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,14 @@
"body": {
"value": [
{
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/caches/westindia",
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/caches/c1",
"type": "Microsoft.ApiManagement/service/caches",
"name": "westindia",
"name": "c1",
"properties": {
"connectionString": "{{5c68d535a40f7e61103cd285}}}",
"useFromLocation": "default",
"description": "Redis cache instances in West India",
"resourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Cache/Redis/contoso5"
"connectionString": "{{5f7fbca77a891a2200f3db38}}",
"resourceId": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Cache/redis/apimservice1"
}
}
]
Expand Down
15 changes: 8 additions & 7 deletions ...Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementUpdateCache.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,25 @@
"resourceGroupName": "rg1",
"api-version": "2020-06-01-preview",
"subscriptionId": "subid",
"cacheId": "westindia",
"cacheId": "c1",
"If-Match": "*",
"parameters": {
"properties": {
"description": "Update Cache in west India"
"useFromLocation": "westindia"
}
}
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/caches/westindia",
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/caches/c1",
"type": "Microsoft.ApiManagement/service/caches",
"name": "westindia",
"name": "c1",
"properties": {
"connectionString": "{{5c68d535a40f7e61103cd285}}}",
"description": "Update Cache in west India",
"resourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Cache/Redis/contoso5"
"useFromLocation": "westindia",
"description": "Redis cache instances in West India",
"connectionString": "{{5f7fbca77a891a2200f3db38}}",
"resourceId": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Cache/redis/apimservice1"
}
}
}
Expand Down