cache entity (#11098)

Azure · Oct 12, 2020 · fb6dcef · fb6dcef
1 parent 0fe71ee
commit fb6dcef
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 28 deletions.
diff --git a/...ment/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/definitions.json b/...ment/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/definitions.json
@@ -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."
     },
@@ -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",

diff --git a/...Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementCreateCache.json b/...Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementCreateCache.json
@@ -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"
         }
       }
     }

diff --git a/...er/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementGetCache.json b/...er/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementGetCache.json
@@ -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"
         }
       }
     }

diff --git a/.../Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementListCaches.json b/.../Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementListCaches.json
@@ -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"
             }
           }
         ]

diff --git a/...Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementUpdateCache.json b/...Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementUpdateCache.json
@@ -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"
         }
       }
     }