Skip to content

Commit 0509037

Browse files
committed
Merge branch 'master' into devices_new_api
# Conflicts: # specification/security/resource-manager/Microsoft.Security/preview/2020-08-06-preview/devices.json # specification/security/resource-manager/Microsoft.Security/preview/2020-08-06-preview/examples/Devices/GetDevice.json # specification/security/resource-manager/Microsoft.Security/preview/2020-08-06-preview/examples/Devices/GetDevicesListForHub.json # specification/security/resource-manager/Microsoft.Security/preview/2020-08-06-preview/examples/Devices/GetDevicesListForSubscription.json
2 parents c901757 + f4a7252 commit 0509037

File tree

1,932 files changed

+217274
-4485
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,932 files changed

+217274
-4485
lines changed

.azure-pipelines/PrettierCheck.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
jobs:
22
- job: "PrettierCheck"
3-
condition: "not(variables['PRIVATE'])"
43
variables:
54
NODE_OPTIONS: '--max-old-space-size=8192'
65
pool:

.azure-pipelines/Spellcheck.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
jobs:
22
- job: "Spellcheck"
3-
condition: "not(variables['PRIVATE'])"
43
variables:
54
NODE_OPTIONS: '--max-old-space-size=8192'
65
pool:

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ If any further question about AME onboarding or validation tools, please view th
1414
- Adding a new API version
1515
- Adding a new service
1616

17+
- [ ] 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.
18+
1719
- [ ] 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.
1820

1921
### Breaking Change Review Checklist
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
---
2+
- rule:
3+
type: checkbox
4+
keywords:
5+
- "WaitForARMFeedback"
6+
booleanFilterExpression: "!(ARMSignedOff||ARMChangesRequested||Approved-OkToMerge||WaitForARMRevisit)"
7+
onCheckedLabels:
8+
- WaitForARMFeedback
9+
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} "
10+
11+
- rule:
12+
type: checkbox
13+
keywords:
14+
- "I have reviewed the [documentation](https://aka.ms/ameonboard) for the workflow."
15+
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]"
16+
17+
- rule:
18+
type: label
19+
label: BreakingChangeReviewRequired
20+
onLabeledComments: "Hi @${PRAuthor}, one or multiple breaking change(s) is detected in your PR. Pls follow [breaking change policy](https://aka.ms/AzBreakingChangesPolicy) to request breaking change review and approval before proceeding swagger PR review. "
21+
22+
- rule:
23+
type: label
24+
label: ApprovedOkToMerge
25+
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>"

.github/issue_assignment.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
assignees:
55
- yungezz
66
- erich-wang
7-
- NullMDR
7+
- PhoenixHe-msft
88
- raych1
99
- lirenhe
1010
- weidongxu-microsoft
@@ -19,4 +19,3 @@
1919
- qianwens
2020
- ruowan
2121
- MyronFanQiu
22-
- jianyexi

.github/pull_request_assignment.yml

Lines changed: 43 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
11
---
2+
- rule:
3+
# eventgrid data-plane PR
4+
paths:
5+
- "specification/eventgrid/data-plane/**"
6+
reviewers:
7+
- lmazuel
8+
29
- rule:
310
# data-plane PR
411
paths:
@@ -8,32 +15,33 @@
815
- jhendrixMSFT
916
- lmazuel
1017
- tjprescott
18+
1119

1220
- rule:
1321
paths:
1422
- "specification/network/**"
1523
reviewers:
16-
- MyronFanQiu
24+
- kairu-ms
1725
- lirenhe
1826

1927
- rule:
2028
paths:
2129
- "specification/@(applicationinsights|operationalinsights)/**"
2230
reviewers:
23-
- MyronFanQiu
31+
- kairu-ms
2432

33+
- rule:
34+
paths: "specification/@(resources|powerplatform)/**"
35+
reviewers:
36+
- raych1
37+
2538
- rule:
2639
paths: "specification/compute/**"
2740
reviewers:
2841
- ArcturusZhang
2942
- fengzhou-msft
3043
- yungezz
3144

32-
- rule:
33-
paths: "specification/@(resources|powerplatform)/**"
34-
reviewers:
35-
- raych1
36-
3745
- rule:
3846
paths:
3947
- "specification/machinelearningservices/**"
@@ -64,7 +72,7 @@
6472
- "specification/monitor/**"
6573
reviewers:
6674
- weidongxu-microsoft
67-
- MyronFanQiu
75+
- kairu-ms
6876

6977
- rule:
7078
paths:
@@ -73,11 +81,11 @@
7381
- qianwens
7482
- Juliehzl
7583

76-
- rule:
77-
paths: "specification/mediaservices/**"
78-
reviewers:
79-
- allenjzhang
8084

85+
- rule:
86+
paths: "specification/mediaservices/**"
87+
reviewers:
88+
- allenjzhang
8189
- rule:
8290
paths:
8391
- "specification/@(keyvault|notificationhubs)/**"
@@ -89,7 +97,7 @@
8997
paths:
9098
- "specification/@(containerservice|containerinstance)/**"
9199
reviewers:
92-
- NullMDR
100+
- PhoenixHe-msft
93101
- fengzhou-msft
94102
- yungezz
95103

@@ -104,7 +112,7 @@
104112
paths:
105113
- "specification/portal/**"
106114
reviewers:
107-
- NullMDR
115+
- PhoenixHe-msft
108116

109117
- rule:
110118
paths:
@@ -128,7 +136,25 @@
128136
- ".azure-pipelines-preproduction/**"
129137
reviewers:
130138
- akning-ms
131-
- NullMDR
139+
- PhoenixHe-msft
140+
141+
- rule:
142+
paths:
143+
- "documentation/**"
144+
reviewers:
145+
- josefree
146+
- akning-ms
147+
148+
- rule:
149+
paths:
150+
- "**/package.json"
151+
- ".github/**"
152+
- "**/azure-pipelines.yml"
153+
- ".azure-pipelines/**"
154+
- ".azure-pipelines-preproduction/**"
155+
reviewers:
156+
- akning-ms
157+
- PhoenixHe-msft
132158
- raych1
133159

134160
- rule:
@@ -138,17 +164,16 @@
138164
reviewers:
139165
- yungezz
140166
- erich-wang
141-
- NullMDR
142-
- raych1
167+
- PhoenixHe-msft
143168
- lirenhe
144169
- weidongxu-microsoft
145170
- ArcturusZhang
146171
- xccc-msft
172+
- raych1
147173
- ChenTanyi
148174
- fengzhou-msft
149175
- njuCZ
150176
- akning-ms
151-
- markcowl
152177
- leni-msft
153178
- qianwens
154179
- ruowan

CODEOWNERS

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
/specification/analysisservices/ @taiwu
22
/specification/alertsmanagement/ @ofirmanor @olalavi @erangon @orieldar @ilaizi @shakednai1 @khaboasb @orenhor
33
/specification/apimanagement/ @promoisha @solankisamir
4-
/specification/applicationinsights/ @alexeldeib
4+
/specification/applicationinsights/ @alexeldeib @reyang @TimothyMothra @ramthi @rajkumar-rangaraj @markwolff @trask @hectorhdzg @lzchen
55
/specification/asazure/ @athipp
66
/specification/authorization/ @darshanhs90 @stankovski
77
/specification/automation/ @vrdmr
88
/specification/azsadmin/ @deathly809
99
/specification/batch/ @matthchr @xingwu1
1010
/specification/batchai/ @alexanderyukhanov
11-
/specification/billing/ @wilcobmsft
11+
/specification/billing/ @wilcobmsft @asarkar84
1212
/specification/cdn/ @csmengwan @injyzarif @prakharsharma10
1313
/specification/cognitiveservices/ @felixwa @yangyuan
1414
/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
@@ -58,9 +58,9 @@
5858
/specification/recoveryservicessiterecovery/ @avneeshrai
5959
/specification/redis/ @siddharthchatrolams @timlovellsmith
6060
/specification/relay/ @sethmanheim @v-ajnava
61-
/specification/resources/ @Tiano2017 @rajshah11 @vivsriaus
61+
/specification/resources/ @Azure/arm-template-deployments @rajshah11 @vivsriaus
6262
/specification/scheduler/ @pinwang81
63-
/specification/search/data-plane/ @brjohnstmsft @arv100kri @bleroy
63+
/specification/search/data-plane/ @brjohnstmsft @arv100kri @bleroy @heaths @AlexGhiondea
6464
/specification/search/resource-manager/ @abhi1509 @miwelsh @tjacobhi
6565
/specification/serialconsole/ @amitchat @craigw @asinn826
6666
/specification/service-map/ @daveirwin1

azure-rest-api-specs

Lines changed: 0 additions & 1 deletion
This file was deleted.

cSpell.json

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
"version": "0.1",
33
"language": "en",
44
"words": [
5-
"Creds"
5+
"Creds",
6+
"partiallycompleted",
7+
"umls"
68
],
79
"dictionaryDefinitions": [
810
{
@@ -728,13 +730,24 @@
728730
"Fcontoso",
729731
"Fpushpins"
730732
]
731-
}
732-
,
733+
},
733734
{
734735
"filename": "**/specification/communication/data-plane/Microsoft.CommunicationServicesChat/preview/2020-09-21-preview2/communicationserviceschat.json",
735736
"words": [
736737
"readreceipts"
737738
]
739+
},
740+
{
741+
"filename": "**/specification/communication/data-plane/Microsoft.CommunicationServicesAdministration/preview/2020-07-20-preview1/communicationservicesadministration.json",
742+
"words": [
743+
"areacodes",
744+
"locationoptions",
745+
"phonenumbers",
746+
"phoneplangroups",
747+
"phoneplans",
748+
"pstn",
749+
"unconfiguring"
750+
]
738751
}
739752
]
740-
}
753+
}

custom-words.txt

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,7 @@ Certificatethumbprint
282282
certverify
283283
Chademo
284284
chainer
285+
changedSince
285286
changepoint
286287
changestate
287288
CHECKACCESS
@@ -317,6 +318,7 @@ clustermonitoring
317318
clustername
318319
Cmdkey
319320
cmdlet
321+
CMAF
320322
CMMI
321323
CNAME
322324
cntk
@@ -404,6 +406,7 @@ Datacenter
404406
datacenters
405407
datacontenttype
406408
datadisk
409+
Datadog
407410
datafactory
408411
datafactoryv
409412
dataflows
@@ -451,6 +454,7 @@ deleteconsumergroup
451454
deletedcertificates
452455
deletedkeys
453456
deletedsecrets
457+
deletedservices
454458
deletedstorage
455459
deletefailed
456460
deleteissuers
@@ -479,6 +483,7 @@ devtestlabs
479483
dewpoint
480484
dhcp
481485
diagnosticcontext
486+
diarization
482487
digitaltwins
483488
DIMM
484489
disableautoscale
@@ -672,6 +677,7 @@ Gloo
672677
gluster
673678
glusterfs
674679
GOARCH
680+
GPUP
675681
GPUs
676682
Grammarly
677683
GRANTACE
@@ -870,6 +876,7 @@ libtrust
870876
lifecycle
871877
lifetimejobstats
872878
lifetimepoolstats
879+
Liftr
873880
Linestring
874881
linkedservices
875882
linkexpiryinminutes
@@ -1160,6 +1167,7 @@ Paypal
11601167
PBIE
11611168
PCIE
11621169
PCNET
1170+
PDFs
11631171
peerings
11641172
Pendingissuance
11651173
Pendingrevocation
@@ -1205,6 +1213,7 @@ powerbidedicated
12051213
powerbiembedded
12061214
poweredoff
12071215
poweroff
1216+
pptx
12081217
prebackup
12091218
prebackupvalidation
12101219
prebuilts
@@ -1632,6 +1641,7 @@ tablevaluedfunctions
16321641
tagname
16331642
tagsandregions
16341643
tagvalue
1644+
TARGETDURATION
16351645
taskcompletion
16361646
taskcounts
16371647
taskfailure
@@ -1676,7 +1686,9 @@ topqueries
16761686
topquery
16771687
TPEG
16781688
traceback
1689+
traceparent
16791690
traceroute
1691+
tracestate
16801692
trafficmanager
16811693
trafficmanageranalytics
16821694
trafficmanagerprofiles
@@ -1740,6 +1752,7 @@ unparsed
17401752
unprepare
17411753
unprepares
17421754
unpreparing
1755+
Unprocessable
17431756
Unprovision
17441757
unprovisioned
17451758
Unprovisioning
@@ -1965,3 +1978,12 @@ Setget
19651978
Ruleproperties
19661979
shamir_share
19671980
dllpath
1981+
MSIX
1982+
msix
1983+
MSIXpackages
1984+
msixpackages
1985+
appxmanifest
1986+
Appxmanifest
1987+
msixpackage
1988+
xml
1989+
Creds

0 commit comments

Comments
 (0)