Skip to content

Commit bfd34f2

Browse files
authored
Merge pull request #3 from Azure/master
Merge latest master
2 parents 4871a17 + 0955eca commit bfd34f2

File tree

543 files changed

+46789
-3183
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

543 files changed

+46789
-3183
lines changed

.github/pull_request_assignment.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@
5959
paths: "specification/compute/**"
6060
reviewers:
6161
- ArcturusZhang
62-
- fengzhou-msft
6362
- yungezz
6463

6564
- rule:
@@ -107,7 +106,6 @@
107106
- allenjzhang
108107
- rule:
109108
paths:
110-
- "specification/@(keyvault|notificationhubs)/**"
111109
- "specification/@(databricks|containerregistry)/**"
112110
reviewers:
113111
- fengzhou-msft
@@ -117,7 +115,6 @@
117115
- "specification/@(containerservice|containerinstance)/**"
118116
reviewers:
119117
- PhoenixHe-msft
120-
- fengzhou-msft
121118
- yungezz
122119

123120
- rule:

custom-words.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -591,6 +591,8 @@ Español
591591
estaba
592592
Etag
593593
etags
594+
Etcd
595+
etcd
594596
Ethereum
595597
evaluateautoscale
596598
evalue
@@ -867,6 +869,7 @@ jobpreparation
867869
jobpreparationandreleasetaskstatus
868870
jobrelease
869871
jobschedule
872+
jobscheduler
870873
jobschedules
871874
johnc
872875
johnsmith
@@ -2060,3 +2063,6 @@ tpgs
20602063
ProviderHub
20612064
checkin
20622065
regionality
2066+
Resource
2067+
Metastores
2068+

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

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ This document lists the set of automated rules that can be validated against swa
3434
| [MAXIMUM_EXCLUSIVE](#MAXIMUM_EXCLUSIVE) | |
3535
| [OBJECT_PROPERTIES_MINIMUM](#OBJECT_PROPERTIES_MINIMUM) | |
3636
| [OBJECT_PROPERTIES_MAXIMUM](#OBJECT_PROPERTIES_MAXIMUM) | |
37-
| [OBJECT_MISSING_REQUIRED_PROPERTY_DEFINITION](#OBJECT_MISSING_REQUIRED_PROPERTY_DEFINITION) | |
3837
| [OBJECT_MISSING_REQUIRED_PROPERTY](#OBJECT_MISSING_REQUIRED_PROPERTY) | |
3938
| [OBJECT_ADDITIONAL_PROPERTIES](#OBJECT_ADDITIONAL_PROPERTIES) | |
4039
| [OBJECT_DEPENDENCY_KEY](#OBJECT_DEPENDENCY_KEY) | |
@@ -219,9 +218,9 @@ This document lists the set of automated rules that can be validated against swa
219218

220219
**Output Message**: Value is required but was not provided.
221220

222-
**Description**: Missing required value in example.
221+
**Description**: Missing required value in example or in traffic payload.
223222

224-
**How to fix the violation**: Add the required value in example.
223+
**How to fix the violation**: Add the required value in example or in traffic payload.
225224

226225
### <a name="REMOTE_NOT_VALID" />REMOTE_NOT_VALID
227226

@@ -513,11 +512,11 @@ This document lists the set of automated rules that can be validated against swa
513512

514513
### <a name="REQUEST_VALIDATION_ERROR" />REQUEST_VALIDATION_ERROR
515514

516-
**Output Message**: Found errors in validating the request for x-ms-example {0} in operation {1}.
515+
**Output Message**: Found errors in validating the request for x-ms-example {0} in operation {1} or in validating request payload.
517516

518-
**Description**: Validate the request of each x-ms-example.
517+
**Description**: Validate the request of each x-ms-example or traffic payload.
519518

520-
**How to fix the violation**: The request parameter defined in example should match with the swagger spec.
519+
**How to fix the violation**: The request parameter defined in example or in traffic payload should match with the swagger spec.
521520

522521
### <a name="RESPONSE_STATUS_CODE_NOT_IN_EXAMPLE" />RESPONSE_STATUS_CODE_NOT_IN_EXAMPLE
523522

@@ -539,7 +538,7 @@ This document lists the set of automated rules that can be validated against swa
539538

540539
**Output Message**: This operation does not have a defined {0} response code.
541540

542-
**Description**: The specified response code is not defined in example file.
541+
**Description**: The specified response code is not defined in example file or in traffic payload.
543542

544543
**How to fix the violation**: Add response code to default, or add response code definition in the swagger.
545544

@@ -555,9 +554,9 @@ This document lists the set of automated rules that can be validated against swa
555554

556555
**Output Message**: Additional properties not allowed:{0}.
557556

558-
**Description**: Additional property {0} defined in example but not defined in swagger spec. It could be the property name does not match exactly.
557+
**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.
559558

560-
**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.
559+
**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.
561560

562561

563562
### <a name="INVALID_FORMAT" />INVALID_FORMAT
@@ -574,43 +573,43 @@ This document lists the set of automated rules that can be validated against swa
574573

575574
**Description**: The type provided for the property doesn't match to the defined type.
576575

577-
**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.
576+
**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.
578577

579578
### <a name="ENUM_CASE_MISMATCH" />ENUM_CASE_MISMATCH
580579

581580
**Output Message**: Enum does not match case for:{0}.
582581

583-
**Description**: The enum value provided in exmaple doesn't match the case of an allowed value.
582+
**Description**: The enum value provided in exmaple or in traffic payload doesn't match the case of an allowed value.
584583

585-
**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.
584+
**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.
586585

587586
### <a name="ENUM_MISMATCH" />ENUM_MISMATCH
588587

589588
**Output Message**: Enum does not match case for:{0}.
590589

591-
**Description**: The enum value provided in exmaple doesn't match the case of an allowed value.
590+
**Description**: The enum value provided in exmaple or in traffic payload doesn't match the case of an allowed value.
592591

593-
**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.
592+
**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.
594593

595594
### <a name="READONLY_PROPERTY_NOT_ALLOWED_IN_REQUEST" />READONLY_PROPERTY_NOT_ALLOWED_IN_REQUEST
596595

597596
**Output Message**: ReadOnly property `{0}: {1}`, cannot be sent in the request.
598597

599598
**Description**: The value of a readonly property is managed exclusively by the owning authority and cannot be supplied in request.
600599

601-
**How to fix the violation**: Remove the readonly property from the request parameters in example.
600+
**How to fix the violation**: Remove the readonly property from the request parameters in example or in traffic payload.
602601

603602
### <a name="OBJECT_MISSING_REQUIRED_PROPERTY" />OBJECT_MISSING_REQUIRED_PROPERTY
604603

605604
**Output Message**: Missing required property: {0}.
606605

607-
**Description**: The property {0} is required and has to provide in request or response of example.
606+
**Description**: The property {0} is required and has to provide in request or response of example (or of traffic payload).
608607

609-
**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.
608+
**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.
610609

611610
### <a name="DISCRIMINATOR_VALUE_NOT_FOUND" />DISCRIMINATOR_VALUE_NOT_FOUND
612611

613-
**Output Message**: Discriminator value "{0}" not found
612+
**Output Message**: Discriminator value "{0}" not found.
614613

615614
**Description**: The property used as discriminator has a value {0} but it's not found in swagger spec.
616615

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -483,6 +483,12 @@
483483
"schema": {
484484
"$ref": "#/definitions/OperationEntityListResult"
485485
}
486+
},
487+
"default": {
488+
"description": "Error response describing why the operation failed.",
489+
"schema": {
490+
"$ref": "#/definitions/ArmErrorResponse"
491+
}
486492
}
487493
},
488494
"deprecated": false,

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -838,6 +838,11 @@
838838
"description": "Operation type: Read, write, delete, etc.",
839839
"type": "string",
840840
"readOnly": true
841+
},
842+
"description": {
843+
"description": "Description of the operation object.",
844+
"type": "string",
845+
"readOnly": true
841846
}
842847
}
843848
},
@@ -1203,15 +1208,16 @@
12031208
"type": "object",
12041209
"properties": {
12051210
"status": {
1206-
"type": "string",
1211+
"type": "integer",
1212+
"format": "int32",
12071213
"enum": [
1208-
"Live"
1214+
0
12091215
],
12101216
"x-ms-enum": {
12111217
"name": "Status",
12121218
"modelAsString": false
12131219
},
1214-
"description": "Live message of list gateway."
1220+
"description": "Live message of list gateway. Status: 0 - Live"
12151221
}
12161222
}
12171223
},

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"200": {
1010
"headers": {},
1111
"body": {
12-
"status": "Live"
12+
"status": 0
1313
}
1414
}
1515
}

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1113,6 +1113,14 @@
11131113
"message": {
11141114
"description": "Error message indicating why the operation failed.",
11151115
"type": "string"
1116+
},
1117+
"subCode": {
1118+
"description": "The error sub code",
1119+
"type": "string"
1120+
},
1121+
"httpStatusCode": {
1122+
"description": "The http status code",
1123+
"type": "string"
11161124
}
11171125
}
11181126
}

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1093,15 +1093,16 @@
10931093
"type": "object",
10941094
"properties": {
10951095
"status": {
1096-
"type": "string",
1096+
"type": "integer",
1097+
"format": "int32",
10971098
"enum": [
1098-
"Live"
1099+
0
10991100
],
11001101
"x-ms-enum": {
11011102
"name": "Status",
11021103
"modelAsString": false
11031104
},
1104-
"description": "Live message of list gateway."
1105+
"description": "Live message of list gateway. Status: 0 - Live"
11051106
}
11061107
}
11071108
},

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

Lines changed: 39 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -838,6 +838,11 @@
838838
"description": "Operation type: Read, write, delete, etc.",
839839
"type": "string",
840840
"readOnly": true
841+
},
842+
"description": {
843+
"description": "Description of the operation object.",
844+
"type": "string",
845+
"readOnly": true
841846
}
842847
}
843848
},
@@ -1111,6 +1116,20 @@
11111116
},
11121117
"default": 1,
11131118
"description": "The managed mode of the server (0 = not managed, 1 = managed)."
1119+
},
1120+
"serverMonitorMode": {
1121+
"type": "integer",
1122+
"format": "int32",
1123+
"enum": [
1124+
0,
1125+
1
1126+
],
1127+
"x-ms-enum": {
1128+
"modelAsString": false,
1129+
"name": "ServerMonitorMode"
1130+
},
1131+
"default": 1,
1132+
"description": "The server monitor mode for AS server"
11141133
}
11151134
}
11161135
},
@@ -1189,15 +1208,16 @@
11891208
"type": "object",
11901209
"properties": {
11911210
"status": {
1192-
"type": "string",
1211+
"type": "integer",
1212+
"format": "int32",
11931213
"enum": [
1194-
"Live"
1214+
0
11951215
],
11961216
"x-ms-enum": {
11971217
"name": "Status",
11981218
"modelAsString": false
11991219
},
1200-
"description": "Live message of list gateway."
1220+
"description": "Live message of list gateway. Status: 0 - Live"
12011221
}
12021222
}
12031223
},
@@ -1222,6 +1242,14 @@
12221242
"message": {
12231243
"type": "string",
12241244
"description": "Error message of list gateway."
1245+
},
1246+
"subCode": {
1247+
"description": "The error sub code",
1248+
"type": "string"
1249+
},
1250+
"httpStatusCode": {
1251+
"description": "The http status code",
1252+
"type": "string"
12251253
}
12261254
}
12271255
},
@@ -1347,6 +1375,14 @@
13471375
"message": {
13481376
"description": "Error message indicating why the operation failed.",
13491377
"type": "string"
1378+
},
1379+
"subCode": {
1380+
"description": "The error sub code",
1381+
"type": "string"
1382+
},
1383+
"httpStatusCode": {
1384+
"description": "The http status code",
1385+
"type": "string"
13501386
}
13511387
}
13521388
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"200": {
1010
"headers": {},
1111
"body": {
12-
"status": "Live"
12+
"status": 0
1313
}
1414
}
1515
}

0 commit comments

Comments
 (0)