Merge master into Network release branch

.travis.yml

@@ -1,6 +1,7 @@
 language: node_js
 node_js:
   - '10'
+cache: npm
 services:
   - docker
 env:

azure-pipelines.yml

@@ -55,6 +55,18 @@ jobs:
   - script: 'node scripts/modelValidation.js'
     displayName: 'Model Validation'
 
+- job: "Avocado"
+  pool:
+    vmImage: 'Ubuntu 16.04'
+  continueOnError: true
+  steps:
+  - task: Npm@1
+    displayName: 'npm install'
+    inputs:
+      verbose: false
+  - script: './node_modules/.bin/ts-node scripts/avocado.ts'
+    displayName: 'Avocado'
+
 - job: "BreakingChange"
   condition: "not(variables['PRIVATE'])"
   pool:

package.json

@@ -10,24 +10,25 @@
   "description": "Tests for Azure REST API Specifications",
   "license": "MIT",
   "devDependencies": {
+    "@azure/avocado": "^0.2.0",
+    "@azure/oad": "^0.2.1",
     "@microsoft.azure/async-io": "^1.0.21",
     "@microsoft.azure/literate": "^1.0.21",
     "@microsoft.azure/polyfill": "^1.0.17",
     "@ts-common/commonmark-to-markdown": "^1.1.10",
-    "@ts-common/fs": "0.1.0",
+    "@ts-common/fs": "0.1.1",
     "@types/js-yaml": "^3.12.0",
     "fs-extra": "^3.0.1",
     "glob": "^5.0.14",
-    "js-yaml": "^3.12.2",
+    "js-yaml": "^3.13.0",
     "json-schema-ref-parser": "^3.1.2",
     "mocha": "*",
-    "@azure/oad": "^0.2.1",
-    "oav": "^0.14.5",
+    "oav": "^0.14.8",
     "request": "^2.61.0",
     "request-promise-native": "^1.0.5",
+    "ts-node": "^8.0.3",
     "typescript": "^3.2.4",
-    "z-schema": "^3.25.1",
-    "ts-node": "^8.0.3"
+    "z-schema": "^3.25.1"
   },
   "dependencies": {
     "@octokit/rest": "^15.2.6"

scripts/avocado.ts

@@ -0,0 +1,44 @@
+const utils = require('../test/util/utils')
+import * as path from "path"
+import * as avocado from "@azure/avocado"
+import * as openApiMarkDown from "@azure/openapi-markdown"
+import * as yaml from "js-yaml"
+
+async function main() {
+  const swaggersToProcess = utils.getFilesChangedInPR();
+  let errorNumbers = 0
+  const set = new Set<string>()
+  for (const swagger of swaggersToProcess) {
+    const rm = await openApiMarkDown.findReadMe(path.dirname(swagger))
+    if (rm === undefined) {
+      console.error(`No readme.md for ${swagger}`)
+      ++errorNumbers
+    } else {
+      const dir = path.dirname(rm)
+      if (dir.includes("specification")) {
+        set.add(dir)
+      } else {
+        console.error(`No readme.md for ${swagger}`)
+        ++errorNumbers
+      }
+    }
+  }
+  for (const swagger of set) {
+    try {
+      console.log(swagger)
+      const errors = avocado.avocado(swagger)
+      for await (const e of errors) {
+        console.error(yaml.safeDump(e))
+        ++errorNumbers
+      }
+    } catch (e) {
+      console.error("fatal error:")
+      console.error(e)
+      ++errorNumbers
+    }
+  }
+  console.log(`errors: ${errorNumbers}`)
+  return errorNumbers === 0 ? 0 : 1
+}
+
+main().then(process.exit)

specification/adhybridhealthservice/resource-manager/Microsoft.ADHybridHealthService/stable/2014-01-01/ADHybridHealthService.json

@@ -3276,7 +3276,7 @@
             "description": "The name of the service.",
             "required": true,
             "type": "string"
-          },          
+          },
           {
             "$ref": "#/parameters/apiVersionParameter"
           }
@@ -3311,7 +3311,7 @@
             "description": "The name of the service.",
             "required": true,
             "type": "string"
-          },          
+          },
           {
             "$ref": "#/parameters/apiVersionParameter"
           }
@@ -3328,6 +3328,55 @@
           "nextLinkName": null
         }
       }
+    },
+    "/providers/Microsoft.ADHybridHealthService/services/{serviceName}/servicemembers/{serviceMemberId}/metrics/{metricName}":
+    {
+      "get": {
+        "tags": ["Metrics"],
+        "description": "Gets the list of connectors and run profile names.",
+        "x-ms-examples": {
+          "serviceMembers_getConnectorMetadata": {
+            "$ref": "./examples/ConnectorMetadata.json"
+          }
+        },
+        "operationId": "serviceMembers_getConnectorMetadata",
+        "parameters": [
+          {
+            "name": "serviceName",
+            "in": "path",
+            "description": "The name of the service.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "serviceMemberId",
+            "in": "path",
+            "description": "The service member id.",
+            "required": true,
+            "type": "string",
+            "format": "uuid"
+          },
+		  {
+            "name": "metricName",
+            "in": "path",
+            "description": "The name of the metric.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description":
+              "Gets the list of connectors and run profile names for the given service and service member.",
+            "schema": {
+              "$ref": "#/definitions/ConnectorMetadata"
+            }
+          }
+        }
+      }
     }
   },
   "definitions": {
@@ -4237,6 +4286,40 @@
         }
       }
     },
+    "ConnectorMetadata": {
+      "description": "Gets the list of connectors and run profile names.",
+      "type": "object",
+      "properties": {
+        "connectors": {
+          "description": "The list of connectors.",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ConnectorMetadataDetails"
+          }
+        },
+        "runProfileNames": {
+          "description": "The list of run profile names.",
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        }
+      }
+    },
+    "ConnectorMetadataDetails": {
+      "description": "Details of the connector.",
+      "type": "object",
+      "properties": {
+        "connectorId": {
+          "description": "The Connector Id.",
+          "type": "string"
+        },
+        "connectorDisplayName": {
+          "description": "The Connector Display Name",
+          "type": "string"
+        }
+      }
+    },
     "ConnectorObjectError": {
       "description": "The connector object error.",
       "type": "object",
@@ -6458,29 +6541,29 @@
       }
     }
   },
-  "parameters": {
-    "apiVersionParameter": {
-      "name": "api-version",
-      "in": "query",
-      "description": "The version of the API to be used with the client request.",
-      "required": true,
-      "type": "string"
-    }
-  },
-  "securityDefinitions": {
-    "azure_auth": {
-      "type": "oauth2",
-      "description": "Azure Active Directory OAuth2 Flow.",
-      "flow": "implicit",
-      "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
-      "scopes": {
-        "user_impersonation": "impersonate your user account"
+    "parameters": {
+      "apiVersionParameter": {
+        "name": "api-version",
+        "in": "query",
+        "description": "The version of the API to be used with the client request.",
+        "required": true,
+        "type": "string"
       }
-    }
-  },
-  "security": [
-    {
-      "azure_auth": [ "user_impersonation" ]
-    }
-  ]
-}
+    },
+    "securityDefinitions": {
+      "azure_auth": {
+        "type": "oauth2",
+        "description": "Azure Active Directory OAuth2 Flow.",
+        "flow": "implicit",
+        "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
+        "scopes": {
+          "user_impersonation": "impersonate your user account"
+        }
+      }
+    },
+    "security": [
+      {
+        "azure_auth": [ "user_impersonation" ]
+      }
+    ]
+  }

specification/adhybridhealthservice/resource-manager/Microsoft.ADHybridHealthService/stable/2014-01-01/examples/ConnectorMetadata.json

@@ -0,0 +1,32 @@
+{
+  "parameters": {
+    "serviceName": "sampleServiceName",
+	"serviceMemberId": "SampleServiceMemberId",
+    "api-version": "2014-01-01"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+              "connectors": [
+                  {
+                    "connectorId": "3efbb72d-5047-4816-a7dd-73fefe16a2f3",
+                    "connectorDisplayName": "adhsdfus1runner.adhs.com"
+                  },
+                  {
+                    "connectorId": "b891884f-051e-4a83-95af-2544101c9083",
+                    "connectorDisplayName": "dfadhybridhealth.dfdomain.net - AAD"
+                  }
+                ],
+                "runProfileNames": [
+                  "Export",
+                  "ApplyRules",
+                  "DeltaImport"
+                ]
+            }
+        ]
+      }
+    }
+  }
+}

specification/alertsmanagement/resource-manager/Microsoft.AlertsManagement/stable/2018-05-05/examples/Alerts_ChangeState.json

@@ -32,12 +32,12 @@
 					  "monitorConditionResolvedDateTime": "2018-09-13T15:51:02Z"
 					},
 					"egressConfig": {},
-					"context": {}				
+					"context": {}
 				},
 				"id":"/subscriptions/9e261de7-c804-4b9d-9ebf-6f50fe350a9a/providers/Microsoft.AlertsManagement/alerts/66114d64-d9d9-478b-95c9-b789d6502100",
 				"type":"Microsoft.AlertsManagement/alerts",
 				"name":"cpu alert"
 			}
-		}	
+		}
 	}
 }

specification/azure-kusto/resource-manager/readme.md

@@ -29,6 +29,14 @@ title: KustoManagementClient
 description: The Azure Kusto management API provides a RESTful set of web services that interact with Azure Kusto services to manage your clusters and databases. The API enables you to create, update, and delete clusters and databases.
 openapi-type: arm
 tag: package-2019-01-21
+
+directive:
+  - where:
+      - $.definitions.DataConnection.required
+    suppress:
+      - R2016
+    reason:
+      - Implements kind which is required also in patch
 ```
 
 ### Tag: package-2019-01-21