Skip to content

Commit

Permalink
git merge upstream/master
Browse files Browse the repository at this point in the history
  • Loading branch information
bganapa committed Feb 5, 2020
2 parents 4691c2a + b53a498 commit 8ef2c06
Show file tree
Hide file tree
Showing 3,508 changed files with 428,009 additions and 35,275 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
1,000 changes: 486 additions & 514 deletions .azure-pipelines-preproduction/package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .azure-pipelines-preproduction/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"description": "Tests for Azure REST API Specifications",
"license": "MIT",
"devDependencies": {
"@azure/avocado": "^0.6.0",
"@azure/avocado": "^0.6.2",
"@azure/rest-api-specs-scripts": "^0.5.7",
"@ts-common/commonmark-to-markdown": "^1.2.0",
"@ts-common/fs": "0.2.0",
Expand Down
4 changes: 3 additions & 1 deletion .azure-pipelines/ModelValidation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@ jobs:
vmImage: 'Ubuntu 16.04'
steps:
- task: Npm@1
displayName: 'npm install'
displayName: 'npm ci'
inputs:
command: custom
verbose: false
customCommand: ci
- script: 'npm run tsc && node scripts/modelValidation.js'
displayName: 'Model Validation'
55 changes: 55 additions & 0 deletions .azure-pipelines/SDKAutomation.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
trigger:
batch: false
branches:
include:
- "*"

jobs:
- job: "SDKAutomation"
displayName: SDK
pool:
vmImage: 'Ubuntu 18.04'
container:
image: azopenapi.azurecr.io/openapi/sdk-automation:prod
endpoint: azopenapi-registry
timeoutInMinutes: 180

variables:
NODE_OPTIONS: '--max-old-space-size=8192'
BLOB_STORAGE_PREFIX: sdkautomation-pipeline
SPEC_REPO: $(Build.Repository.Name)
PR_NUMBER: $(System.PullRequest.PullRequestNumber)
strategy:
matrix:
Net:
SDK_REPO_NAME: azure-sdk-for-net
Java:
SDK_REPO_NAME: azure-sdk-for-java
JavaScript:
SDK_REPO_NAME: azure-sdk-for-js
Python:
SDK_REPO_NAME: azure-sdk-for-python
Go:
SDK_REPO_NAME: azure-sdk-for-go
steps:
- checkout: none
- script: printenv
displayName: Display ENV
- script: git config --global user.email "[email protected]" && git config --global user.name "SDK Automation"
displayName: Configure Git
- script: |
curl \
-s https://api.github.com/repos/$(Build.Repository.Name)/commits/$(Build.SourceVersion)/pulls \
-H "Accept: application/vnd.github.groot-preview+json" \
| python3 -c "import sys,json; a=json.load(sys.stdin); print(f'##vso[task.setvariable variable=PR_NUMBER]{a[0][\"number\"]}' if len(a)>0 and a[0][\"base\"][\"ref\"]=='master' else '##vso[task.logissue type=error]Last commit $(Build.SourceVersion) doesnot have a related PR')"
displayName: Get PR_NUMBER
condition: in(variables['Build.Reason'], 'IndividualCI', 'Manual')
- script: sudo chown `id -ng`:`id -ng` . && npm start
env:
BLOB_STORAGE_NAME: $(blob-storage-name)
BLOB_STORAGE_KEY: $(blob-storage-key)
GITHUB_COMMENT_AUTHOR_NAME: $(github-comment-author-name)
GITHUBAPP_ID: $(githubapp-id)
GITHUBAPP_PRIVATE_KEY: $(githubapp-private-key)
displayName: SDK Automation
workingDirectory: /z
4 changes: 3 additions & 1 deletion .azure-pipelines/Semantic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@ jobs:
vmImage: 'Ubuntu 16.04'
steps:
- task: Npm@1
displayName: 'npm install'
displayName: 'npm ci'
inputs:
command: custom
verbose: false
customCommand: ci
- script: 'npm run tsc && node scripts/semanticValidation.js'
displayName: 'Semantic Validation'
2 changes: 0 additions & 2 deletions .github/reviewer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
- group:
name: default
users:
- githubID: ruowan
email: [email protected]
- githubID: raych1
email: [email protected]
- githubID: MyronFanQiu
Expand Down
29 changes: 20 additions & 9 deletions .github/sla.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,35 +3,46 @@
action: sendEmailToAssignee
repoWhitelist:
- Azure/azure-rest-api-specs
scope: pull_request
args:
booleanFilterExpression: "!(WaitForARMFeedback||(DoNotMerge&&(ARMSignedOff||Approved)))"
limit: 48h
message: '<p> Dear Swagger reviewer, <br> <br> Please response to the PR ${PR_URL}. The PR isn''t updated in 48 hours. <br> <hr /> <br> Quick info. <ul> <li>If no response from ARM review board, please send email to [email protected].</li> <li>If need immediate ARM review, please get ARM review oncall contact point from ICM https://icm.ad.msft.net/imp/v3/oncall/current under Service "Azure Resource Manager" and Team "RP Manifest Approvers"</li> <li>If no response from Azure API review board, please send email to [email protected].</li> <li>If you have problem to fix CI task errors, please send email to Visual Studio China Swagger and Tool team [email protected].</li> <li>If you want to opt out from Swagger reviewing for out of office period, please set vacation date at https://inframonitorweb1.azurewebsites.net/Home/MyView.</li> <li>Pls refer to <a href="onenote:https://microsoft.sharepoint.com/teams/IoTToolingTeam/SiteAssets/IoT Tooling Team Notebook/Azure Management Experience - transition.one#Swagger%20reviewing%20process§ion-id={ECE847C4-519B-4448-A1A0-8E84A7EFE8AB}&page-id={F6E345FE-46E1-420F-B837-6BF76167DE05}&end">Swagger review process (onenote)</a> for more about Swagger review process.</li> </ul> Best regards, <br> Azure Management Experience </p>'
subject: "Action Required: Please respond to PR ${PR_URL}"
message: '<p> Dear Swagger reviewer, <br> <br> Please response to the PR ${URL} . The PR isn''t updated in 48 hours. <br> <hr /> <br> Quick info. <ul> <li>If no response from ARM review board, please send email to [email protected].</li> <li>If need immediate ARM review, please get ARM review oncall contact point from ICM https://icm.ad.msft.net/imp/v3/oncall/current under Service "Azure Resource Manager" and Team "RP Manifest Approvers"</li> <li>If no response from Azure API review board, please send email to [email protected].</li> <li>If you have problem to fix CI task errors, please send email to Visual Studio China Swagger and Tool team [email protected].</li> <li>If you want to opt out from Swagger reviewing for out of office period, please set vacation date at https://inframonitorweb1.azurewebsites.net/Home/MyView.</li> <li>Pls refer to <a href="onenote:https://microsoft.sharepoint.com/teams/IoTToolingTeam/SiteAssets/IoT Tooling Team Notebook/Azure Management Experience - transition.one#Swagger%20reviewing%20process§ion-id={ECE847C4-519B-4448-A1A0-8E84A7EFE8AB}&page-id={F6E345FE-46E1-420F-B837-6BF76167DE05}&end">Swagger review process (onenote)</a> for more about Swagger review process.</li> </ul> Best regards, <br> Azure Management Experience </p>'
subject: "Action Required: Please respond to PR ${URL}"
description: "None initial response in 48 hours. For public repo."
name: "[PUBLIC] initial response notification"

- scheduleTask:
action: sendEmailToAssignee
repoWhitelist:
- Azure/azure-rest-api-specs-pr
scope: pull_request
args:
booleanFilterExpression: "!(WaitForARMFeedback||Approved-OkToMerge||(DoNotMerge&&(ARMSignedOff||Approved)))"
limit: 48h
message: '<p> Dear Swagger reviewer, <br> <br> Please response to the PR ${PR_URL}. The PR isn''t updated in 48 hours. <br> <hr /> <br> Quick info. <ul> <li>If no response from ARM review board, please send email to [email protected].</li> <li>If need immediate ARM review, please get ARM review oncall contact point from ICM https://icm.ad.msft.net/imp/v3/oncall/current under Service "Azure Resource Manager" and Team "RP Manifest Approvers"</li> <li>If no response from Azure API review board, please send email to [email protected].</li> <li>If you have problem to fix CI task errors, please send email to Visual Studio China Swagger and Tool team [email protected].</li> <li>If you want to opt out from Swagger reviewing for out of office period, please set vacation date at https://inframonitorweb1.azurewebsites.net/Home/MyView.</li> <li>Pls refer to <a href="onenote:https://microsoft.sharepoint.com/teams/IoTToolingTeam/SiteAssets/IoT Tooling Team Notebook/Azure Management Experience - transition.one#Swagger%20reviewing%20process§ion-id={ECE847C4-519B-4448-A1A0-8E84A7EFE8AB}&page-id={F6E345FE-46E1-420F-B837-6BF76167DE05}&end">Swagger review process (onenote)</a> for more about Swagger review process.</li> </ul> Best regards, <br> Azure Management Experience </p>'
subject: "Action Required: Please respond to PR ${PR_URL}"
message: '<p> Dear Swagger reviewer, <br> <br> Please response to the PR ${URL} . The PR isn''t updated in 48 hours. <br> <hr /> <br> Quick info. <ul> <li>If no response from ARM review board, please send email to [email protected].</li> <li>If need immediate ARM review, please get ARM review oncall contact point from ICM https://icm.ad.msft.net/imp/v3/oncall/current under Service "Azure Resource Manager" and Team "RP Manifest Approvers"</li> <li>If no response from Azure API review board, please send email to [email protected].</li> <li>If you have problem to fix CI task errors, please send email to Visual Studio China Swagger and Tool team [email protected].</li> <li>If you want to opt out from Swagger reviewing for out of office period, please set vacation date at https://inframonitorweb1.azurewebsites.net/Home/MyView.</li> <li>Pls refer to <a href="onenote:https://microsoft.sharepoint.com/teams/IoTToolingTeam/SiteAssets/IoT Tooling Team Notebook/Azure Management Experience - transition.one#Swagger%20reviewing%20process§ion-id={ECE847C4-519B-4448-A1A0-8E84A7EFE8AB}&page-id={F6E345FE-46E1-420F-B837-6BF76167DE05}&end">Swagger review process (onenote)</a> for more about Swagger review process.</li> </ul> Best regards, <br> Azure Management Experience </p>'
subject: "Action Required: Please respond to PR ${URL}"
description: "None initial response in 48 hours. For private repo."
name: "[PRIVATE] initial response notification"

- scheduleTask:
action: sendEmail
repoWhitelist:
- Azure/azure-rest-api-specs
scope: pull_request
args:
booleanFilterExpression: "(WaitForARMFeedback&&!ARMSignedOff&&!ARMChangesRequested&&!ARMReviewInProgress)"
limit: 3d
subject: "Action Required: Please help to review PR ${PR_URL}"
message: "<p> Dear ARM review board, <br> <br>Please review PR ${PR_URL}, the PR is waiting for ARM review over 3 days. Thanks.<br><hr /> <br>Quick info<ul><li>If you have feedback about the notification email, please contact us at [email protected].</li><li>After reviewing, please remove “WaitForARMFeedback” label from PR to avoid receiving notification on the same PR.</li><li>Please do not reply to this email, this is an automatic generated email.</li></ul>Best regards,<br> Azure Management Experience</p>"
to: yungez@microsoft.com
subject: "Action Required: Please help to review PR ${URL}"
message: "<p> Dear ARM review board, <br> <br>Please review PR ${URL} , the PR is waiting for ARM review over 3 days. Thanks.<br><hr /> <br>Quick info<ul><li>If you have feedback about the notification email, please contact us at [email protected].</li><li>After reviewing, please remove “WaitForARMFeedback” label from PR to avoid receiving notification on the same PR.</li><li>Please do not reply to this email, this is an automatic generated email.</li></ul>Best regards,<br> Azure Management Experience</p>"
to: armapireview@microsoft.com
description: "send email to ARM team for over 5 days PRs labelled with WaitForARMFeedback"
name: "send email to ARM team"

- scheduleTask:
action: sendEmailToAssignee
scope: issue
args:
booleanFilterExpression: "triage"
limit: 48h
message: "<p> Dear Swagger reviewer, <br> <br> Please response to the issue ${URL} . The issue isn't updated in 48 hours. <br> <hr /> <br> Quick info. <ul> <li>If you have any question, please send email to Visual Studio Swagger and Tool team [email protected].</li> </ul> Best regards, <br> Azure Management Experience </p>"
subject: "Action Required: Please respond to issue ${URL}"
cc: [email protected]
7 changes: 0 additions & 7 deletions .vscode/extensions.json

This file was deleted.

27 changes: 0 additions & 27 deletions .vscode/launch.json

This file was deleted.

27 changes: 0 additions & 27 deletions .vscode/settings.json

This file was deleted.

9 changes: 5 additions & 4 deletions CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
/specification/batchai/ @alexanderyukhanov
/specification/billing/ @wilcobmsft
/specification/cdn/ @csmengwan @injyzarif @prakharsharma10
/specification/cognitiveservices/ @davidlicig @felixwa @yangyuan
/specification/cognitiveservices/ @felixwa @yangyuan
/specification/compute/ @hyonholee @mabhard @danielli90 @smotwani @ppatwa @vikramd-ms @savyasachisamal @yunusm @ZhidongPeng @nkuchta @maheshnemichand @najams @changov
/specification/consumption/ @kjeur @panda-wang
/specification/containerinstance/ @samkreter
Expand Down Expand Up @@ -39,11 +39,11 @@
/specification/machinelearning/ @nonstatic2014
/specification/machinelearningcompute/ @shutchings
/specification/managementpartner/ @jeffrey-ace
/specification/mediaservices/ @brianblum
/specification/mediaservices/ @giakas
/specification/mobileengagement/ @pshrosbree
/specification/monitor/ @gucalder
/specification/mysql/ @qingqingyuan
/specification/network/ @MikhailTryakhov @number213
/specification/network/ @MikhailTryakhov @number213 @solhaile @v-shhatt
/specification/notificationhubs/ @amolr @smithab
/specification/operationalinsights/ @sw47
/specification/operationsmanagement/ @dashimi16
Expand All @@ -58,7 +58,8 @@
/specification/relay/ @sethmanheim @v-ajnava
/specification/resources/ @Tiano2017 @rajshah11 @vivsriaus
/specification/scheduler/ @pinwang81
/specification/search/ @brjohnstmsft
/specification/search/data-plane/ @brjohnstmsft @arv100kri @bleroy
/specification/search/resource-manager/ @abhi1509 @miwelsh @tjacobhi
/specification/serialconsole/ @amitchat @craigw @asinn826
/specification/service-map/ @daveirwin1
/specification/servicebus/ @sazeesha @v-ajnava
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ The structure should appear like so:
Currently, the specifications are expected to be in Swagger JSON format

## Next steps
The next step in the process after a spec is completed is to generate SDKs and API reference documentation. Go to the [Azure Developer Experience guide](https://github.com/Azure/adx-documentation-pr) for more information.
The next step in the process after a spec is completed is to generate SDKs and API reference documentation. If you're Microsoft employee, go to the [Azure Developer Experience guide](https://github.com/Azure/adx-documentation-pr) for more information.

---
_This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [[email protected]](mailto:[email protected]) with any additional questions or comments._
7 changes: 5 additions & 2 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
name: "Azure OpenAPI"

trigger: none
trigger:
branches:
include:
- master

variables:
TRAVIS: 'true'
Expand All @@ -19,6 +22,6 @@ jobs:
- template: .azure-pipelines/ModelValidation.yml
- template: .azure-pipelines/BreakingChange.yml
- template: .azure-pipelines/LintDiff.yml
- template: .azure-pipelines/SwaggerToSDK.yml
- template: .azure-pipelines/NetworkValidation.yml
- template: .azure-pipelines/Spellcheck.yml
- template: .azure-pipelines/PrettierCheck.yml
Loading

0 comments on commit 8ef2c06

Please sign in to comment.