Update API version missed in #6276 (#6481)

Azure · Jun 27, 2019 · 0737a48 · 0737a48
1 parent 253ae60
commit 0737a48
Show file tree

Hide file tree

Showing 3 changed files with 114 additions and 2 deletions.
diff --git a/.../resource-manager/Microsoft.Resources/stable/2019-05-01/examples/ExportResourceGroup.json b/.../resource-manager/Microsoft.Resources/stable/2019-05-01/examples/ExportResourceGroup.json
@@ -0,0 +1,63 @@
+{
+  "parameters": {
+    "subscriptionId": "eaee6a92-e973-4922-9471-3a0a6abf81cd",
+    "resourceGroupName": "myResourceGroup",
+    "api-version": "2019-05-01",
+    "parameters": {
+      "resources": [
+        "*"
+      ],
+      "options": "IncludeParameterDefaultValue,IncludeComments"
+    }
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "template": {
+          "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
+          "contentVersion": "1.0.0.0",
+          "parameters": {
+            "myResourceType_myFirstResource_name": {
+              "defaultValue": "myFirstResource",
+              "type": "String"
+            },
+            "myResourceType_mySecondResource_name": {
+              "defaultValue": "mySecondResource",
+              "type": "String"
+            },
+            "myResourceType_myFirstResource_secret": {
+              "defaultValue": null,
+              "type": "SecureString"
+            }
+          },
+          "variables": {},
+          "resources": [
+            {
+              "type": "My.RP/myResourceType",
+              "apiVersion": "2019-01-01",
+              "name": "[parameters('myResourceType_myFirstResource_name')]",
+              "location": "West US",
+              "properties": {
+                "secret": "[parameters('myResourceType_myFirstResource_secret')]"
+              }
+            },
+            {
+              "type": "My.RP/myResourceType",
+              "apiVersion": "2019-01-01",
+              "name": "[parameters('myResourceType_mySecondResource_name')]",
+              "location": "West US",
+              "properties": {
+                "customProperty": "hello!"
+              }
+            }
+          ]
+        },
+        "error": {
+          "code": "ExportTemplateCompletedWithErrors",
+          "message": "Export template operation completed with errors. Some resources were not exported. Please see details for more information.",
+          "details": []
+        }
+      }
+    }
+  }
+}
diff --git a/...ager/Microsoft.Resources/stable/2019-05-01/examples/ExportResourceGroupWithFiltering.json b/...ager/Microsoft.Resources/stable/2019-05-01/examples/ExportResourceGroupWithFiltering.json
@@ -0,0 +1,41 @@
+{
+  "parameters": {
+    "subscriptionId": "eaee6a92-e973-4922-9471-3a0a6abf81cd",
+    "resourceGroupName": "myResourceGroup",
+    "api-version": "2019-05-01",
+    "parameters": {
+      "resources": [
+        "/subscriptions/eaee6a92-e973-4922-9471-3a0a6abf81cd/resourceGroups/myResourceGroup/providers/My.RP/myResourceType/myFirstResource"
+      ],
+      "options": "SkipResourceNameParameterization"
+    }
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "template": {
+          "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
+          "contentVersion": "1.0.0.0",
+          "parameters": {
+            "myResourceType_myFirstResource_secret": {
+              "defaultValue": null,
+              "type": "SecureString"
+            }
+          },
+          "variables": {},
+          "resources": [
+            {
+              "type": "My.RP/myResourceType",
+              "apiVersion": "2019-01-01",
+              "name": "myFirstResource",
+              "location": "West US",
+              "properties": {
+                "secret": "[parameters('myResourceType_myFirstResource_secret')]"
+              }
+            }
+          ]
+        }
+      }
+    }
+  }
+}
diff --git a/...ification/resources/resource-manager/Microsoft.Resources/stable/2019-05-01/resources.json b/...ification/resources/resource-manager/Microsoft.Resources/stable/2019-05-01/resources.json
@@ -1390,6 +1390,14 @@
             "$ref": "#/parameters/SubscriptionIdParameter"
           }
         ],
+        "x-ms-examples": {
+          "Export a resource group": {
+            "$ref": "./examples/ExportResourceGroup.json"
+          },
+          "Export a resource group with filtering": {
+            "$ref": "./examples/ExportResourceGroupWithFiltering.json"
+          }
+        },
         "responses": {
           "200": {
             "description": "OK - Returns the result of the export.",
@@ -3386,11 +3394,11 @@
           "items": {
             "type": "string"
           },
-          "description": "The IDs of the resources. The only supported string currently is '*' (all resources). Future updates will support exporting specific resources."
+          "description": "The IDs of the resources to filter the export by. To export all resources, supply an array with single entry '*'."
         },
         "options": {
           "type": "string",
-          "description": "The export template options. Supported values include 'IncludeParameterDefaultValue', 'IncludeComments' or 'IncludeParameterDefaultValue, IncludeComments"
+          "description": "The export template options. A CSV-formatted list containing zero or more of the following: 'IncludeParameterDefaultValue', 'IncludeComments', 'SkipResourceNameParameterization', 'SkipAllParameterization'"
         }
       },
       "description": "Export resource group template request parameters."