Fix for Api Export on 2019-01-01

Azure · Apr 10, 2019 · 6f97be0 · 6f97be0
1 parent 6d9246d
commit 6f97be0
Show file tree

Hide file tree

Showing 4 changed files with 87 additions and 11 deletions.
diff --git a/...on/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/apimapis.json b/...on/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/apimapis.json
@@ -245,7 +245,7 @@
           "ApiManagementCreateApiRevisionFromExistingApi": {
             "$ref": "./examples/ApiManagementCreateApiRevisionFromExistingApi.json"
           },
-          "ApiManagementCreateApiNewVersionUsingExistingApi" : {
+          "ApiManagementCreateApiNewVersionUsingExistingApi": {
             "$ref": "./examples/ApiManagementCreateApiNewVersionUsingExistingApi.json"
           },
           "ApiManagementCreateApiClone": {
@@ -4348,6 +4348,9 @@
         "x-ms-examples": {
           "ApiManagementGetApiExportInOpenApi2dot0": {
             "$ref": "./examples/ApiManagementGetApiExportInOpenApi2dot0.json"
+          },
+          "ApiManagementGetApiExportInOpenApi3dot0": {
+            "$ref": "./examples/ApiManagementGetApiExportInOpenApi3dot0.json"
           }
         },
         "parameters": [
@@ -4393,7 +4396,7 @@
                 {
                   "value": "openapi-link",
                   "description": "Export the Api Definition in OpenApi Specification 3.0 to Storage Blob.",
-                  "name": "OpenApi"
+                  "name": "Openapi"
                 }
               ]
             },
@@ -4437,6 +4440,6 @@
       }
     }
   },
-  "definitions": { },
-  "parameters": { }
+  "definitions": {},
+  "parameters": {}
 }
diff --git a/...apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/definitions.json b/...apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-01-01/definitions.json
@@ -342,12 +342,59 @@
     },
     "ApiExportResult": {
       "properties": {
-        "link": {
+        "id": {
           "type": "string",
-          "description": "Link to the Storage Blob containing the result of the export operation. The Blob Uri is only valid for 5 minutes."
+          "description": "ResourceId of the API which was exported."
+        },
+        "format": {
+          "type": "string",
+          "enum": [
+            "swagger-link-json",
+            "wadl-link-json",
+            "wsdl-link+xml",
+            "openapi-link"
+          ],
+          "x-ms-client-name": "ExportResultFormat",
+          "x-ms-enum": {
+            "name": "ExportResultFormat",
+            "modelAsString": true,
+            "values": [
+              {
+                "value": "swagger-link-json",
+                "description": "The Api Definition is exported in OpenApi Specification 2.0 format to the Storage Blob.",
+                "name": "Swagger"
+              },
+              {
+                "value": "wsdl-link+xml",
+                "description": "The Api Definition is exported in WSDL Schema to Storage Blob. This is only supported for APIs of Type `soap`",
+                "name": "Wsdl"
+              },
+              {
+                "value": "wadl-link-json",
+                "description": "Export the Api Definition in WADL Schema to Storage Blob.",
+                "name": "Wadl"
+              },
+              {
+                "value": "openapi-link",
+                "description": "Export the Api Definition in OpenApi Specification 3.0 to Storage Blob.",
+                "name": "OpenApi"
+              }
+            ]
+          },
+          "description": "Format in which the Api Details are exported to the Storage Blob with Sas Key valid for 5 minutes."
+        },
+        "value": {
+          "type": "object",
+          "description": "The object defining the schema of the exported Api Detail",
+          "properties": {
+            "link": {
+              "type": "string",
+              "description": "Link to the Storage Blob containing the result of the export operation. The Blob Uri is only valid for 5 minutes."
+            }
+          }
         }
       },
-      "description": "API Export result Blob Uri."
+      "description": "API Export result."
     },
     "ApiReleaseCollection": {
       "properties": {
@@ -636,9 +683,9 @@
           "type": "string",
           "description": "Identifier for existing API Version Set. Omit this value to create a new Version Set."
         },
-        "name" : {
-          "type" : "string",
-          "description" : "The display Name of the API Version Set."
+        "name": {
+          "type": "string",
+          "description": "The display Name of the API Version Set."
         },
         "description": {
           "type": "string",

diff --git a/...oft.ApiManagement/stable/2019-01-01/examples/ApiManagementGetApiExportInOpenApi2dot0.json b/...oft.ApiManagement/stable/2019-01-01/examples/ApiManagementGetApiExportInOpenApi2dot0.json
@@ -11,7 +11,11 @@
     "responses": {
         "200": {
             "body": {
-                "link": "https://apimgmtstaobxxxxxxx.blob.core.windows.net/api-export/Echo API.json?sv=2015-07-08&sr=b&sig=xxxxxxxxxx%3D&se=2017-09-08T21:54:08Z&sp=r"
+                "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/echo-api",
+                "format": "swagger-link-json",
+                "value": {
+                    "link": "https://apimgmtstkjpszxxxxxxx.blob.core.windows.net/api-export/Swagger Petstore Extensive.json?sv=2015-07-08&sr=b&sig=mxhLsFuOonu8EXIjyFPV%2FnDra0qTIoip7N7MuU%2BTFsA%3D&se=2019-04-10T22:41:31Z&sp=r"
+                }
             }
         }
     }

diff --git a/...oft.ApiManagement/stable/2019-01-01/examples/ApiManagementGetApiExportInOpenApi3dot0.json b/...oft.ApiManagement/stable/2019-01-01/examples/ApiManagementGetApiExportInOpenApi3dot0.json
@@ -0,0 +1,22 @@
+{
+  "parameters": {
+    "serviceName": "apimService1",
+    "resourceGroupName": "rg1",
+    "api-version": "2019-01-01",
+    "subscriptionId": "subid",
+    "apiId": "aid9676",
+    "format": "openapi-link",
+    "export": "true"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/apis/aid9676",
+        "format": "openapi-link",
+        "value": {
+          "link": "https: //apimgmtstkjpszxxxxxxx.blob.core.windows.net/api-export/Swagger Petstore.yaml?sv=2015-07-08&sr=b&sig=qqtR1y5iTbz5P7USBduqB5vriIU4gmiGqe0lKVV8j9k%3D&se=2019-04-10T22:40:57Z&sp=r"
+        }
+      }
+    }
+  }
+}