Skip to content

Commit 4996fbd

Browse files
committed
Merge branch 'master_upstream' into narinem-dataplane-swagger
2 parents 340ecb0 + 621d0b3 commit 4996fbd

File tree

2,938 files changed

+344970
-10855
lines changed

Some content is hidden

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

2,938 files changed

+344970
-10855
lines changed

.azure-pipelines-preproduction/package-lock.json

+311-201
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.azure-pipelines-preproduction/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"license": "MIT",
1212
"devDependencies": {
1313
"@azure/avocado": "^0.6.2",
14-
"@azure/rest-api-specs-scripts": "^0.5.7",
14+
"@azure/rest-api-specs-scripts": "^0.6.8",
1515
"@ts-common/commonmark-to-markdown": "^1.2.0",
1616
"@ts-common/fs": "0.2.0",
1717
"@ts-common/iterator": "^0.3.6",

.azure-pipelines/Avocado.yml

+1
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ jobs:
99
verbose: false
1010
- script: './node_modules/.bin/avocado'
1111
displayName: 'Avocado'
12+
condition: ne(variables['Build.SourceBranch'], 'refs/heads/master')

.azure-pipelines/SDKAutomation.yml

+28-9
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,15 @@ trigger:
77
pr:
88
autoCancel: false
99

10+
variables:
11+
IMAGE: azopenapi.azurecr.io/openapi/sdk-automation:prod
12+
REGISTRY_ENDPOINT: azopenapi-registry
13+
1014
jobs:
1115
- job: "SDKAutomation"
1216
displayName: SDK
1317
pool:
1418
vmImage: 'Ubuntu 18.04'
15-
container:
16-
image: azopenapi.azurecr.io/openapi/sdk-automation:prod
17-
endpoint: azopenapi-registry
1819
timeoutInMinutes: 180
1920

2021
variables:
@@ -32,27 +33,45 @@ jobs:
3233
SDK_REPO_NAME: azure-sdk-for-js
3334
Python:
3435
SDK_REPO_NAME: azure-sdk-for-python
36+
Cliextension:
37+
SDK_REPO_NAME: azure-cli-extensions
3538
Go:
3639
SDK_REPO_NAME: azure-sdk-for-go
3740
steps:
3841
- checkout: none
39-
- script: printenv
40-
displayName: Display ENV
41-
- script: git config --global user.email "sdkautomation@microsoft.com" && git config --global user.name "SDK Automation"
42-
displayName: Configure Git
4342
- script: |
4443
curl \
4544
-s https://api.github.com/repos/$(Build.Repository.Name)/commits/$(Build.SourceVersion)/pulls \
4645
-H "Accept: application/vnd.github.groot-preview+json" \
4746
| 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')"
4847
displayName: Get PR_NUMBER
4948
condition: in(variables['Build.Reason'], 'IndividualCI', 'Manual')
50-
- script: sudo chown `id -ng`:`id -ng` . && npm start
49+
- task: Docker@2
50+
displayName: Login into ACR
51+
inputs:
52+
command: login
53+
containerRegistry: $(REGISTRY_ENDPOINT)
54+
- script: |
55+
docker pull $IMAGE
56+
docker tag $IMAGE sdk-automation:latest
57+
displayName: Pull SDK Automation Image
58+
- script: |
59+
docker run \
60+
-e BLOB_STORAGE_NAME \
61+
-e BLOB_STORAGE_KEY \
62+
-e GITHUB_COMMENT_AUTHOR_NAME \
63+
-e GITHUBAPP_ID \
64+
-e GITHUBAPP_PRIVATE_KEY \
65+
-e NODE_OPTIONS \
66+
-e BLOB_STORAGE_PREFIX \
67+
-e SPEC_REPO \
68+
-e PR_NUMBER \
69+
-e SDK_REPO_NAME \
70+
sdk-automation:latest npm start
5171
env:
5272
BLOB_STORAGE_NAME: $(blob-storage-name)
5373
BLOB_STORAGE_KEY: $(blob-storage-key)
5474
GITHUB_COMMENT_AUTHOR_NAME: $(github-comment-author-name)
5575
GITHUBAPP_ID: $(githubapp-id)
5676
GITHUBAPP_PRIVATE_KEY: $(githubapp-private-key)
5777
displayName: SDK Automation
58-
workingDirectory: /z

.azure-pipelines/SwaggerToSDK.yml

+3
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ jobs:
1212
python:
1313
AZURE_SDK_REPO: azure-sdk-for-python
1414
AZURE_SDK_PARAMS: ''
15+
cliextension:
16+
AZURE_SDK_REPO: azure-cli-extensions
17+
AZURE_SDK_PARAMS: ''
1518
go:
1619
AZURE_SDK_REPO: azure-sdk-for-go
1720
AZURE_SDK_PARAMS: '-o latest'

.github/assignment.yml

+139
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,139 @@
1+
---
2+
- rule:
3+
# data-plane PR
4+
paths:
5+
- "specification/**/data-plane/**"
6+
reviewers:
7+
- anuchandy
8+
- jhendrixMSFT
9+
- lmazuel
10+
- tjprescott
11+
12+
- rule:
13+
paths:
14+
- "specification/network/**"
15+
reviewers:
16+
- lirenhe
17+
- zikalino
18+
- MyronFanQiu
19+
20+
- rule:
21+
paths:
22+
- "specification/@(applicationinsights|operationalinsights)/**"
23+
reviewers:
24+
- MyronFanQiu
25+
26+
- rule:
27+
paths: "specification/compute/**"
28+
reviewers:
29+
- ArcturusZhang
30+
- fengzhou-msft
31+
- yungezz
32+
33+
- rule:
34+
paths:
35+
- "specification/machinelearningservices/**"
36+
reviewers:
37+
- ArcturusZhang
38+
39+
- rule:
40+
paths:
41+
- "specification/authorization/**"
42+
reviewers:
43+
- qianwens
44+
- yungezz
45+
46+
- rule:
47+
paths:
48+
- "specification/datafactory/**"
49+
reviewers:
50+
- qianwens
51+
52+
- rule:
53+
paths:
54+
- "specification/monitor/**"
55+
reviewers:
56+
- weidongxu-microsoft
57+
- MyronFanQiu
58+
59+
- rule:
60+
paths:
61+
- "specification/storage/**"
62+
reviewers:
63+
- qianwens
64+
- Juliehzl
65+
66+
- rule:
67+
paths: "specification/mediaservices/**"
68+
reviewers:
69+
- allenjzhang
70+
71+
- rule:
72+
paths:
73+
- "specification/@(keyvault|notificationhubs)/**"
74+
- "specification/@(databricks|containerregistry)/**"
75+
reviewers:
76+
- fengzhou-msft
77+
78+
- rule:
79+
paths:
80+
- "specification/@(containerservice|containerinstance)/**"
81+
reviewers:
82+
- NullMDR
83+
- fengzhou-msft
84+
- yungezz
85+
86+
- rule:
87+
paths:
88+
- "specification/portal/**"
89+
reviewers:
90+
- NullMDR
91+
92+
- rule:
93+
paths:
94+
- "specification/web/**"
95+
reviewers:
96+
- weidongxu-microsoft
97+
98+
- rule:
99+
paths:
100+
- "documentation/**"
101+
reviewers:
102+
- josefree
103+
- akning-ms
104+
105+
- rule:
106+
paths:
107+
- "**/package.json"
108+
- ".github/**"
109+
- "**/azure-pipelines.yml"
110+
- ".azure-pipelines/**"
111+
- ".azure-pipelines-preproduction/**"
112+
reviewers:
113+
- akning-ms
114+
- ruowan
115+
- NullMDR
116+
117+
- rule:
118+
# manager-plane PR
119+
paths:
120+
- "**"
121+
reviewers:
122+
- yungezz
123+
- zikalino
124+
- yaohaizh
125+
- erich-wang
126+
- NullMDR
127+
- raych1
128+
- lirenhe
129+
- weidongxu-microsoft
130+
- ArcturusZhang
131+
- xccc-msft
132+
- ChenTanyi
133+
- fengzhou-msft
134+
- njuCZ
135+
- akning-ms
136+
- markcowl
137+
- leni-msft
138+
- qianwens
139+
- allenjzhang

CODEOWNERS

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
/specification/insights/ @gucalder
3535
/specification/intune/ @vrmurthy01
3636
/specification/iothub/ @rkmanda
37-
/specification/keyvault/ @schaabs
37+
/specification/keyvault/ @schaabs @heaths
3838
/specification/logic/ @pankajsn @tonytang-microsoft-com
3939
/specification/machinelearning/ @nonstatic2014
4040
/specification/machinelearningcompute/ @shutchings

cSpell.json

+12
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,18 @@
220220
"Regenerte"
221221
]
222222
},
223+
{
224+
"filename": "**/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.1/storage.json",
225+
"words": [
226+
"Regenerte"
227+
]
228+
},
229+
{
230+
"filename": "**/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.2/storage.json",
231+
"words": [
232+
"Regenerte"
233+
]
234+
},
223235
{
224236
"filename": "**/specification/adhybridhealthservice/resource-manager/Microsoft.ADHybridHealthService/stable/2014-01-01/ADHybridHealthService.json",
225237
"words": [

custom-words.txt

+21
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ adminmanagement
3232
ADTO
3333
adultscore
3434
affinitized
35+
agentpool
3536
aggregatedcost
3637
AHUB
3738
AIAPI
@@ -115,6 +116,8 @@ australiasoutheast
115116
authenticatable
116117
Authenticode
117118
authorizationrules
119+
authprovider
120+
authproviders
118121
authsettings
119122
authsid
120123
autobackup
@@ -175,8 +178,10 @@ bacpac
175178
badpassword
176179
Baidu
177180
bangla
181+
Bahasa
178182
baremetal
179183
BATCHAI
184+
batchmanaged
180185
BAYESIANOPTIMIZATION
181186
BCDR
182187
BCWG
@@ -212,6 +217,7 @@ BMCI
212217
BMCIP
213218
BMSPO
214219
BMSRP
220+
Bokmål
215221
Bokmaal
216222
Bootstrappers
217223
bot's
@@ -485,6 +491,7 @@ entrypoint
485491
environmentsettings
486492
errordetail
487493
errored
494+
ErrorMesssage
488495
ErrorSchema
489496
Español
490497
estaba
@@ -553,6 +560,7 @@ fsaction
553560
Fulfilment
554561
Fulltext
555562
fullyqualified
563+
functionappsettings
556564
galician
557565
galleryimages
558566
Garda
@@ -965,6 +973,7 @@ nonpaged
965973
nonreadable
966974
nonstarted
967975
Nonsupported
976+
nopublicipaddresses
968977
northcentralus
969978
northeurope
970979
nostore
@@ -1030,6 +1039,7 @@ pageable
10301039
Parallelise
10311040
paramref
10321041
PARAVIRTUAL
1042+
partnertopic
10331043
Passthrough
10341044
patternanyentities
10351045
patternrule
@@ -1132,6 +1142,7 @@ querystring
11321142
querytriggers
11331143
Queretaro
11341144
queueservices
1145+
QueueStatus
11351146
quickbooks
11361147
quicktest
11371148
quniform
@@ -1213,6 +1224,7 @@ reprovisions
12131224
Reregister
12141225
Rescan
12151226
reservationorders
1227+
resetapikey
12161228
resetvpnclientsharedkey
12171229
Resolvability
12181230
resourcegraph
@@ -1295,6 +1307,7 @@ SECP
12951307
secureobject
12961308
securestring
12971309
securityinsight
1310+
seealso
12981311
serialconsole
12991312
servererror
13001313
serverfarm
@@ -1394,6 +1407,7 @@ starttask
13941407
starttaskfailed
13951408
starttime
13961409
stateful
1410+
staticsite
13971411
statusdir
13981412
stderror
13991413
stopresize
@@ -1476,6 +1490,7 @@ Taxii
14761490
templated
14771491
templatelink
14781492
templeton
1493+
temporarydisk
14791494
tensorflow
14801495
teradata
14811496
terminatejob
@@ -1588,6 +1603,7 @@ userflows
15881603
userid
15891604
userpreference
15901605
usersetting
1606+
usermanaged
15911607
USQL
15921608
VAIDK
15931609
varbinary
@@ -1716,3 +1732,8 @@ getactivesessions
17161732
disconnectactivesessions
17171733
bsls
17181734
sessionids
1735+
Dsms
1736+
cloudManifestFiles
1737+
highestcriticalimpact
1738+
apiserver
1739+
kubeadmin

documentation/ci-fix.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ Here are guides to fix some of the CI failure.
44

55
## Spell check
66

7-
Please add your words to `./custom-words.txt` if you think you have the correct spell
7+
Please add your words to `./custom-words.txt` if you think you have the correct spell.
8+
9+
If your problem is some existing error name that is not a word and need to supress the error in that file (and don't want to add to custom-words.txt), you can add it to `./cSpell.txt`.
810

911
## Prettier check
1012

0 commit comments

Comments
 (0)