Merge pull request #3 from Azure/master

Rebase
navysingla · Jul 29, 2019 · c3fd952 · c3fd952
2 parents a4ebf30 + e56c481
commit c3fd952
Show file tree

Hide file tree

Showing 107 changed files with 7,621 additions and 4,338 deletions.
diff --git a/...ource-manager/Microsoft.AlertsManagement/preview/2019-05-05-preview/AlertsManagement.json b/...ource-manager/Microsoft.AlertsManagement/preview/2019-05-05-preview/AlertsManagement.json
@@ -1312,7 +1312,8 @@
       "x-ms-enum": {
         "name": "identifier",
         "modelAsString": true
-      }
+      },
+      "x-ms-parameter-location": "method"
     }
   },
   "definitions": {

diff --git a/.../Microsoft.AlertsManagement/stable/2019-03-01/examples/SmartDetectorAlertRule_Delete.json b/.../Microsoft.AlertsManagement/stable/2019-03-01/examples/SmartDetectorAlertRule_Delete.json
@@ -6,11 +6,7 @@
     "api-version": "2019-03-01"
   },
   "responses": {
-    "200": {
-      "body": null
-    },
-    "204": {
-      "body": null
-    }
+    "200": {},
+    "204": {}
   }
 }
diff --git a/.../Microsoft.AlertsManagement/stable/2019-06-01/examples/SmartDetectorAlertRule_Delete.json b/.../Microsoft.AlertsManagement/stable/2019-06-01/examples/SmartDetectorAlertRule_Delete.json
@@ -6,11 +6,7 @@
     "api-version": "2019-06-01"
   },
   "responses": {
-    "200": {
-      "body": null
-    },
-    "204": {
-      "body": null
-    }
+    "200": {},
+    "204": {}
   }
 }
diff --git a/specification/alertsmanagement/resource-manager/readme.md b/specification/alertsmanagement/resource-manager/readme.md
@@ -24,11 +24,34 @@ To see additional help and options, run:
 
 These are the global settings for the AlertManagement API.
 
+## Suppression
+``` yaml
+directive:
+  - suppress: R3025
+    reason: The rule applied incorrectly to base class.
+    where:
+      - $.definitions.ManagedResource
+  - suppress: R3026
+    reason: The rule applied incorrectly to base class.
+    where:
+      - $.definitions.ManagedResource
+```
+
 ``` yaml
 title: AlertsManagementClient
 description: AlertsManagement Client
 openapi-type: arm
-tag: package-2019-03
+tag: package-2019-06-preview
+```
+
+### Tag: package-2019-06-preview
+
+These settings apply only when `--tag=package-2019-06-preview` is specified on the command line.
+
+```yaml $(tag) == 'package-2019-06-preview'
+input-file:
+  - Microsoft.AlertsManagement/preview/2019-05-05-preview/AlertsManagement.json
+  - Microsoft.AlertsManagement/stable/2019-06-01/SmartDetectorAlertRulesApi.json
 ```
 
 
@@ -40,6 +63,7 @@ These settings apply only when `--tag=package-2019-06` is specified on the comma
 input-file:
   - Microsoft.AlertsManagement/stable/2019-06-01/SmartDetectorAlertRulesApi.json
 ```
+
 ### Tag: package-2019-03
 
 These settings apply only when `--tag=package-2019-03` is specified on the command line.
@@ -49,6 +73,7 @@ input-file:
   - Microsoft.AlertsManagement/stable/2019-03-01/AlertsManagement.json
   - Microsoft.AlertsManagement/stable/2019-03-01/SmartDetectorAlertRulesApi.json
 ```
+
 ### Tag: package-preview-2019-05
 
 These settings apply only when `--tag=package-preview-2019-05` is specified on the command line.

diff --git a/...ement/resource-manager/Microsoft.ApiManagement/preview/2018-06-01-preview/apimcaches.json b/...ement/resource-manager/Microsoft.ApiManagement/preview/2018-06-01-preview/apimcaches.json
@@ -82,8 +82,7 @@
         },
         "x-ms-pageable": {
           "nextLinkName": "nextLink"
-        },
-        "x-ms-odata": "./definitions.json#/definitions/CacheContract"
+        }
       }
     },
     "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/caches/{cacheId}": {

diff --git a/...ights/resource-manager/Microsoft.Insights/stable/2015-05-01/componentAnnotations_API.json b/...ights/resource-manager/Microsoft.Insights/stable/2015-05-01/componentAnnotations_API.json
@@ -154,8 +154,7 @@
         ],
         "responses": {
           "200": {
-            "description": "The annotation that was successfully deleted.",
-            "schema": {}
+            "description": "The annotation that was successfully deleted."
           }
         },
         "x-ms-examples": {

diff --git a/...s/resource-manager/Microsoft.Insights/stable/2015-05-01/componentWorkItemConfigs_API.json b/...s/resource-manager/Microsoft.Insights/stable/2015-05-01/componentWorkItemConfigs_API.json
@@ -172,8 +172,7 @@
         ],
         "responses": {
           "200": {
-            "description": "The work item configuration that was successfully deleted.",
-            "schema": {}
+            "description": "The work item configuration that was successfully deleted."
           }
         },
         "x-ms-examples": {

diff --git a/...hts/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/AnnotationsDelete.json b/...hts/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/AnnotationsDelete.json
@@ -7,8 +7,6 @@
     "annotationId": "bb820f1b-3110-4a8b-ba2c-8c1129d7eb6a"
   },
   "responses": {
-    "200": {
-      "body": {}
-    }
+    "200": {}
   }
 }
diff --git a/.../resource-manager/Microsoft.Insights/stable/2015-05-01/examples/WorkItemConfigDelete.json b/.../resource-manager/Microsoft.Insights/stable/2015-05-01/examples/WorkItemConfigDelete.json
@@ -7,8 +7,6 @@
     "workItemConfigId": "Visual Studio Team Services"
   },
   "responses": {
-    "200": {
-      "body": {}
-    }
+    "200": {}
   }
 }
diff --git a/.../batch/resource-manager/Microsoft.Batch/stable/2017-09-01/examples/ApplicationCreate.json b/.../batch/resource-manager/Microsoft.Batch/stable/2017-09-01/examples/ApplicationCreate.json
@@ -12,10 +12,12 @@
   },
   "responses": {
     "201": {
-      "id": "app1",
-      "displayName": "myAppName",
-      "packages": [],
-      "allowUpdates": false
+      "body": {
+        "id": "app1",
+        "displayName": "myAppName",
+        "packages": [],
+        "allowUpdates": false
+      }
     }
   }
 }
diff --git a/...ion/batch/resource-manager/Microsoft.Batch/stable/2017-09-01/examples/ApplicationGet.json b/...ion/batch/resource-manager/Microsoft.Batch/stable/2017-09-01/examples/ApplicationGet.json
@@ -8,19 +8,21 @@
   },
   "responses": {
     "200": {
-      "id": "app1",
-      "displayName": "myAppName",
-      "packages": [
-        {
-          "id": "app1",
-          "version": "1",
-          "state": "active",
-          "format": "zip",
-          "lastActivationTime": "2017-06-27T18:48:09.9330991Z"
-        }
-      ],
-      "allowUpdates": false,
-      "defaultVersion": "1"
+      "body": {
+        "id": "app1",
+        "displayName": "myAppName",
+        "packages": [
+          {
+            "id": "app1",
+            "version": "1",
+            "state": "Active",
+            "format": "zip",
+            "lastActivationTime": "2017-06-27T18:48:09.9330991Z"
+          }
+        ],
+        "allowUpdates": false,
+        "defaultVersion": "1"
+      }
     }
   }
 }
diff --git a/...on/batch/resource-manager/Microsoft.Batch/stable/2017-09-01/examples/ApplicationList.json b/...on/batch/resource-manager/Microsoft.Batch/stable/2017-09-01/examples/ApplicationList.json
@@ -7,36 +7,38 @@
   },
   "responses": {
     "200": {
-      "value": [
-        {
-          "id": "app1",
-          "displayName": "myAppName",
-          "packages": [
-            {
-              "version": "1",
-              "state": "active",
-              "format": "zip",
-              "lastActivationTime": "2017-06-27T18:48:09.9330991Z"
-            }
-          ],
-          "allowUpdates": false,
-          "defaultVersion": "1"
-        },
-        {
-          "id": "app2",
-          "displayName": "myAppName",
-          "packages": [
-            {
-              "version": "1",
-              "state": "active",
-              "format": "zip",
-              "lastActivationTime": "2017-06-27T18:48:09.9330991Z"
-            }
-          ],
-          "allowUpdates": false,
-          "defaultVersion": "1"
-        }
-      ]
+      "body": {
+        "value": [
+          {
+            "id": "app1",
+            "displayName": "myAppName",
+            "packages": [
+              {
+                "version": "1",
+                "state": "Active",
+                "format": "zip",
+                "lastActivationTime": "2017-06-27T18:48:09.9330991Z"
+              }
+            ],
+            "allowUpdates": false,
+            "defaultVersion": "1"
+          },
+          {
+            "id": "app2",
+            "displayName": "myAppName",
+            "packages": [
+              {
+                "version": "1",
+                "state": "Active",
+                "format": "zip",
+                "lastActivationTime": "2017-06-27T18:48:09.9330991Z"
+              }
+            ],
+            "allowUpdates": false,
+            "defaultVersion": "1"
+          }
+        ]
+      }
     }
   }
 }
diff --git a/...resource-manager/Microsoft.Batch/stable/2017-09-01/examples/ApplicationPackageCreate.json b/...resource-manager/Microsoft.Batch/stable/2017-09-01/examples/ApplicationPackageCreate.json
@@ -9,12 +9,14 @@
   },
   "responses": {
     "201": {
-      "id": "app1",
-      "version": "1",
-      "state": "active",
-      "format": "zip",
-      "storageUrl": "http://mystorage1.blob.core.windows.net/myapp?mysas",
-      "storageUrlExpiry": "2017-06-27T18:48:09.9330991Z"
+      "body": {
+        "id": "app1",
+        "version": "1",
+        "state": "Active",
+        "format": "zip",
+        "storageUrl": "http://mystorage1.blob.core.windows.net/myapp?mysas",
+        "storageUrlExpiry": "2017-06-27T18:48:09.9330991Z"
+      }
     }
   }
 }
diff --git a/...ch/resource-manager/Microsoft.Batch/stable/2017-09-01/examples/ApplicationPackageGet.json b/...ch/resource-manager/Microsoft.Batch/stable/2017-09-01/examples/ApplicationPackageGet.json
@@ -9,11 +9,13 @@
   },
   "responses": {
     "200": {
-      "id": "app1",
-      "version": "1",
-      "state": "active",
-      "format": "zip",
-      "lastActivationTime": "2017-06-27T18:48:09.9330991Z"
+      "body": {
+        "id": "app1",
+        "version": "1",
+        "state": "Active",
+        "format": "zip",
+        "lastActivationTime": "2017-06-27T18:48:09.9330991Z"
+      }
     }
   }
 }
diff --git a/...on/batch/resource-manager/Microsoft.Batch/stable/2018-12-01/examples/ApplicationList.json b/...on/batch/resource-manager/Microsoft.Batch/stable/2018-12-01/examples/ApplicationList.json
@@ -7,29 +7,31 @@
   },
   "responses": {
     "200": {
-      "value": [
-        {
-          "type": "Microsoft.Batch/batchAccounts/applications",
-          "id": "/subscriptions/subid/resourceGroups/default-azurebatch-japaneast/providers/Microsoft.Batch/batchAccounts/sampleacct/applications/app1",
-          "name": "app1",
-          "etag": "W/\"0x8D64F91A9089879\"",
-          "properties": {
-            "allowUpdates": false,
-            "defaultVersion": "1"
+      "body": {
+        "value": [
+          {
+            "type": "Microsoft.Batch/batchAccounts/applications",
+            "id": "/subscriptions/subid/resourceGroups/default-azurebatch-japaneast/providers/Microsoft.Batch/batchAccounts/sampleacct/applications/app1",
+            "name": "app1",
+            "etag": "W/\"0x8D64F91A9089879\"",
+            "properties": {
+              "allowUpdates": false,
+              "defaultVersion": "1"
+            }
+          },
+          {
+            "type": "Microsoft.Batch/batchAccounts/applications",
+            "id": "/subscriptions/subid/resourceGroups/default-azurebatch-japaneast/providers/Microsoft.Batch/batchAccounts/sampleacct/applications/app2",
+            "name": "app1",
+            "etag": "W/\"0x8D64F91A9089879\"",
+            "properties": {
+              "allowUpdates": false,
+              "defaultVersion": "2.0",
+              "displayName": "myAppName"
+            }
           }
-        },
-        {
-          "type": "Microsoft.Batch/batchAccounts/applications",
-          "id": "/subscriptions/subid/resourceGroups/default-azurebatch-japaneast/providers/Microsoft.Batch/batchAccounts/sampleacct/applications/app2",
-          "name": "app1",
-          "etag": "W/\"0x8D64F91A9089879\"",
-          "properties": {
-            "allowUpdates": false,
-            "defaultVersion": "2.0",
-            "displayName": "myAppName"
-          }
-        }
-      ]
+        ]
+      }
     }
   }
 }