Merging from master

.travis.yml

@@ -68,7 +68,7 @@ script:
   - >-
     if [[ $MODE == 'semantic' ]]; then
       npm install
-      npm test -- test/semantic.js
+      node scripts/semanticValidation.js
     fi
   - >-
     if [[ $MODE == 'model' ]]; then

package.json

@@ -19,7 +19,7 @@
     "json-schema-ref-parser": "^3.1.2",
     "mocha": "*",
     "oad": "^0.1.11",
-    "oav": "^0.5.2",
+    "oav": "^0.5.11",
     "request": "^2.61.0",
     "request-promise-native": "^1.0.5",
     "z-schema": "^3.16.1"

scripts/momentOfTruthPostProcessing.js

@@ -5,7 +5,8 @@
 
 const fs = require('fs'),
       utils = require('../test/util/utils'),
-      path = require('path');
+      path = require('path'),
+      gitHubPost = require('./postToGitHub');
 
 let pullRequestNumber = utils.getPullRequestNumber();
 let targetBranch = utils.getTargetBranch();
@@ -31,7 +32,7 @@ let githubFooter = `[AutoRest Linter Guidelines](https://github.com/Azure/azure-
     `\n\nThanks for your co-operation.`;
 
 let fileSummaryHeader = (file_name, file_href) => `## Config file: [${file_name}](${file_href})\n`;
-let fileSummaryNewTemplate = (issue_type, issue_count, issue_table) => `### <a name="${issue_type.replace(/\s/g, "-")}s"></a>${iconFor(issue_type)} ${issue_count} new ${pluralize(issue_type, issue_count)}\n\n${issue_table}\n`;
+let fileSummaryNewTemplate = (issue_type, issue_count, issue_table) => `<details><summary><h3 style="display: inline"><a name="${issue_type.replace(/\s/g, "-")}s"></a>${iconFor(issue_type)} ${issue_count} new ${pluralize(issue_type, issue_count)}</h3></summary><br>\n\n${issue_table}\n</details>`;
 let fileSummaryExistingTemplate = (issue_type, issue_count, issue_table) => `<details><summary>${iconFor(issue_type)} ${issue_count} existing ${pluralize(issue_type, issue_count)}</summary><br>\n\n${issue_table}\n</details>\n\n`;
 
 let potentialNewWarningErrorSummaryHeader = `
@@ -65,7 +66,10 @@ try {
 }
 
 function compareJsonRef(beforeJsonRef, afterJsonRef) {
-    return (beforeJsonRef.replace(/json:\d+:\d+/, '') == afterJsonRef.replace(/json:\d+:\d+/, ''));
+    beforeJsonRef = beforeJsonRef.replace(/.*\.json:\d+:\d+/, '')
+    afterJsonRef = afterJsonRef.replace(/.*\.json:\d+:\d+/, '')
+
+    return (beforeJsonRef == afterJsonRef);
 }
 
 function getOutputMessages(newSDKErrorsCount, newARMErrorsCount, newSDKWarningsCount, newARMWarningsCount) {
@@ -296,15 +300,15 @@ function postProcessing() {
 
         let beforeErrorsAndWarningsArray = jsonData['files'][fileName]['before'];
         beforeErrorsAndWarningsArray.forEach(beforeErrorOrWarning => {
-            if(beforeErrorOrWarning.type.toLowerCase() == 'warning'){
+            if(beforeErrorOrWarning.type != undefined && beforeErrorOrWarning.type.toLowerCase() == 'warning'){
                 if(beforeErrorOrWarning.validationCategory.toLowerCase() == 'sdkviolation') {
                     beforeWarningsSDKArray.push(beforeErrorOrWarning);
                 } else {
                     beforeWarningsARMArray.push(beforeErrorOrWarning);
                 }
             }
 
-            if(beforeErrorOrWarning.type.toLowerCase() == 'error'){
+            if(beforeErrorOrWarning.type != undefined && beforeErrorOrWarning.type.toLowerCase() == 'error'){
                 if(beforeErrorOrWarning.validationCategory.toLowerCase() == 'sdkviolation') {
                     beforeErrorsSDKArray.push(beforeErrorOrWarning);
                 } else {
@@ -315,15 +319,15 @@ function postProcessing() {
 
         let afterErrorsAndWarningsArray = jsonData['files'][fileName]['after'];
         afterErrorsAndWarningsArray.forEach(afterErrorOrWarning => {
-            if(afterErrorOrWarning.type.toLowerCase() == 'warning'){
+            if(afterErrorOrWarning.type != undefined && afterErrorOrWarning.type.toLowerCase() == 'warning'){
                 if(afterErrorOrWarning.validationCategory.toLowerCase() == 'sdkviolation') {
                     afterWarningsSDKArray.push(afterErrorOrWarning);
                 } else {
                     afterWarningsARMArray.push(afterErrorOrWarning);
                 }
             }
 
-            if(afterErrorOrWarning.type.toLowerCase() == 'error'){
+            if(afterErrorOrWarning.type != undefined && afterErrorOrWarning.type.toLowerCase() == 'error'){
                 if(afterErrorOrWarning.validationCategory.toLowerCase() == 'sdkviolation') {
                     afterErrorsSDKArray.push(afterErrorOrWarning);
                 } else {
@@ -356,6 +360,7 @@ function postProcessing() {
         console.log("Existing ARM Errors: ", existingARMErrors.length);
         console.log("Existing ARM Warnings: ", existingARMWarnings.length);
         console.log();
+
         if (newSDKErrors.length > 0) {
             console.log(`Potential new SDK errors`)
             console.log("========================");
@@ -403,6 +408,12 @@ function postProcessing() {
     console.log(JSON.stringify(output, null, 2));
     console.log("---");
 
+    if(process.env.TRAVIS_REPO_SLUG != undefined && process.env.TRAVIS_REPO_SLUG.endsWith("-pr")) {
+        let slug = process.env.TRAVIS_REPO_SLUG;
+        slug = slug.split("/")[1];
+        gitHubPost.postGithubComment("Azure", slug, pullRequestNumber, output.text);
+    }
+
     if (newSDKErrorsCount > 0 || newARMErrorsCount > 0) {
         process.exitCode = 1;
     }

scripts/postToGitHub.js

@@ -0,0 +1,29 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+'use strict';
+
+const octokit = require('@octokit/rest')();
+let token = process.env.GITHUB_TOKEN;
+
+if(token != undefined) {
+    octokit.authenticate({
+        type: 'token',
+        token: token
+    });
+}
+
+module.exports = {
+    postGithubComment: function(owner, repository, prNumber, commentBody) {
+        octokit.issues.createComment({
+            "owner": owner,
+            "repo": repository,
+            "number": prNumber,
+            "body": commentBody
+        }).then(data => {
+            console.log("Comment has been posted");
+        }). catch(err => {
+            console.log(err);
+        });
+    }
+}

scripts/semanticValidation.js

@@ -0,0 +1,20 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License in the project root for license information.
+'use strict';
+
+const utils = require('../test/util/utils')
+const oav = require('oav');
+
+async function main() {
+  const swaggersToProcess = utils.getFilesChangedInPR();
+  // Useful when debugging a test for a particular swagger.
+  // Just update the regex. That will return an array of filtered items.
+  // swaggersToProcess = swaggersToProcess.filter(function(item) {
+  //   return (item.match(/.*Microsoft.Logic.*2016-06-01.*/ig) !== null);
+  // });
+  for (const swagger of swaggersToProcess) {
+    await oav.validateSpec(swagger, {consoleLogLevel: 'error', pretty: true});
+  }
+}
+
+main()

specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2017-03-01/apimdeployment.json

@@ -215,6 +215,12 @@
             "schema": {
               "$ref": "#/definitions/ApiManagementServiceResource"
             }
+          },
+          "202": {
+            "description": "Accepted",
+            "schema": {
+              "$ref": "#/definitions/ApiManagementServiceResource"
+            }
           }
         },
         "x-ms-long-running-operation": true
@@ -1389,4 +1395,4 @@
     }
   },
   "parameters": {}
-}
+}

specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2017-03-01/examples/ApiManagementCreateMultiRegionServiceWithCustomHostname.json

@@ -4,7 +4,7 @@
     "resourceGroupName": "rg1",
     "api-version": "2017-03-01",
     "subscriptionId": "subid",
-    "parameters": {      
+    "parameters": {
       "location": "Central US",
       "sku": {
         "name": "Premium",
@@ -206,6 +206,85 @@
           "capacity": 1
         }
       }
+    },
+    "202": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1",
+        "name": "apimService1",
+        "type": "Microsoft.ApiManagement/service",
+        "tags": {},
+        "location": "Central US",
+        "etag": "AAAAAAAXXwI=",
+        "properties": {
+          "publisherEmail": "admin@live.com",
+          "publisherName": "contoso",
+          "provisioningState": "Succeeded",
+          "targetProvisioningState": "",
+          "createdAtUtc": "2017-05-30T19:00:47.1121713Z",
+          "gatewayUrl": "https://apimService1.azure-api.net",
+          "portalUrl": "https://apimService1.portal.azure-api.net",
+          "managementApiUrl": "https://apimService1.management.azure-api.net",
+          "scmUrl": "https://apimService1.scm.azure-api.net",
+          "hostnameConfigurations": [
+            {
+              "type": "Proxy",
+              "hostName": "proxyhostname1.contoso.com",
+              "negotiateClientCertificate": false,
+              "certificate": {
+                "expiry": "2018-03-17T21:55:07+00:00",
+                "thumbprint": "918D7785B926AC5AEE66322778A147BCE7237CF3",
+                "subject": "CN=proxyhostname1.contoso.com"
+              }
+            },
+            {
+              "type": "Proxy",
+              "hostName": "proxyhostname2.contoso.com",
+              "negotiateClientCertificate": true,
+              "certificate": {
+                "expiry": "2018-03-17T21:55:07+00:00",
+                "thumbprint": "918D7785B926AC5AEE66322778A147BCE7237CF3",
+                "subject": "CN=proxyhostname2.contoso.com"
+              }
+            },
+            {
+              "type": "Portal",
+              "hostName": "portalhostname1.contoso.com",
+              "negotiateClientCertificate": false,
+              "certificate": {
+                "expiry": "2018-03-17T21:55:07+00:00",
+                "thumbprint": "918D7785B926AC5AEE66322778A147BCE7237CF3",
+                "subject": "CN=portalhostname1.contoso.com"
+              }
+            }
+          ],
+          "staticIps": [
+            "52.173.193.207"
+          ],
+          "additionalLocations": [
+            {
+              "location": "West US",
+              "sku": {
+                "name": "Premium",
+                "capacity": 1
+              },
+              "staticIps": [
+                "104.210.41.234"
+              ],
+              "virtualNetworkConfiguration": {
+                "subnetResourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/westUsVirtualNetwork/subnets/apimSubnet"
+              }
+            }
+          ],
+          "virtualNetworkConfiguration": {
+            "subnetResourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/centralUsVirtualNetwork/subnets/apimSubnet"
+          },
+          "virtualNetworkType": "External"
+        },
+        "sku": {
+          "name": "Premium",
+          "capacity": 1
+        }
+      }
     }
   }
-}
+}

specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2017-03-01/examples/ApiManagementCreateService.json

@@ -72,6 +72,35 @@
           "capacity": 1
         }
       }
+    },
+    "202": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1",
+        "name": "apimService1",
+        "type": "Microsoft.ApiManagement/service",
+        "tags": {},
+        "location": "West US",
+        "etag": "AAAAAAAV8XM=",
+        "properties": {
+          "publisherEmail": "admin@live.com",
+          "publisherName": "Contoso",
+          "provisioningState": "Succeeded",
+          "targetProvisioningState": "",
+          "createdAtUtc": "2015-09-22T01:52:02.4307221Z",
+          "gatewayUrl": "https://apimService1.azure-api.net",
+          "portalUrl": "https://apimService1.portal.azure-api.net",
+          "managementApiUrl": "https://apimService1.management.azure-api.net",
+          "scmUrl": "https://apimService1.scm.azure-api.net",
+          "staticIps": [
+            "xx.xx.250.222"
+          ],
+          "virtualNetworkType": "None"
+        },
+        "sku": {
+          "name": "Premium",
+          "capacity": 1
+        }
+      }
     }
   }
-}
+}

specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2017-03-01/examples/ApiManagementCreateServiceHavingMsi.json

@@ -81,6 +81,35 @@
           "tenantId": "72f988bf-xxxx-41af-xxxx-2d7cd011db47"
         }
       }
+    },
+    "202": {
+      "headers": {
+        "location": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/operationresults/dGVjaGVkX01hbmFnZVJvbGVfNWRiNGI3Ng==?api-version=2017-03-01"
+      },
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1",
+        "name": "apimService1",
+        "type": "Microsoft.ApiManagement/service",
+        "location": "Japan East",
+        "etag": "AAAAAAC268k=",
+        "properties": {
+          "publisherEmail": "admin@contoso.com",
+          "publisherName": "Contoso",
+          "notificationSenderEmail": "apimgmt-noreply@mail.windowsazure.com",
+          "provisioningState": "Created",
+          "targetProvisioningState": "Activating",
+          "createdAtUtc": "2017-10-27T23:41:41.7231779Z"
+        },
+        "sku": {
+          "name": "Developer",
+          "capacity": 1
+        },
+        "identity": {
+          "type": "SystemAssigned",
+          "principalId": "f4b0f1c2-xxxx-43db-xxxx-ccd99e1afd22",
+          "tenantId": "72f988bf-xxxx-41af-xxxx-2d7cd011db47"
+        }
+      }
     }
   }
-}
+}

specification/automation/resource-manager/Microsoft.Automation/stable/2018-06-30/runbook.json

@@ -79,7 +79,7 @@
           "200": {
             "description": "OK",
             "schema": {
-              "type": "string"
+              "type": "file"
             }
           },
           "default": {