Merge pull request #1516 from Azure/upgrade-node14

Update azure-pipelines-autogen.yml for Azure Pipelines
AzureSDKAutomation · Feb 22, 2021 · 868d42f · 868d42f
2 parents ddb5a0c + 965e695
commit 868d42f
Show file tree

Hide file tree

Showing 14 changed files with 131 additions and 64 deletions.
diff --git a/azure-pipelines-autogen.yml b/azure-pipelines-autogen.yml
@@ -27,7 +27,7 @@ jobs:
 
   - task: NodeTool@0
     inputs:
-      versionSpec: '10.x'
+      versionSpec: '14.x'
 
   - script: |
       set -Eeuxo pipefail

diff --git a/schemas/2017-03-01/Microsoft.ApiManagement.json b/schemas/2017-03-01/Microsoft.ApiManagement.json
@@ -2609,7 +2609,7 @@
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "An value that determines where the API Version identifer will be located in a HTTP request."
+          "description": "An value that determines where the API Version identifier will be located in a HTTP request."
         },
         "versionQueryName": {
           "type": "string",

diff --git a/schemas/2017-04-18/Microsoft.CognitiveServices.json b/schemas/2017-04-18/Microsoft.CognitiveServices.json
@@ -214,6 +214,14 @@
           ],
           "description": "(Personalization Only) The flag to enable statistics of Bing Search."
         },
+        "qnaAzureSearchEndpointId": {
+          "type": "string",
+          "description": "(QnAMaker Only) The Azure Search endpoint id of QnAMaker."
+        },
+        "qnaAzureSearchEndpointKey": {
+          "type": "string",
+          "description": "(QnAMaker Only) The Azure Search endpoint key of QnAMaker."
+        },
         "qnaRuntimeEndpoint": {
           "type": "string",
           "description": "(QnAMaker Only) The runtime endpoint of QnAMaker."
@@ -560,7 +568,7 @@
     "PrivateLinkServiceConnectionState": {
       "type": "object",
       "properties": {
-        "actionRequired": {
+        "actionsRequired": {
           "type": "string",
           "description": "A message indicating if changes on the service provider require any updates on the consumer."
         },

diff --git a/schemas/2017-05-01-preview/Microsoft.MachineLearningExperimentation.json b/schemas/2017-05-01-preview/Microsoft.MachineLearningExperimentation.json
@@ -470,4 +470,4 @@
       "description": "The properties of a machine learning team account workspace."
     }
   }
-}
+}
diff --git a/schemas/2018-01-01/Microsoft.ApiManagement.json b/schemas/2018-01-01/Microsoft.ApiManagement.json
@@ -2656,7 +2656,7 @@
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "An value that determines where the API Version identifer will be located in a HTTP request."
+          "description": "An value that determines where the API Version identifier will be located in a HTTP request."
         },
         "versionQueryName": {
           "type": "string",

diff --git a/schemas/2019-01-01/Microsoft.ApiManagement.json b/schemas/2019-01-01/Microsoft.ApiManagement.json
@@ -2540,7 +2540,7 @@
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "An value that determines where the API Version identifer will be located in a HTTP request."
+          "description": "An value that determines where the API Version identifier will be located in a HTTP request."
         },
         "versionQueryName": {
           "type": "string",
@@ -2582,7 +2582,7 @@
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "An value that determines where the API Version identifer will be located in a HTTP request."
+          "description": "An value that determines where the API Version identifier will be located in a HTTP request."
         },
         "versionQueryName": {
           "type": "string",

diff --git a/schemas/2019-12-01/Microsoft.ApiManagement.json b/schemas/2019-12-01/Microsoft.ApiManagement.json
@@ -2814,7 +2814,7 @@
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "An value that determines where the API Version identifer will be located in a HTTP request."
+          "description": "An value that determines where the API Version identifier will be located in a HTTP request."
         },
         "versionQueryName": {
           "type": "string",
@@ -2856,7 +2856,7 @@
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "An value that determines where the API Version identifer will be located in a HTTP request."
+          "description": "An value that determines where the API Version identifier will be located in a HTTP request."
         },
         "versionQueryName": {
           "type": "string",

diff --git a/schemas/2020-01-13-preview/Microsoft.Automation.json b/schemas/2020-01-13-preview/Microsoft.Automation.json
@@ -1674,6 +1674,10 @@
       ],
       "description": "The properties of the create certificate operation."
     },
+    "Componentssgqdofschemasidentitypropertiesuserassignedidentitiesadditionalproperties": {
+      "type": "object",
+      "properties": {}
+    },
     "ConnectionCreateOrUpdateProperties": {
       "type": "object",
       "properties": {
@@ -1965,6 +1969,17 @@
     "EncryptionProperties": {
       "type": "object",
       "properties": {
+        "identity": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/EncryptionPropertiesIdentity"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "User identity used for CMK."
+        },
         "keySource": {
           "oneOf": [
             {
@@ -1994,6 +2009,17 @@
       },
       "description": "The encryption settings for automation account"
     },
+    "EncryptionPropertiesIdentity": {
+      "type": "object",
+      "properties": {
+        "userAssignedIdentity": {
+          "type": "object",
+          "properties": {},
+          "description": "The user identity used for CMK. It will be an ARM resource id in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'."
+        }
+      },
+      "description": "User identity used for CMK."
+    },
     "FieldDefinition": {
       "type": "object",
       "properties": {
@@ -2038,6 +2064,8 @@
               "type": "string",
               "enum": [
                 "SystemAssigned",
+                "UserAssigned",
+                "SystemAssigned, UserAssigned",
                 "None"
               ]
             },
@@ -2046,6 +2074,21 @@
             }
           ],
           "description": "The identity type."
+        },
+        "userAssignedIdentities": {
+          "oneOf": [
+            {
+              "type": "object",
+              "additionalProperties": {
+                "$ref": "#/definitions/Componentssgqdofschemasidentitypropertiesuserassignedidentitiesadditionalproperties"
+              },
+              "properties": {}
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The list of user identities associated with the resource. The user identity dictionary key references will be ARM resource ids in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'."
         }
       },
       "description": "Identity for the resource."

diff --git a/schemas/2020-04-01-preview/Microsoft.EventGrid.json b/schemas/2020-04-01-preview/Microsoft.EventGrid.json
@@ -731,7 +731,8 @@
         "maxEventsPerBatch": {
           "oneOf": [
             {
-              "type": "integer"
+              "type": "integer",
+              "default": "1"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -742,7 +743,8 @@
         "preferredBatchSizeInKilobytes": {
           "oneOf": [
             {
-              "type": "integer"
+              "type": "integer",
+              "default": "64"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -2550,7 +2552,8 @@
         "maxEventsPerBatch": {
           "oneOf": [
             {
-              "type": "integer"
+              "type": "integer",
+              "default": "1"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -2561,7 +2564,8 @@
         "preferredBatchSizeInKilobytes": {
           "oneOf": [
             {
-              "type": "integer"
+              "type": "integer",
+              "default": "64"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"

diff --git a/schemas/2020-06-01-preview/Microsoft.ApiManagement.json b/schemas/2020-06-01-preview/Microsoft.ApiManagement.json
@@ -4978,7 +4978,7 @@
         },
         "description": {
           "type": "string",
-          "minLength": 1,
+          "minLength": 0,
           "maxLength": 1000,
           "description": "Product description. May include HTML formatting tags."
         },

diff --git a/schemas/2020-06-01/Microsoft.EventGrid.json b/schemas/2020-06-01/Microsoft.EventGrid.json
@@ -373,7 +373,8 @@
         "maxEventsPerBatch": {
           "oneOf": [
             {
-              "type": "integer"
+              "type": "integer",
+              "default": "1"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -384,7 +385,8 @@
         "preferredBatchSizeInKilobytes": {
           "oneOf": [
             {
-              "type": "integer"
+              "type": "integer",
+              "default": "64"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -1257,7 +1259,8 @@
         "eventTimeToLiveInMinutes": {
           "oneOf": [
             {
-              "type": "integer"
+              "type": "integer",
+              "default": "1440"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -1268,7 +1271,8 @@
         "maxDeliveryAttempts": {
           "oneOf": [
             {
-              "type": "integer"
+              "type": "integer",
+              "default": "30"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -1734,7 +1738,8 @@
         "maxEventsPerBatch": {
           "oneOf": [
             {
-              "type": "integer"
+              "type": "integer",
+              "default": "1"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -1745,7 +1750,8 @@
         "preferredBatchSizeInKilobytes": {
           "oneOf": [
             {
-              "type": "integer"
+              "type": "integer",
+              "default": "64"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"

diff --git a/schemas/2020-10-15-preview/Microsoft.EventGrid.json b/schemas/2020-10-15-preview/Microsoft.EventGrid.json
@@ -803,7 +803,8 @@
         "maxEventsPerBatch": {
           "oneOf": [
             {
-              "type": "integer"
+              "type": "integer",
+              "default": "1"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -814,7 +815,8 @@
         "preferredBatchSizeInKilobytes": {
           "oneOf": [
             {
-              "type": "integer"
+              "type": "integer",
+              "default": "64"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -2290,7 +2292,8 @@
         "eventTimeToLiveInMinutes": {
           "oneOf": [
             {
-              "type": "integer"
+              "type": "integer",
+              "default": "1440"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -2301,7 +2304,8 @@
         "maxDeliveryAttempts": {
           "oneOf": [
             {
-              "type": "integer"
+              "type": "integer",
+              "default": "30"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -3021,7 +3025,8 @@
         "maxEventsPerBatch": {
           "oneOf": [
             {
-              "type": "integer"
+              "type": "integer",
+              "default": "1"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -3032,7 +3037,8 @@
         "preferredBatchSizeInKilobytes": {
           "oneOf": [
             {
-              "type": "integer"
+              "type": "integer",
+              "default": "64"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-Original file line number
+Diff line change
@@ Expand Up / @@ -470,4 +470,4 @@ @@
           "description": "The properties of a machine learning team account workspace."
         }
       }
-    }
+    }