Skip to content

Commit

Permalink
Merge branch 'master' of parent into master
Browse files Browse the repository at this point in the history
  • Loading branch information
abhinav-ghai committed Sep 4, 2020
2 parents ff9a179 + 25acd0f commit 2df45f7
Show file tree
Hide file tree
Showing 1,339 changed files with 135,290 additions and 9,342 deletions.
13 changes: 0 additions & 13 deletions .azure-pipelines/BreakingChange.yml

This file was deleted.

2 changes: 2 additions & 0 deletions .azure-pipelines/SDKAutomation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ jobs:
SDK_REPO_NAME: azure-sdk-for-go
Trenton:
SDK_REPO_NAME: azure-sdk-for-trenton
Schema:
SDK_REPO_NAME: azure-resource-manager-schemas
steps:
- checkout: none
- script: |
Expand Down
1 change: 1 addition & 0 deletions .github/issue_assignment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@
- qianwens
- ruowan
- MyronFanQiu
- jianyexi
2 changes: 1 addition & 1 deletion .github/pull_request_assignment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
paths:
- "specification/network/**"
reviewers:
- lirenhe
- MyronFanQiu

- rule:
Expand Down Expand Up @@ -152,3 +151,4 @@
- leni-msft
- qianwens
- ruowan
- jianyexi
2 changes: 1 addition & 1 deletion .github/sla.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
- time
args:
limit: 72h
booleanFilterExpression: (Reviewed-ChangesRequired||ARMChangeRequest)
booleanFilterExpression: (Reviewed-ChangesRequired||ARMChangesRequested)
message: '<p>Dear PR author,</p><p>The PR Reviewer has commented on your PR ${URL} , putting on the label "Reviewed-ChangesRequired" or "ARMChangeRequest". Please check out the comment by clicking the PR link attached previously, and update your commits accordingly.</p><p>Please ensure to remove "Reviewed-ChangesRequired" or "ARMChangeRequest" label, after you complete updates and comment back. If you need ARM board or swagger reviewer revisit your PR, please label the PR with "WaitForARMRevisit" and "WaitForReviewRevisit" respectively.</p><p>Quick info.</p><ul><li>How to fix CI error:&nbsp;<a href="https://aka.ms/ci-fix">https://aka.ms/ci-fix</a></li></ul><p><em>DO NOT REPLY: This is an automated email. If you have any questions, please send an email to the Swagger and Tools Team (vscswagger@microsoft.com).</em></p><p>Best regards,</p><p>Swagger and Tools Team, Azure Management Experience</p>'
subject: "Action Required: Please update your PR ${URL}"
to: ${AUTHOR}
Expand Down
7 changes: 4 additions & 3 deletions CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
/specification/billing/ @wilcobmsft
/specification/cdn/ @csmengwan @injyzarif @prakharsharma10
/specification/cognitiveservices/ @felixwa @yangyuan
/specification/compute/ @hyonholee @mabhard @danielli90 @smotwani @ppatwa @vikramd-ms @savyasachisamal @yunusm @ZhidongPeng @nkuchta @maheshnemichand @najams @changov
/specification/compute/ @bilaakpan-ms @sandido @dkulkarni-ms @haagha @madewithsmiles @MS-syh2qs @grizzlytheodore @hyonholee @mabhard @danielli90 @smotwani @ppatwa @vikramd-ms @savyasachisamal @yunusm @ZhidongPeng @nkuchta @maheshnemichand @najams @changov
/specification/consumption/ @kjeur @panda-wang
/specification/containerinstance/ @novinc
/specification/containerregistry/ @djyou
Expand Down Expand Up @@ -65,8 +65,9 @@
/specification/service-map/ @daveirwin1
/specification/servicebus/ @sazeesha @v-ajnava
/specification/servicefabric/ @juhacket @samedder
/specification/sql/ @jaredmoo @jamestao
/specification/storage/ @blueww @jasonyang-msft @xiaonlimsft @kasobol-msft
/specification/sql/ @jamestao @bcham
/specification/storage/ @blueww @jasonyang-msft @xiaonlimsft
/specification/storage/data-plane/ @kasobol-msft @seanmcc-msft
/specification/storageimportexport/ @leoz-ms
/specification/storagesync/ @ankushbindlish2
/specification/storsimple8000series/ @manaas-microsoft
Expand Down
1 change: 0 additions & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ jobs:
- template: .azure-pipelines/Semantic.yml
- template: .azure-pipelines/Avocado.yml
- template: .azure-pipelines/ModelValidation.yml
- template: .azure-pipelines/BreakingChange.yml
- template: .azure-pipelines/LintDiff.yml
- template: .azure-pipelines/NetworkValidation.yml
- template: .azure-pipelines/Spellcheck.yml
Expand Down
74 changes: 73 additions & 1 deletion cSpell.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,78 @@
"Ochestrator"
]
},
{
"filename": "**/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-02-01/managedClusters.json",
"words": [
"azpodpolicy"
]
},
{
"filename": "**/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-04-01/managedClusters.json",
"words": [
"azpodpolicy"
]
},
{
"filename": "**/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-06-01/managedClusters.json",
"words": [
"azpodpolicy"
]
},
{
"filename": "**/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-08-01/managedClusters.json",
"words": [
"azpodpolicy"
]
},
{
"filename": "**/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-10-01/managedClusters.json",
"words": [
"azpodpolicy"
]
},
{
"filename": "**/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-11-01/managedClusters.json",
"words": [
"azpodpolicy"
]
},
{
"filename": "**/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-01-01/managedClusters.json",
"words": [
"azpodpolicy"
]
},
{
"filename": "**/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-02-01/managedClusters.json",
"words": [
"azpodpolicy"
]
},
{
"filename": "**/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-03-01/managedClusters.json",
"words": [
"azpodpolicy"
]
},
{
"filename": "**/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-04-01/managedClusters.json",
"words": [
"azpodpolicy"
]
},
{
"filename": "**/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-06-01/managedClusters.json",
"words": [
"azpodpolicy"
]
},
{
"filename": "**/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-07-01/managedClusters.json",
"words": [
"azpodpolicy"
]
},
{
"filename": "**/specification/containerregistry/data-plane/Microsoft.ContainerRegistry/preview/2018-08-10/containerregistry.json",
"words": [
Expand Down Expand Up @@ -637,4 +709,4 @@
]
}
]
}
}
8 changes: 8 additions & 0 deletions custom-words.txt
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,7 @@ certificatesdelete
Certificatethumbprint
certverify
chainer
changepoint
changestate
CHECKACCESS
checkmark
Expand Down Expand Up @@ -988,6 +989,7 @@ mysite
mysquare
mystore
myvolume
myworkbooks
n'eventtype
n'recognition
nagios
Expand Down Expand Up @@ -1091,6 +1093,7 @@ overprovision
overprovisioned
overprovisioning
overridable
overriden
OWASP
oxxm
pageable
Expand Down Expand Up @@ -1871,3 +1874,8 @@ watchlists
Watchlists
watchlist
Watchlist
Stix
STIX
Mibps
ntfs
shamir_share
61 changes: 60 additions & 1 deletion documentation/openapi-authoring-automated-guidelines.md
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,16 @@ We request OpenAPI(Swagger) spec authoring be assigned to engineers who have an
| [R2007](#r2007) | [LongRunningOperationsWithLongRunningExtension](#r2007) | ARM OpenAPI(swagger) specs |
| [R2029](#r2029) | [PageableOperation](#r2029) | ARM and Data plane OpenAPI(swagger) specs |
| [R4006](#r4006) | [DeprecatedXmsCodeGenerationSetting](#r4006) | ARM and Data plane OpenAPI(swagger) specs |



### RPaaS Violations

#### RPaaS Errors

| Id | Rule Name | Applies to |
| --- | --- | --- |
| [R4023](#r4023) | [RPaasPutLongRunningOperation201Only](#r4023) | ARM OpenAPI(swagger) specs |

### Documentation

#### Documentation Errors
Expand Down Expand Up @@ -2889,4 +2898,54 @@ The following response is a good example:
   },
...
```
Links: [Index](#index) | [Error vs. Warning](#error-vs-warning) | [Automated Rules](#automated-rules) | [ARM](#arm-violations): [Errors](#arm-errors) or [Warnings](#arm-warnings) | [SDK](#sdk-violations): [Errors](#sdk-errors) or [Warnings](#sdk-warnings)

### <a name="r4023" ></a>R4023 RPaasPutLongRunningOperation201Only

**Category** : RPaaS Error

**Applies to** : ARM OpenAPI(swagger) specs

**Output Message** : [RPaaS] Only 201 is the supported response code for PUT async response

**Description** : An async PUT operation response include status code 201 with Azure-async-operation header. Must also support status code 200, for simple updates that can be completed synchronously (ex: tags). Operation must also add "x-ms-long-running-operation and x-ms-long-running-operation-options" to describe how the long running operation is tracked.

**CreatedAt**: August 10, 2020

**LastModifiedAt**: August 10, 2020

**Why this rule is important**: RPaaS only supports 201 for async operations. This is enforced at runtime via swagger validation.

**How to fix the violation**: Add the following for async PUT operations.

The following would be valid:

```json
...
"responses": {
"201": {
"description": "Created",
"schema": {
"$ref": "#/definitions/MySimpleObject"
}
},
"200": {
"description": "Succeeded",
"schema": {
"$ref": "#/definitions/MySimpleObject"
}
},
"default": {
"description": "Error response describing why the operation failed.",
"schema": {
"$ref": "#/definitions/ErrorResponse"
}
}
},
"x-ms-long-running-operation": true,
"x-ms-long-running-operation-options": {
"final-state-via": "azure-async-operation"
}
...
```
Links: [Index](#index) | [Error vs. Warning](#error-vs-warning) | [Automated Rules](#automated-rules) | [ARM](#arm-violations): [Errors](#arm-errors) or [Warnings](#arm-warnings) | [SDK](#sdk-violations): [Errors](#sdk-errors) or [Warnings](#sdk-warnings)
4 changes: 4 additions & 0 deletions documentation/samplefiles/readme.go.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,11 @@ These settings apply only when `--tag=package-2019-12-01 --go` is specified on t
Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.

```yaml $(tag) == 'package-2019-12-01' && $(go)
# NOTE: a stable tag must not contain any preview swagger files included
# NOTE: go namespace can only consist of lower case letters, numbers and underscores
namespace: yourservicename
# NOTE: for special cases, you can hard code the namespace in the output-folder
# NOTE: the output-folder of a stable tag must not be under the preview subdirectory
output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2019-12-01/$(namespace)
```
Expand All @@ -35,8 +37,10 @@ These settings apply only when `--tag=package-2020-07-01-preview --go` is specif
Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.

```yaml $(tag) == 'package-2020-07-01-preview' && $(go)
# NOTE: a preview tag must not contain at least one preview swagger file included
# NOTE: go namespace can only consist of lower case letters, numbers and underscores
namespace: yourservicename
# NOTE: a preview api-version must be under the preview sub-directory
# NOTE: the output-folder of a preview tag must be under the preview subdirectory
output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2020-07-01-preview/$(namespace)
```
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion preproduction-azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ variables:
PREPRODUCTION_PIPELINE: "true"

jobs:
- template: .azure-pipelines/BreakingChange.yml
- template: .azure-pipelines/ModelValidation.yml
- template: .azure-pipelines/LintDiff.yml
- template: .azure-pipelines/Avocado.yml
13 changes: 0 additions & 13 deletions scripts/breaking-change.ts

This file was deleted.

Loading

0 comments on commit 2df45f7

Please sign in to comment.