Skip to content

Commit e5e6a16

Browse files
committed
Merge branch 'master' of https://github.com/Azure/azure-rest-api-specs into ANF-8208-UpdateSwaggerRestAPI-to-2020-09-01
2 parents c6ed2cf + ef369e8 commit e5e6a16

File tree

1,156 files changed

+109082
-2955
lines changed

Some content is hidden

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

1,156 files changed

+109082
-2955
lines changed

.github/comment.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,8 @@
2323
type: label
2424
label: Approved-OkToMerge
2525
onLabeledComments: "Hi @${PRAuthor},Your PR is approved. Congratulations. </br> <li> If your PR is in public repo (azure-rest-api-specs), PR assignee will merge all updates in the PR shortly afterwards; or pause the PR merge, you need to put on a label <b>DoNotMerge</b> to PR as soon as possible. </li><li>If your PR is in private repo (azure-rest-api-specs-pr), there won’t be PR merge. Please refer to this [wiki](https://dev.azure.com/azure-sdk/internal/_wiki/wikis/internal.wiki/205/RP-Scenarios-to-Contribute-to-Swagger?anchor=**public-repository-vs.-private-repository**) for further guidance on how to proceed. </li>"
26+
27+
- rule:
28+
type: label
29+
label: NewApiVersionRequired
30+
onLabeledComments: "<b>NewApiVersionRequired reason:</b></br> </br><b>A service’s API is a contract with customers and is represented by using the api-version query parameter. Changes such as adding an optional property to a request/response or introducing a new operation is a change to the service’s contract and therefore requires a new api-version value. This is critically important for documentation, client libraries, and customer support. </b> </br></br> EXAMPLE: if a customer calls a service in the public cloud using <b>api-version=2020-07-27</b>, the new property or operation may exist but if they call the service in a government cloud, air-gapped cloud, or Azure Stack Hub cloud using the same api-version, the property or operation may not exist. Because there is no clear relationship between the service api-version and the new property/operation, customers can’t trust the documentation and Azure customer have difficulty helping customers diagnose issues. In addition, each client library version documents the service version it supports. When an optional property or new operation is added to a service and its Swagger, new client libraries must be produced to expose this functionality to customers. Without updating the api-version, it is unclear to customers which version of a client library supports these new features. "

.github/pull_request_assignment.yml

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -136,33 +136,23 @@
136136

137137
- rule:
138138
paths:
139-
- "**/package.json"
140-
- ".github/**"
141-
- "**/azure-pipelines.yml"
142-
- ".azure-pipelines/**"
143-
- ".azure-pipelines-preproduction/**"
139+
- "documentation/**"
144140
reviewers:
141+
- josefree
145142
- akning-ms
146-
- PhoenixHe-msft
147-
148-
- rule:
149-
paths:
150-
- "documentation/**"
151-
reviewers:
152-
- josefree
153-
- akning-ms
154143

155-
- rule:
156-
paths:
144+
- rule:
145+
paths:
157146
- "**/package.json"
158147
- ".github/**"
159148
- "**/azure-pipelines.yml"
160149
- ".azure-pipelines/**"
161150
- ".azure-pipelines-preproduction/**"
162-
reviewers:
163-
- akning-ms
164-
- PhoenixHe-msft
151+
reviewers:
152+
- akning-ms
153+
- PhoenixHe-msft
165154
- raych1
155+
- zhenglaizhang
166156

167157
- rule:
168158
# manager-plane PR
@@ -185,3 +175,4 @@
185175
- qianwens
186176
- ruowan
187177
- jianyexi
178+
- zhenglaizhang

cSpell.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -748,6 +748,14 @@
748748
"pstn",
749749
"unconfiguring"
750750
]
751+
},
752+
{
753+
"filename": "**/specification/saas/resource-manager/Microsoft.SaaS/preview/2018-03-01-beta/saas.json",
754+
"words": [
755+
"checkmoderneligibility",
756+
"saasresources",
757+
"Moderneligibility"
758+
]
751759
}
752760
]
753761
}

custom-words.txt

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ adhybridhealthservice
3535
adla
3636
adls
3737
adminmanagement
38+
ADSIs
3839
ADTO
3940
adultscore
4041
affinitized
@@ -392,6 +393,7 @@ createpreview
392393
credativ
393394
Creds
394395
crossdomain
396+
cscfg
395397
csname
396398
CSRP
397399
csrs
@@ -496,8 +498,11 @@ deserializing
496498
destinationshares
497499
deterministically
498500
devicecredentials
501+
devicegroups
499502
deviceprovisioningservices
500503
devicetemplates
504+
Devops
505+
devops
501506
devspaces
502507
devtestlab
503508
devtestlabs
@@ -740,6 +745,7 @@ HCRP
740745
HDFS
741746
hdinsight
742747
Headnode
748+
healthbot
743749
healthcareapis
744750
Heatbeat
745751
heatmap
@@ -1509,6 +1515,7 @@ Scaleset
15091515
scalesets
15101516
Scame
15111517
scanability
1518+
ScheduleType
15121519
SCMS
15131520
SCOM
15141521
scopemap
@@ -1601,6 +1608,7 @@ SMBIOS
16011608
snapshotrun
16021609
snapshotsdr
16031610
SNAT
1611+
SNMP
16041612
softwareplan
16051613
SOHSV
16061614
solaris
@@ -1713,6 +1721,7 @@ supportedvpndevices
17131721
supporttickets
17141722
susbcriptionid
17151723
svpn
1724+
swappable
17161725
swappiness
17171726
Swappiness
17181727
switchprotection
@@ -1862,7 +1871,6 @@ Unregistering
18621871
Unregisters
18631872
unrestorable
18641873
unsubstituted
1865-
Unsynced
18661874
untagged
18671875
Untracked
18681876
unvalidated
@@ -2030,4 +2038,8 @@ Zilla
20302038
ziplist
20312039
Zoho
20322040
zoneinfo
2033-
zset
2041+
zset
2042+
tpgs
2043+
ProviderHub
2044+
checkin
2045+
regionality

documentation/openapi-authoring-automated-guidelines.md

Lines changed: 38 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ We request OpenAPI(Swagger) spec authoring be assigned to engineers who have an
2020
* [Rule Descriptions](#rule-descriptions)
2121

2222
## Error vs Warning
23-
- Rules with severity "Error" have to be addressed for the OpenAPI(swagger) spec to be approved by the reviewers. If there is a strong reason for why the rule cannot be addressed in an OpenAPI(swagger) spec it will be a permanent exception, then [suppression process](https://github.com/Azure/adx-documentation-pr/wiki/Swagger-Validation-Errors-Suppression) must be followed.
23+
- Rules with severity "Error" have to be addressed for the OpenAPI(swagger) spec to be approved by the reviewers. If there is a strong reason for why the rule cannot be addressed in an OpenAPI(swagger) spec it will be a permanent exception, then [suppression process](https://dev.azure.com/azure-sdk/internal/_wiki/wikis/internal.wiki/85/Swagger-Suppression-Process) must be followed.
2424

2525
- Rules with severity "Warning" are either strong recommendations made by Azure developer experience team for better SDK/Documentation experience or they point out something to evaluate, for example, the warning for booleans asks the user to evaluate whether the property should be a boolean or not.
2626

@@ -2349,35 +2349,55 @@ Links: [Index](#index) | [Error vs. Warning](#error-vs-warning) | [Automated Rul
23492349
**LastModifiedAt**: April 2, 2020
23502350

23512351
**How to fix the violation**: Following the ARM specification to modify the schema in the swagger file.
2352+
It's recommended to refer to the 'ErrorResponse' in [v2/types.json](https://github.com/Azure/azure-rest-api-specs/blob/master/specification/common-types/resource-management/v2/types.json#L273) which is provided for fixing the error.
23522353

23532354
The following would be invalid:
23542355

23552356
```json
2356-
"response":{
2357-
"default": {
2358-
"schema":{
2359-
"error":"error msg",
2360-
"code": 404,
2361-
"message":"some details"
2357+
"definitions": {
2358+
"ErrorResponse": {
2359+
"properties": {
2360+
"code": {
2361+
"readOnly": true,
2362+
"type": "string",
2363+
"description": "The error code."
2364+
},
2365+
"message": {
2366+
"readOnly": true,
2367+
"type": "string",
2368+
"description": "The error message."
2369+
}
2370+
...
23622371
}
23632372
}
2364-
}
2365-
2373+
}
23662374
```
23672375

23682376
the correct schema:
23692377

23702378
```json
2371-
"response":{
2372-
"default": {
2373-
"error":
2374-
{
2375-
"code": 404,
2376-
"message":"some details"
2377-
...
2379+
"definitions": {
2380+
"ErrorResponse": {
2381+
"properties": {
2382+
"error": {
2383+
"type": "object",
2384+
"description": "The error object.",
2385+
"properties": {
2386+
"code": {
2387+
"readOnly": true,
2388+
"type": "string",
2389+
"description": "The error code."
2390+
},
2391+
"message": {
2392+
"readOnly": true,
2393+
"type": "string",
2394+
"description": "The error message."
2395+
}
2396+
...
2397+
}
23782398
}
23792399
}
2380-
}
2400+
}
23812401

23822402
```
23832403

@@ -2758,7 +2778,7 @@ Links: [Index](#index) | [Error vs. Warning](#error-vs-warning) | [Automated Rul
27582778

27592779
**Output Message** : The response schema of operations API "{0}" does not match the ARM specification. Please standardize the schema.
27602780

2761-
**Description** : The operations API should have a response body schema consistent with the [contract spec](https://github.com/Azure/azure-resource-manager-rpc/blob/master/v1.0/proxy-api-reference.md#exposing-available-operations). The required properties such as `isDataAction`,`display.description` or `display.resource`,must be included.
2781+
**Description** : The operations API should have a response body schema consistent with the [contract spec](https://github.com/Azure/azure-resource-manager-rpc/blob/master/v1.0/proxy-api-reference.md#exposing-available-operations). The required properties such as `isDataAction`,`display.description` and `display.resource`,must be included.
27622782

27632783
**CreatedAt**: July 13, 2020
27642784

documentation/samplefiles/samplereadme.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,20 +62,20 @@ swagger-to-sdk:
6262

6363
## Go
6464

65-
See configuration in [readme.go.md](https://github.com/Azure/azure-rest-api-specs/blob/master/documentation/samplefiles/readme.go.md)
65+
See configuration in [readme.go.md](./readme.go.md)
6666

6767
## Python
6868

69-
See configuration in [readme.python.md](https://github.com/Azure/azure-rest-api-specs/blob/master/documentation/samplefiles/readme.python.md)
69+
See configuration in [readme.python.md](./readme.python.md)
7070

7171
## TypeScript
7272

73-
See configuration in [readme.typescript.md](https://github.com/Azure/azure-rest-api-specs/blob/master/documentation/samplefiles/readme.typescript.md)
73+
See configuration in [readme.typescript.md](./readme.typescript.md)
7474

7575
## CSharp
7676

77-
See configuration in [readme.csharp.md](https://github.com/Azure/azure-rest-api-specs/blob/master/documentation/samplefiles/readme.chsarp.md)
77+
See configuration in [readme.csharp.md](./readme.csharp.md)
7878

7979
## AzureResourceSchema
8080

81-
See configuration in [readme.azureresourceschema.md](https://github.com/Azure/azure-rest-api-specs/blob/master/documentation/samplefiles/readme.azureresourceschema.md)
81+
See configuration in [readme.azureresourceschema.md](./readme.azureresourceschema.md)

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -541,6 +541,12 @@
541541
"schema": {
542542
"$ref": "#/definitions/SuppressionContract"
543543
}
544+
},
545+
"404": {
546+
"description": "Suppression name is not specified or Suppression Id not found.",
547+
"schema": {
548+
"$ref": "#/definitions/ARMErrorResponseBody"
549+
}
544550
}
545551
},
546552
"deprecated": false,
@@ -1189,6 +1195,12 @@
11891195
"ttl": {
11901196
"description": "The duration for which the suppression is valid.",
11911197
"type": "string"
1198+
},
1199+
"expirationTimeStamp": {
1200+
"readOnly": true,
1201+
"format": "date-time",
1202+
"description": "Gets or sets the expiration time stamp.",
1203+
"type": "string"
11921204
}
11931205
}
11941206
},

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,16 @@
1313
"type": "Microsoft.Advisor/suppressions",
1414
"properties": {
1515
"suppressionId": "suppressionId1",
16-
"ttl": "7.00:00:00"
16+
"ttl": "7.00:00:00",
17+
"expirationTimeStamp": "2020-10-25T22:24:43.3216408Z"
1718
}
1819
}
20+
},
21+
"404": {
22+
"body": {
23+
"code": "NotFound",
24+
"message": "Suppression name is not specified or Suppression Id not found"
25+
}
1926
}
2027
}
2128
}

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
"type": "Microsoft.Advisor/suppressions",
1515
"properties": {
1616
"suppressionId": "suppressionId1",
17-
"ttl": "7.00:00:00"
17+
"ttl": "7.00:00:00",
18+
"expirationTimeStamp": "2020-10-24T22:24:43.3216408Z"
1819
}
1920
},
2021
{
@@ -23,7 +24,8 @@
2324
"type": "Microsoft.Advisor/suppressions",
2425
"properties": {
2526
"suppressionId": "suppressionId2",
26-
"ttl": "7.00:00:00"
27+
"ttl": "7.00:00:00",
28+
"expirationTimeStamp": "2020-10-25T22:24:43.3216408Z"
2729
}
2830
}
2931
]

0 commit comments

Comments
 (0)