Merge latest master

.github/pull_request_assignment.yml

@@ -59,7 +59,6 @@
     paths: "specification/compute/**"
     reviewers:
       - ArcturusZhang
-      - fengzhou-msft
       - yungezz
 
 - rule:
@@ -107,7 +106,6 @@
       - allenjzhang
 - rule:
     paths:
-      - "specification/@(keyvault|notificationhubs)/**"
       - "specification/@(databricks|containerregistry)/**"
     reviewers:
       - fengzhou-msft
@@ -117,7 +115,6 @@
       - "specification/@(containerservice|containerinstance)/**"
     reviewers:
       - PhoenixHe-msft
-      - fengzhou-msft
       - yungezz
 
 - rule:

custom-words.txt

@@ -591,6 +591,8 @@ Español
 estaba
 Etag
 etags
+Etcd
+etcd
 Ethereum
 evaluateautoscale
 evalue
@@ -867,6 +869,7 @@ jobpreparation
 jobpreparationandreleasetaskstatus
 jobrelease
 jobschedule
+jobscheduler
 jobschedules
 johnc
 johnsmith
@@ -2060,3 +2063,6 @@ tpgs
 ProviderHub
 checkin
 regionality
+Resource
+Metastores
+

documentation/Semantic-and-Model-Violations-Reference.md

@@ -34,7 +34,6 @@ This document lists the set of automated rules that can be validated against swa
 | [MAXIMUM_EXCLUSIVE](#MAXIMUM_EXCLUSIVE) | |
 | [OBJECT_PROPERTIES_MINIMUM](#OBJECT_PROPERTIES_MINIMUM) | |
 | [OBJECT_PROPERTIES_MAXIMUM](#OBJECT_PROPERTIES_MAXIMUM) | |
-| [OBJECT_MISSING_REQUIRED_PROPERTY_DEFINITION](#OBJECT_MISSING_REQUIRED_PROPERTY_DEFINITION) | |
 | [OBJECT_MISSING_REQUIRED_PROPERTY](#OBJECT_MISSING_REQUIRED_PROPERTY) | |
 | [OBJECT_ADDITIONAL_PROPERTIES](#OBJECT_ADDITIONAL_PROPERTIES) | |
 | [OBJECT_DEPENDENCY_KEY](#OBJECT_DEPENDENCY_KEY) | |
@@ -219,9 +218,9 @@ This document lists the set of automated rules that can be validated against swa
 
 **Output Message**: Value is required but was not provided.
 
-**Description**: Missing required value in example.
+**Description**: Missing required value in example or in traffic payload.
 
-**How to fix the violation**: Add the required value in example.
+**How to fix the violation**: Add the required value in example or in traffic payload.
 
 ### <a name="REMOTE_NOT_VALID" />REMOTE_NOT_VALID
 
@@ -513,11 +512,11 @@ This document lists the set of automated rules that can be validated against swa
 
 ### <a name="REQUEST_VALIDATION_ERROR" />REQUEST_VALIDATION_ERROR 
 
-**Output Message**: Found errors in validating the request for x-ms-example {0} in operation {1}.
+**Output Message**: Found errors in validating the request for x-ms-example {0} in operation {1} or in validating request payload.
 
-**Description**: Validate the request of each x-ms-example.  
+**Description**: Validate the request of each x-ms-example or traffic payload.  
 
-**How to fix the violation**: The request parameter defined in example should match with the swagger spec.
+**How to fix the violation**: The request parameter defined in example or in traffic payload should match with the swagger spec.
 
 ### <a name="RESPONSE_STATUS_CODE_NOT_IN_EXAMPLE" />RESPONSE_STATUS_CODE_NOT_IN_EXAMPLE 
 
@@ -539,7 +538,7 @@ This document lists the set of automated rules that can be validated against swa
 
 **Output Message**: This operation does not have a defined {0} response code.
 
-**Description**: The specified response code is not defined in example file.
+**Description**: The specified response code is not defined in example file or in traffic payload.
 
 **How to fix the violation**: Add response code to default, or add response code definition in the swagger.
 
@@ -555,9 +554,9 @@ This document lists the set of automated rules that can be validated against swa
 
 **Output Message**: Additional properties not allowed:{0}.
 
-**Description**: Additional property {0} defined in example but not defined in swagger spec. It could be the property name does not match exactly.
+**Description**: Additional property {0} defined in example or in traffic payload but not defined in swagger spec. It could be the property name does not match exactly.
 
-**How to fix the violation**: The error info has the position of swagger. Look for the violation location of the swagger, ensure the property name specified in example appears exact the same in the definition or remove this property from example if it's not defined in swagger spec. Remind all the characters are case sensitive.
+**How to fix the violation**: The error info has the position of swagger. Look for the violation location of the swagger, ensure the property name specified in example or in traffic payload appears exact the same in the definition or remove this property from example or from traffic payload if it's not defined in swagger spec. Remind all the characters are case sensitive.
 
 
 ### <a name="INVALID_FORMAT" />INVALID_FORMAT 
@@ -574,43 +573,43 @@ This document lists the set of automated rules that can be validated against swa
 
 **Description**: The type provided for the property doesn't match to the defined type.
 
-**How to fix the violation**: Correct the type defined in example file. Sometimes this could be false positive when it peers with other errors which belongs to same parent `ANY_OF_MISSING` error or `ONE_OF_MISSING` error, in this case this error can be ignored and just fix other peer errors eventually this error will be cleared out automatically.
+**How to fix the violation**: Correct the type defined in example file or in traffic payload. Sometimes this could be false positive when it peers with other errors which belongs to same parent `ANY_OF_MISSING` error or `ONE_OF_MISSING` error, in this case this error can be ignored and just fix other peer errors eventually this error will be cleared out automatically.
 
 ### <a name="ENUM_CASE_MISMATCH" />ENUM_CASE_MISMATCH 
 
 **Output Message**: Enum does not match case for:{0}.
 
-**Description**: The enum value provided in exmaple doesn't match the case of an allowed value.
+**Description**: The enum value provided in exmaple or in traffic payload doesn't match the case of an allowed value.
 
-**How to fix the violation**: The error info has the position of swagger. Look for the violation location of the swagger, correct the value case in example.
+**How to fix the violation**: The error info has the position of swagger. Look for the violation location of the swagger, correct the value case in example or in traffic payload.
 
 ### <a name="ENUM_MISMATCH" />ENUM_MISMATCH 
 
 **Output Message**: Enum does not match case for:{0}.
 
-**Description**: The enum value provided in exmaple doesn't match the case of an allowed value.
+**Description**: The enum value provided in exmaple or in traffic payload doesn't match the case of an allowed value.
 
-**How to fix the violation**: The error info has the position of swagger. Look for the violation location of the swagger, correct the value case in example.
+**How to fix the violation**: The error info has the position of swagger. Look for the violation location of the swagger, correct the value case in example or in traffic payload.
 
 ### <a name="READONLY_PROPERTY_NOT_ALLOWED_IN_REQUEST" />READONLY_PROPERTY_NOT_ALLOWED_IN_REQUEST 
 
 **Output Message**: ReadOnly property `{0}: {1}`, cannot be sent in the request.
 
 **Description**: The value of a readonly property is managed exclusively by the owning authority and cannot be supplied in request.
 
-**How to fix the violation**: Remove the readonly property from the request parameters in example.
+**How to fix the violation**: Remove the readonly property from the request parameters in example or in traffic payload.
 
 ### <a name="OBJECT_MISSING_REQUIRED_PROPERTY" />OBJECT_MISSING_REQUIRED_PROPERTY 
 
 **Output Message**: Missing required property: {0}.
 
-**Description**: The property {0} is required and has to provide in request or response of example.
+**Description**: The property {0} is required and has to provide in request or response of example (or of traffic payload).
 
-**How to fix the violation**: Provide the requried property in example or remove this property from the required list of the definition in swagger spec. Or add items property if the type is array.
+**How to fix the violation**: Provide the requried property in example(or in traffic payload) or remove this property from the required list of the definition in swagger spec. Or add items property if the type is array.
 
 ### <a name="DISCRIMINATOR_VALUE_NOT_FOUND" />DISCRIMINATOR_VALUE_NOT_FOUND
 
-**Output Message**: Discriminator value "{0}" not found
+**Output Message**: Discriminator value "{0}" not found.
 
 **Description**: The property used as discriminator has a value {0} but it's not found in swagger spec.
 

specification/advisor/resource-manager/Microsoft.Advisor/stable/2020-01-01/advisor.json

@@ -483,6 +483,12 @@
             "schema": {
               "$ref": "#/definitions/OperationEntityListResult"
             }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ArmErrorResponse"
+            }
           }
         },
         "deprecated": false,

specification/analysisservices/resource-manager/Microsoft.AnalysisServices/preview/2017-08-01-beta/analysisservices.json

@@ -838,6 +838,11 @@
               "description": "Operation type: Read, write, delete, etc.",
               "type": "string",
               "readOnly": true
+            },
+            "description": {
+              "description": "Description of the operation object.",
+              "type": "string",
+              "readOnly": true
             }
           }
         },
@@ -1203,15 +1208,16 @@
       "type": "object",
       "properties": {
         "status": {
-          "type": "string",
+          "type": "integer",
+          "format": "int32",
           "enum": [
-            "Live"
+            0
           ],
           "x-ms-enum": {
             "name": "Status",
             "modelAsString": false
           },
-          "description": "Live message of list gateway."
+          "description": "Live message of list gateway. Status: 0 - Live"
         }
       }
     },

specification/analysisservices/resource-manager/Microsoft.AnalysisServices/preview/2017-08-01-beta/examples/listGatewayStatus.json

@@ -9,7 +9,7 @@
     "200": {
       "headers": {},
       "body": {
-        "status": "Live"
+        "status": 0
       }
     }
   }

specification/analysisservices/resource-manager/Microsoft.AnalysisServices/stable/2016-05-16/analysisservices.json

@@ -1113,6 +1113,14 @@
             "message": {
               "description": "Error message indicating why the operation failed.",
               "type": "string"
+            },
+            "subCode": {
+              "description": "The error sub code",
+              "type": "string"
+            },
+            "httpStatusCode": {
+              "description": "The http status code",
+              "type": "string"
             }
           }
         }

specification/analysisservices/resource-manager/Microsoft.AnalysisServices/stable/2017-07-14/analysisservices.json

@@ -1093,15 +1093,16 @@
       "type": "object",
       "properties": {
         "status": {
-          "type": "string",
+          "type": "integer",
+          "format": "int32",
           "enum": [
-            "Live"
+            0
           ],
           "x-ms-enum": {
             "name": "Status",
             "modelAsString": false
           },
-          "description": "Live message of list gateway."
+          "description": "Live message of list gateway. Status: 0 - Live"
         }
       }
     },

specification/analysisservices/resource-manager/Microsoft.AnalysisServices/stable/2017-08-01/analysisservices.json

@@ -838,6 +838,11 @@
               "description": "Operation type: Read, write, delete, etc.",
               "type": "string",
               "readOnly": true
+            },
+            "description": {
+              "description": "Description of the operation object.",
+              "type": "string",
+              "readOnly": true
             }
           }
         },
@@ -1111,6 +1116,20 @@
           },
           "default": 1,
           "description": "The managed mode of the server (0 = not managed, 1 = managed)."
+        },
+        "serverMonitorMode": {
+          "type": "integer",
+          "format": "int32",
+          "enum": [
+            0,
+            1
+          ],
+          "x-ms-enum": {
+            "modelAsString": false,
+            "name": "ServerMonitorMode"
+          },
+          "default": 1,
+          "description": "The server monitor mode for AS server"
         }
       }
     },
@@ -1189,15 +1208,16 @@
       "type": "object",
       "properties": {
         "status": {
-          "type": "string",
+          "type": "integer",
+          "format": "int32",
           "enum": [
-            "Live"
+            0
           ],
           "x-ms-enum": {
             "name": "Status",
             "modelAsString": false
           },
-          "description": "Live message of list gateway."
+          "description": "Live message of list gateway. Status: 0 - Live"
         }
       }
     },
@@ -1222,6 +1242,14 @@
         "message": {
           "type": "string",
           "description": "Error message of list gateway."
+        },
+        "subCode": {
+          "description": "The error sub code",
+          "type": "string"
+        },
+        "httpStatusCode": {
+          "description": "The http status code",
+          "type": "string"
         }
       }
     },
@@ -1347,6 +1375,14 @@
             "message": {
               "description": "Error message indicating why the operation failed.",
               "type": "string"
+            },
+            "subCode": {
+              "description": "The error sub code",
+              "type": "string"
+            },
+            "httpStatusCode": {
+              "description": "The http status code",
+              "type": "string"
             }
           }
         }

specification/analysisservices/resource-manager/Microsoft.AnalysisServices/stable/2017-08-01/examples/listGatewayStatus.json

@@ -9,7 +9,7 @@
     "200": {
       "headers": {},
       "body": {
-        "status": "Live"
+        "status": 0
       }
     }
   }

specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/definitions.json

@@ -1450,13 +1450,21 @@
     },
     "BackendCredentialsContract": {
       "properties": {
+        "certificateIds": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "maxItems": 32,
+          "description": "List of Client Certificate Ids."
+        },
         "certificate": {
           "type": "array",
           "items": {
             "type": "string"
           },
           "maxItems": 32,
-          "description": "List of Client Certificate Thumbprint."
+          "description": "List of Client Certificate Thumbprints. Will be ignored if certificatesIds are provided."
         },
         "query": {
           "type": "object",
@@ -1547,8 +1555,12 @@
     },
     "BackendServiceFabricClusterProperties": {
       "properties": {
+        "clientCertificateId": {
+          "description": "The client certificate id for the management endpoint.",
+          "type": "string"
+        },
         "clientCertificatethumbprint": {
-          "description": "The client certificate thumbprint for the management endpoint.",
+          "description": "The client certificate thumbprint for the management endpoint. Will be ignored if certificatesIds are provided",
           "type": "string"
         },
         "maxPartitionResolutionRetries": {
@@ -1579,8 +1591,7 @@
         }
       },
       "required": [
-        "managementEndpoints",
-        "clientCertificatethumbprint"
+        "managementEndpoints"
       ],
       "description": "Properties of the Service Fabric Type Backend."
     },