Skip to content

Commit

Permalink
Fixed merge conflict:
Browse files Browse the repository at this point in the history
  • Loading branch information
MikhailTryakhov committed Nov 2, 2020
2 parents 28670c2 + 3b81f13 commit 5da3a59
Show file tree
Hide file tree
Showing 4,421 changed files with 541,613 additions and 34,194 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
6 changes: 3 additions & 3 deletions .azure-pipelines-preproduction/package-lock.json

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

13 changes: 0 additions & 13 deletions .azure-pipelines/BreakingChange.yml

This file was deleted.

1 change: 0 additions & 1 deletion .azure-pipelines/PrettierCheck.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
jobs:
- job: "PrettierCheck"
condition: "not(variables['PRIVATE'])"
variables:
NODE_OPTIONS: '--max-old-space-size=8192'
pool:
Expand Down
13 changes: 11 additions & 2 deletions .azure-pipelines/SDKAutomation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ jobs:

variables:
NODE_OPTIONS: '--max-old-space-size=8192'
BLOB_STORAGE_PREFIX: sdkautomation-pipeline
SPEC_REPO: $(Build.Repository.Name)
PR_NUMBER: $(System.PullRequest.PullRequestNumber)
BUILD_ID: $(Build.BuildId)
Expand All @@ -42,6 +41,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 All @@ -62,22 +63,30 @@ jobs:
displayName: Pull SDK Automation Image
- script: |
docker run \
-e BLOB_PROXY_PREFIX \
-e BLOB_STORAGE_PREFIX \
-e BLOB_STORAGE_IS_PUBLIC \
-e BLOB_DOWNLOAD_COMMAND \
-e BLOB_STORAGE_NAME \
-e BLOB_STORAGE_KEY \
-e GITHUB_COMMENT_AUTHOR_NAME \
-e GITHUBAPP_ID \
-e GITHUBAPP_PRIVATE_KEY \
-e NODE_OPTIONS \
-e BLOB_STORAGE_PREFIX \
-e SPEC_REPO \
-e PR_NUMBER \
-e SDK_REPO_NAME \
-e AZURE_DEVOPS_EXT_PAT \
-e BUILD_ID \
sdk-automation:latest npm start
condition: or(ne(variables['SDK_REPO_NAME'], 'azure-resource-manager-schemas'), endsWith(variables['SPEC_REPO'], '/azure-rest-api-specs'))
env:
BLOB_STORAGE_NAME: $(blob-storage-name)
BLOB_STORAGE_KEY: $(blob-storage-key)
BLOB_STORAGE_PREFIX: $(blob-storage-prefix)
BLOB_PROXY_PREFIX: $(blob-proxy-prefix)
BLOB_STORAGE_IS_PUBLIC: $(blob-is-public)
BLOB_DOWNLOAD_COMMAND: $(blob-download-command)
GITHUB_COMMENT_AUTHOR_NAME: $(github-comment-author-name)
GITHUBAPP_ID: $(githubapp-id)
GITHUBAPP_PRIVATE_KEY: $(githubapp-private-key)
Expand Down
1 change: 0 additions & 1 deletion .azure-pipelines/Spellcheck.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
jobs:
- job: "Spellcheck"
condition: "not(variables['PRIVATE'])"
variables:
NODE_OPTIONS: '--max-old-space-size=8192'
pool:
Expand Down
2 changes: 2 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ If any further question about AME onboarding or validation tools, please view th
- Adding a new API version
- Adding a new service

- [ ] Please ensure you've reviewed following [guidelines](https://aka.ms/rpguidelines) including [ARM resource provider contract](https://github.com/Azure/azure-resource-manager-rpc) and [REST guidelines](https://github.com/microsoft/api-guidelines/blob/vNext/azure/Guidelines.md). Estimated time (4 hours). This is required before you can request review from ARM API Review board.

- [ ] If you are blocked on ARM review and want to get the PR merged with urgency, please get the ARM oncall for reviews (*RP Manifest Approvers* team under <ins>Azure Resource Manager service</ins>) from IcM and reach out to them.

### Breaking Change Review Checklist
Expand Down
25 changes: 25 additions & 0 deletions .github/comment.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
---
- rule:
type: checkbox
keywords:
- "WaitForARMFeedback"
booleanFilterExpression: "!(ARMSignedOff||ARMChangesRequested||Approved-OkToMerge||WaitForARMRevisit)"
onCheckedLabels:
- WaitForARMFeedback
onCheckedComments: "Hi, @${PRAuthor} your PR are labelled with <b> WaitForARMFeedback</b>. A notification email will be sent out shortly afterwards to notify ARM review board([email protected]). cc @${PRAssignee} "

- rule:
type: checkbox
keywords:
- "I have reviewed the [documentation](https://aka.ms/ameonboard) for the workflow."
onCheckedComments: "Hi, @${PRAuthor} Thanks for your PR. I am workflow bot for review process. Here are some small tips. </br> <li> Please ensure to do self-check against checklists in first PR comment.</li> <li> PR assignee is the person auto-assigned and responsible for your current PR reviewing and merging. </li> <li> If there is CI failure(s), to fix CI error(s) is mandatory for PR merging; or you need to provide justification in PR comment for explanation. [How to fix?](https://github.com/Azure/azure-rest-api-specs/blob/master/documentation/ci-fix.md)</li></br> Any feedback about review process or workflow bot, pls contact swagger and tools team. [email protected]"

- rule:
type: label
label: BreakingChangeReviewRequired
onLabeledComments: "Hi @${PRAuthor}, one or multiple breaking change(s) is detected in your PR. Please check out the breaking change(s), and provide business justification in the PR comment and @ PR assignee why you must have these change(s), and how external customer impact can be mitigated. Please ensure to follow [breaking change policy](https://aka.ms/AzBreakingChangesPolicy) to request breaking change review and approval before proceeding swagger PR review. </br> If you think it is false positive breaking change, please provide the reasons in the PR comment, report to Swagger Tooling Team via https://aka.ma/swaggerfeedback. "

- rule:
type: label
label: Approved-OkToMerge
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>"
2 changes: 1 addition & 1 deletion .github/issue_assignment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
assignees:
- yungezz
- erich-wang
- NullMDR
- PhoenixHe-msft
- raych1
- lirenhe
- weidongxu-microsoft
Expand Down
62 changes: 44 additions & 18 deletions .github/pull_request_assignment.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
---
- rule:
# eventgrid data-plane PR
paths:
- "specification/eventgrid/data-plane/**"
reviewers:
- lmazuel

- rule:
# data-plane PR
paths:
Expand All @@ -8,32 +15,33 @@
- jhendrixMSFT
- lmazuel
- tjprescott


- rule:
paths:
- "specification/network/**"
reviewers:
- kairu-ms
- lirenhe
- MyronFanQiu

- rule:
paths:
- "specification/@(applicationinsights|operationalinsights)/**"
reviewers:
- MyronFanQiu
- kairu-ms

- rule:
paths: "specification/@(resources|powerplatform)/**"
reviewers:
- raych1

- rule:
paths: "specification/compute/**"
reviewers:
- ArcturusZhang
- fengzhou-msft
- yungezz

- rule:
paths: "specification/resources/**"
reviewers:
- raych1

- rule:
paths:
- "specification/machinelearningservices/**"
Expand Down Expand Up @@ -64,7 +72,7 @@
- "specification/monitor/**"
reviewers:
- weidongxu-microsoft
- MyronFanQiu
- kairu-ms

- rule:
paths:
Expand All @@ -73,11 +81,11 @@
- qianwens
- Juliehzl

- rule:
paths: "specification/mediaservices/**"
reviewers:
- allenjzhang

- rule:
paths: "specification/mediaservices/**"
reviewers:
- allenjzhang
- rule:
paths:
- "specification/@(keyvault|notificationhubs)/**"
Expand All @@ -89,7 +97,7 @@
paths:
- "specification/@(containerservice|containerinstance)/**"
reviewers:
- NullMDR
- PhoenixHe-msft
- fengzhou-msft
- yungezz

Expand All @@ -104,7 +112,7 @@
paths:
- "specification/portal/**"
reviewers:
- NullMDR
- PhoenixHe-msft

- rule:
paths:
Expand All @@ -128,7 +136,25 @@
- ".azure-pipelines-preproduction/**"
reviewers:
- akning-ms
- NullMDR
- PhoenixHe-msft

- rule:
paths:
- "documentation/**"
reviewers:
- josefree
- akning-ms

- rule:
paths:
- "**/package.json"
- ".github/**"
- "**/azure-pipelines.yml"
- ".azure-pipelines/**"
- ".azure-pipelines-preproduction/**"
reviewers:
- akning-ms
- PhoenixHe-msft
- raych1

- rule:
Expand All @@ -138,17 +164,17 @@
reviewers:
- yungezz
- erich-wang
- NullMDR
- raych1
- PhoenixHe-msft
- lirenhe
- weidongxu-microsoft
- ArcturusZhang
- xccc-msft
- raych1
- ChenTanyi
- fengzhou-msft
- njuCZ
- akning-ms
- markcowl
- 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 ([email protected]).</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
14 changes: 8 additions & 6 deletions CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
/specification/analysisservices/ @taiwu
/specification/alertsmanagement/ @ofirmanor @olalavi @erangon @orieldar @ilaizi @shakednai1 @khaboasb @orenhor
/specification/apimanagement/ @promoisha @solankisamir
/specification/applicationinsights/ @alexeldeib
/specification/applicationinsights/ @alexeldeib @ramthi @markwolff @trask @hectorhdzg @lzchen
/specification/asazure/ @athipp
/specification/authorization/ @darshanhs90 @stankovski
/specification/automation/ @vrdmr
/specification/azsadmin/ @deathly809
/specification/batch/ @matthchr @xingwu1
/specification/batchai/ @alexanderyukhanov
/specification/billing/ @wilcobmsft
/specification/billing/ @wilcobmsft @asarkar84
/specification/cdn/ @csmengwan @injyzarif @prakharsharma10
/specification/cognitiveservices/ @felixwa @yangyuan
/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
Expand Down Expand Up @@ -57,16 +58,17 @@
/specification/recoveryservicessiterecovery/ @avneeshrai
/specification/redis/ @siddharthchatrolams @timlovellsmith
/specification/relay/ @sethmanheim @v-ajnava
/specification/resources/ @Tiano2017 @rajshah11 @vivsriaus
/specification/resources/ @Azure/arm-template-deployments @rajshah11 @vivsriaus
/specification/scheduler/ @pinwang81
/specification/search/data-plane/ @brjohnstmsft @arv100kri @bleroy
/specification/search/data-plane/ @brjohnstmsft @arv100kri @bleroy @heaths @AlexGhiondea
/specification/search/resource-manager/ @abhi1509 @miwelsh @tjacobhi
/specification/serialconsole/ @amitchat @craigw @asinn826
/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
Loading

0 comments on commit 5da3a59

Please sign in to comment.