Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

latest master #13300

Merged
merged 59 commits into from
Mar 5, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
cd2fcd2
Users/shamkh/feature send sms changes for removing default for requi…
Shamkh Feb 26, 2021
8e3bd3d
Initial API spec for managed Cassandra project in CosmosDB (#12861)
frrossms Feb 26, 2021
057a2f0
[Graph RBAC] Add top to users op (#13045)
deyaaeldeen Feb 27, 2021
9fcabcb
update python config guide (#11542)
changlong-liu Mar 1, 2021
f52ea85
Fix Threat Intelligence Swagger Correctness S360 (#13043)
hunngu-ms Mar 1, 2021
536251b
Workspaces: Swagger correctness (#12730)
yoramsinger Mar 1, 2021
997de0f
Introducing System data (#13113)
dhawal777 Mar 1, 2021
ab720a1
PowerBIDedicated - Add new API Version (#12244)
david-msft Mar 1, 2021
dc55d8c
[Hub Generated] Review request for Microsoft.KubernetesConfiguration …
NarayanThiru Mar 1, 2021
fbdca24
This field ended up out of sync between the resource provider and the…
frrossms Mar 1, 2021
be2b34f
[Quantum] Addressing swagger completeness and correctness errors (#13…
masenol Mar 1, 2021
c265d4f
ADP: fix cli codegen (#13172)
aelij Mar 1, 2021
998796e
fix pii entity categories (#13122)
iscai-msft Mar 1, 2021
e289520
Add DocumentExtractionSkill (#13003)
shuyangmsft Mar 1, 2021
c057a45
Update enum name for StringIndexType (#13209)
maririos Mar 1, 2021
f0d04a6
Added new disk storageAccountTypes (#12958)
sukodava Mar 1, 2021
855349e
Add sites, sensors and onPremiseSensors resources (#12991)
orkayam Mar 1, 2021
1c148c3
[Hub Generated] Review request for Microsoft.Devices to add version s…
sudeepmsft Mar 1, 2021
3e1d53e
[Hub Generated] Review request for Microsoft.Devices to add version s…
sudeepmsft Mar 1, 2021
bbbf1cc
Fix comment (#12919)
trask Mar 1, 2021
53574ef
[Hub Generated] Review request for Microsoft.DeviceUpdate to add vers…
dpokluda Mar 2, 2021
d4035ec
fix window closed. remove s360 comments. (#13205)
ruowan Mar 2, 2021
be1c967
Revert default tag to latest package intended for use by customers (#…
greenms Mar 2, 2021
a7810b2
Add SystemData (#13184)
srinivaas-ganesan Mar 2, 2021
97aa9fa
[DataFactory] Add UAMI to Identity (#13174)
Pacodel Mar 2, 2021
af4929a
[Hub Generated] Review request for Microsoft.DeviceUpdate to add vers…
dpokluda Mar 2, 2021
abe10d9
[Iothub] Added new routing source [version 2021-02-01-preview] (#13…
kdonthineni Mar 2, 2021
717f252
Remove name from pool (#13094)
audunn Mar 2, 2021
0f59438
Update python track2 sdk for deviceupdate (#13223)
00Kai0 Mar 2, 2021
542cfcc
Added subscriptionId and resourceGroupName in Server properties (#13059)
melihmutlu Mar 2, 2021
b8052be
Update readme.azureresourceschema.md (#13221)
TimLovellSmith Mar 2, 2021
61fa39c
Fix swagger KPI issue on additional property "tenantId" in deployment…
lwang2016 Mar 2, 2021
5cdf211
S360 - insert missing API version. (#13126)
allencal Mar 2, 2021
a95864b
Update redisenterprise readme files for Azure CLI (#13083)
greenms Mar 2, 2021
3423b80
[Hub Generated] Review request for Microsoft.Consumption to add versi…
AlahmadiQ8 Mar 2, 2021
2a65b0a
Azure Remote REST API 2021-01-01 (#13239)
rikogeln Mar 2, 2021
3253461
[deviceupdate] make changes to readme in time for first release (#13240)
iscai-msft Mar 2, 2021
0a7c908
update swagger reviews for translator text (#13246)
kristapratico Mar 3, 2021
4714561
Update Device Update for IoT Hub control plane autorest file for C# w…
dpokluda Mar 3, 2021
4d1ea13
Peering new api version 2021-01-01 (#12855)
renuka-raju Mar 3, 2021
a9572c7
fix web python.md (#13162)
00Kai0 Mar 3, 2021
6328731
[Hub Generated] Review request for Microsoft.Consumption to add versi…
karthikku-2020 Mar 3, 2021
281b9df
Added Swagger Doc for Settings API (#13241)
omrodrig Mar 3, 2021
6c9d4fe
Update Certainty enum (#13247)
suhas92 Mar 3, 2021
9ee9846
[Hub Generated] Review request for Face to add version stable/v1.0 (#…
zhizhoualan Mar 3, 2021
66f033f
Update credential scope for Python. (#13263)
dpokluda Mar 3, 2021
fc86e64
Fix parent class of ClusterResource and DataCenterResource in .NET SD…
frrossms Mar 4, 2021
80e4e1b
read replica added (#12567)
furkansahin Mar 4, 2021
04d3607
Network november release (#13224)
MikhailTryakhov Mar 4, 2021
270f394
init MetricsAdvisor (#10862)
bowgong Mar 4, 2021
8df3212
Fix typo (#13281)
vikrampraveen Mar 4, 2021
bd75cbc
add force delete query parameter for delegatedSubnets resource (#13004)
tamilmani1989 Mar 4, 2021
f6c54b7
Use common CloudError & CloudErrorBody (#13286)
jianghaolu Mar 5, 2021
c13fc89
Renaming operations to fix s360 violations (#13236)
dsgouda Mar 5, 2021
c72598a
Update pull_request_assignment.yml (#13292)
ruowan Mar 5, 2021
8fb7ed0
Consumption Correctness Updates (#13280)
karthikku-2020 Mar 5, 2021
c0a7127
Add authHeaders to HTTP/REST/OData Linked Service, add MultiFactor to…
yew Mar 5, 2021
b36e808
add a version in readmepython (#13295)
zhangyan133 Mar 5, 2021
782bab9
Update CODEOWNERS (#13293)
ruowan Mar 5, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 0 additions & 1 deletion .github/comment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,4 @@
- "update existing version to fix swagger quality issue in s360"
onCheckedLabels:
- FixS360
onCheckedComments: "In the Window Period to fix mismatches between swagger and service, when PR is labelled with “FixS360”, breaking change can be approved by PR assignee; the Azure Breaking Change Board is no longer required to approve the PR. Please ensure to clarify what s360 action items to be solved, and @ mention PR assignee for awareness. Please check this wiki [Window to Fix Broken](https://dev.azure.com/azure-sdk/internal/_wiki/wikis/internal.wiki/405/Window-to-Fix-Broken) for more details."

12 changes: 10 additions & 2 deletions .github/pull_request_assignment.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
---
- rule:
# translator data-plane PR
paths:
- "specification/cognitiveservices/data-plane/TranslatorText/**"
reviewers:
- kristapratico
- maririos

- rule:
# eventgrid data-plane PR
paths:
Expand Down Expand Up @@ -37,7 +45,7 @@
- kairu-ms

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

Expand Down Expand Up @@ -149,7 +157,7 @@
paths:
- "specification/servicelinker/**"
reviewers:
- PhoenixHe-msft
- raych1

- rule:
paths:
Expand Down
9 changes: 6 additions & 3 deletions CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,9 @@
/specification/trafficmanager/ @allencal @hrkulkarmsft
/specification/web/ @naveedaz @Azure/azure-app-service-control-plane
/profile/ @shahabhijeet
/specification/**/readme.typescript.md @qiaozha
/specification/**/readme.go.md @ArcturusZhang
/specification/**/readme.python.md @jsntcy @msyyc
/specification/**/resource-manager/**/readme.typescript.md @qiaozha
/specification/**/resource-manager/**/readme.az.md @jsntcy @qiaozha
/specification/**/resource-manager/**/readme.cli.md @jsntcy @qiaozha
/specification/**/resource-manager/**/readme.go.md @ArcturusZhang
/specification/**/resource-manager/**/readme.python.md @jsntcy @msyyc
/specification/**/resource-manager/**/readme.azureresourceschema.md @leni-msft
15 changes: 14 additions & 1 deletion custom-words.txt
Original file line number Diff line number Diff line change
Expand Up @@ -505,10 +505,15 @@ deserializer
deserializing
destinationshares
deterministically
deviceclasses
devicecredentials
devicegroups
deviceids
deviceprovisioningservices
devicestates
devicetags
devicetemplates
deviceupdate
Devops
devops
devspaces
Expand Down Expand Up @@ -824,6 +829,8 @@ innererror
inotify
Inotify
Inprogress
installable
installableupdates
integrationaccount
Intelli
intervaled
Expand Down Expand Up @@ -1044,6 +1051,7 @@ metricdefinitions
metricmetadata
metricnames
metricnamespace
metricsadvisor
metrictype
mgmt
Mibps
Expand Down Expand Up @@ -1116,6 +1124,7 @@ mypath
mypicture
mypictures
myregistry
myscope
myshopify
mysite
mysquare
Expand Down Expand Up @@ -1160,6 +1169,7 @@ nodeagentskus
nodeconfiguration
nodecounts
Nodeploy
nodetool
nodrm
nometadata
nonadmin
Expand Down Expand Up @@ -1461,6 +1471,7 @@ Reregister
Rescan
reservationorders
resetapikey
resetconnection
resetvpnclientsharedkey
Resolvability
resourcegraph
Expand Down Expand Up @@ -1910,6 +1921,7 @@ Untracked
unvalidated
unwrapkey
updatecertificate
updatecompliance
updatehostname
updatepolicy
updateprivateendpointconnection
Expand Down Expand Up @@ -2103,4 +2115,5 @@ lifecycles
backuptype
FSLogix
privatelinkservice
natgateway
natgateway
defanged
35 changes: 18 additions & 17 deletions documentation/code-gen/configure-python-sdk.md
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,18 @@ python:
clear-output-folder: true
```

``` yaml $(python-mode) == 'update' && !$(track2)
python:
no-namespace-folders: true
output-folder: $(python-sdks-folder)/appconfiguration/azure-mgmt-appconfiguration/azure/mgmt/appconfiguration
```

``` yaml $(python-mode) == 'create' && !$(track2)
python:
basic-setup-py: true
output-folder: $(python-sdks-folder)/appconfiguration/azure-mgmt-appconfiguration
```

These settings apply only when `--track2` is specified on the command line.

``` yaml $(track2) // For track2: basic Python package information
Expand All @@ -132,20 +144,12 @@ no-namespace-folders: true
package-version: 0.1.0
```

``` yaml $(python-mode) == 'update'
// --------------- For track1 -----------------
python:
no-namespace-folders: true
output-folder: $(python-sdks-folder)/appconfiguration/azure-mgmt-appconfiguration/azure/mgmt/appconfiguration

// --------------- For track2 -----------------
``` yaml $(python-mode) == 'update' && $(track2)
no-namespace-folders: true
output-folder: $(python-sdks-folder)/appconfiguration/azure-mgmt-appconfiguration/azure/mgmt/appconfiguration
```
``` yaml $(python-mode) == 'create'
python:
basic-setup-py: true
output-folder: $(python-sdks-folder)/appconfiguration/azure-mgmt-appconfiguration

``` yaml $(python-mode) == 'create' && $(track2)
basic-setup-py: true
output-folder: $(python-sdks-folder)/appconfiguration/azure-mgmt-appconfiguration
```
Expand Down Expand Up @@ -180,7 +184,7 @@ batch:
- multiapiscript: true
```

``` yaml $(multiapiscript) // For track2
``` yaml $(multiapiscript) && $(track2) // For track2
output-folder: $(python-sdks-folder)/compute/azure-mgmt-compute/azure/mgmt/compute/
clear-output-folder: false
perform-load: false
Expand All @@ -197,12 +201,9 @@ Then, the output folder and namespace should be configured for each of the tag.
These settings apply only when `--tag=package-2020-06-01-only --python` is specified on the command line.
Please also specify `--python-sdks-folder=<path to the root directory of your azure-sdk-for-python clone>`.

``` yaml $(tag) == 'package-2020-06-01-only'
``` yaml $(tag) == 'package-2020-06-01-only' && $(track2) // For track2
namespace: azure.mgmt.compute.v2020_06_01
output-folder: $(python-sdks-folder)/compute/azure-mgmt-compute/azure/mgmt/compute/v2020_06_01
python:
namespace: azure.mgmt.compute.v2020_06_01
output-folder: $(python-sdks-folder)/compute/azure-mgmt-compute/azure/mgmt/compute/v2020_06_01
```
~~~

Expand Down Expand Up @@ -235,5 +236,5 @@ Track 2 is based on the latest AutoRest code generator

~~~
> autorest --reset
> autorest --python --track2 --use=@autorest/python@5.3.0 --python-sdks-folder=..\azure-sdk-for-python\sdk --multiapi --python-mode=update ..\azure-rest-api-specs\specification\appconfiguration\resource-manager\readme.md
> autorest --python --track2 --use=@autorest/python@5.4.1 --python-sdks-folder=..\azure-sdk-for-python\sdk --multiapi --python-mode=update ..\azure-rest-api-specs\specification\appconfiguration\resource-manager\readme.md
~~~
26 changes: 23 additions & 3 deletions documentation/samplefiles/readme.python.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,39 @@
These settings apply only when `--python` is specified on the command line.
Please also specify `--python-sdks-folder=<path to the root directory of your azure-sdk-for-python clone>`.

``` yaml $(python)
``` yaml $(python) && !$(track2)
python:
azure-arm: true
license-header: MICROSOFT_MIT_NO_VERSION
package-name: azure-mgmt-[[ServiceName]]
no-namespace-folders: true
package-version: 1.0.0b1
```

``` yaml $(python-mode) == 'update' && !$(track2)
python:
output-folder: $(python-sdks-folder)/[[ServiceName]]/azure-mgmt-[[ServiceName]]/azure/mgmt/[[ServiceName]]
```
``` yaml $(python-mode) == 'create' && !$(track2)
python:
basic-setup-py: true
output-folder: $(python-sdks-folder)/[[ServiceName]]/azure-mgmt-[[ServiceName]]
```

``` yaml $(python) && $(track2)
azure-arm: true
license-header: MICROSOFT_MIT_NO_VERSION
package-name: azure-mgmt-[[ServiceName]]
no-namespace-folders: true
package-version: 1.0.0b1
```

``` yaml $(python-mode) == 'update'
no-namespace-folders: true
output-folder: $(python-sdks-folder)/[[ServiceName]]/azure-mgmt-[[ServiceName]]/azure/mgmt/[[ServiceName]]
```
``` yaml $(python-mode) == 'create'

``` yaml $(python-mode) == 'create' && $(track2)
package-version: 1.0.0b1
basic-setup-py: true
output-folder: $(python-sdks-folder)/[[ServiceName]]/azure-mgmt-[[ServiceName]]
```
6 changes: 6 additions & 0 deletions specification/adp/resource-manager/readme.az.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,10 @@ az:
package-name: azure-mgmt-adp
az-output-folder: $(azure-cli-extension-folder)/src/adp
python-sdk-output-folder: "$(az-output-folder)/azext_adp/vendored_sdks/adp"

directive:
- from: swagger-document
where: $.definitions.DataPoolLocation
transform: >
$.properties.encryption["x-ms-client-flatten"] = true;
```
9 changes: 0 additions & 9 deletions specification/adp/resource-manager/readme.cli.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,3 @@
## CLI

These settings don't need to apply `--cli` on the command line.

``` yaml
cli:
cli-directive:
- where:
type: DataPoolLocation
prop: encryption
cli-flatten: true
```
Original file line number Diff line number Diff line change
Expand Up @@ -856,7 +856,7 @@
"type": "number",
"format": "float",
"default": 100.0,
"description": "Sampling rate used in application. This telemetry item represents 1 / sampleRate actual telemetry items."
"description": "Sampling rate used in application. This telemetry item represents 100 / sampleRate actual telemetry items."
},
"seq": {
"type": "string",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,12 @@
}
],
"properties": {
"systemData": {
"description": "System data of Cluster resource",
"$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData",
"x-ms-client-flatten": true,
"readOnly": true
},
"properties": {
"description": "Cluster properties.",
"$ref": "#/definitions/ClusterProperties",
Expand Down
Loading