Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
e03bfc8
sql t2 readme config
RAY-316 May 12, 2021
70e2641
readme config
RAY-316 May 12, 2021
624cc26
Update readme.python.md
msyyc May 12, 2021
b4bba9d
resolve conflient locally
RAY-316 May 12, 2021
e11d5d7
Merge remote-tracking branch 'azure/master'
RAY-316 May 13, 2021
72dd592
conflient resolve
RAY-316 May 13, 2021
78caec8
Merge remote-tracking branch 'upstream/master'
RAY-316 May 13, 2021
fe3ca36
Merge remote-tracking branch 'azure/master'
RAY-316 May 14, 2021
516773e
Merge branch 'master' of https://github.com/RAY-316/azure-rest-api-specs
RAY-316 May 14, 2021
a823c78
Merge remote-tracking branch 'azure/master'
RAY-316 May 17, 2021
f234490
Merge remote-tracking branch 'azure/master'
RAY-316 May 20, 2021
24cbc54
Merge remote-tracking branch 'azure/master'
RAY-316 May 20, 2021
873cfe8
Merge remote-tracking branch 'azure/master'
RAY-316 May 21, 2021
eceb42c
Merge remote-tracking branch 'upstream/master'
RAY-316 May 24, 2021
9772d13
Merge remote-tracking branch 'upstream/master'
RAY-316 May 25, 2021
8744397
Merge remote-tracking branch 'upstream/master'
RAY-316 May 25, 2021
d2e3269
Merge remote-tracking branch 'upstream/master'
RAY-316 May 26, 2021
da8ae8b
Merge remote-tracking branch 'azure/master'
RAY-316 May 27, 2021
ecb9a3e
Merge remote-tracking branch 'upstream/master'
RAY-316 Jun 1, 2021
72c1d39
Merge remote-tracking branch 'azure/master'
RAY-316 Jun 3, 2021
b29eff6
Merge remote-tracking branch 'upstream/master'
RAY-316 Jun 4, 2021
4fabdfc
security t2 config
RAY-316 Jun 4, 2021
c5ba7d0
modelerfour config
RAY-316 Jun 4, 2021
834096b
Delete duplicate JSON files
RAY-316 Jun 7, 2021
66e900b
del test
RAY-316 Jun 7, 2021
a552af0
Update readme.md
msyyc Jun 8, 2021
ac590d0
directive x-ms-enum
msyyc Jun 8, 2021
2f587dc
delete redundant definition
msyyc Jun 9, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -553,10 +553,6 @@
"description": "Include the policy rules",
"type": "boolean",
"required": false,
"enum": [
false,
true
],
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

type 'boolean' only has two kinds of valuses : 'true' and 'false'. So there is no need to define it redundantly.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ArcturusZhang @weidongxu-microsoft @dw511214992 @allenjzhang
We delete redundant enum definition for 'boolean', please check whether it influence your language.

"x-ms-parameter-location": "method"
},
"Summary": {
Expand All @@ -565,10 +561,6 @@
"description": "Return output in a summarized form",
"type": "boolean",
"required": false,
"enum": [
false,
true
],
"x-ms-parameter-location": "method"
},
"AdaptiveApplicationControlGroup": {
Expand Down
5 changes: 1 addition & 4 deletions specification/security/resource-manager/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -187,10 +187,6 @@ input-file:
- Microsoft.Security/stable/2019-08-01/deviceSecurityGroups.json
- Microsoft.Security/stable/2019-08-01/iotSecuritySolutions.json
- Microsoft.Security/stable/2019-08-01/iotSecuritySolutionAnalytics.json
- Microsoft.Security/stable/2019-08-01/iotAlertTypes.json
- Microsoft.Security/stable/2019-08-01/iotAlerts.json
- Microsoft.Security/stable/2019-08-01/iotRecommendationTypes.json
- Microsoft.Security/stable/2019-08-01/iotRecommendations.json
- Microsoft.Security/preview/2015-06-01-preview/locations.json
- Microsoft.Security/preview/2015-06-01-preview/operations.json
- Microsoft.Security/preview/2015-06-01-preview/tasks.json
Expand Down Expand Up @@ -486,6 +482,7 @@ swagger-to-sdk:
- repo: azure-sdk-for-net
- repo: azure-sdk-for-go
- repo: azure-sdk-for-python
- repo: azure-sdk-for-python-track2
- repo: azure-sdk-for-js
- repo: azure-sdk-for-node
- repo: azure-resource-manager-schemas
Expand Down
46 changes: 43 additions & 3 deletions specification/security/resource-manager/readme.python.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ 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>`.
Use `--python-mode=update` if you already have a setup.py and just want to update the code itself.

``` yaml $(python)
``` yaml $(python) && !$(track2)
python-mode: create
python:
azure-arm: true
Expand All @@ -15,13 +15,53 @@ python:
package-version: 0.1.0
clear-output-folder: true
```
``` yaml $(python) && $(python-mode) == 'update'
``` yaml $(python) && $(track2)
python-mode: create
azure-arm: true
license-header: MICROSOFT_MIT_NO_VERSION
namespace: azure.mgmt.security
package-name: azure-mgmt-security
package-version: 1.0.0b1
clear-output-folder: true
modelerfour:
lenient-model-deduplication: true
```

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

```yaml $(python) && $(track2)
directive:
- from: swagger-document
where: $.definitions.AadConnectivityState.properties.connectivityState
transform: >
$['x-ms-enum']['name'] = 'AadConnectivityStateEnum';
- from: swagger-document
where: $.definitions.ExternalSecuritySolutionKind.properties.kind
transform: >
$['x-ms-enum']['name'] = 'ExternalSecuritySolutionKindEnum';
- from: jitNetworkAccessPolicies.json
where: $.definitions.JitNetworkAccessPortRule.properties.protocol
transform: >
$['x-ms-enum']['name'] = 'protocolEnum';
- from: alerts.json
where: $.definitions.AlertSimulatorRequestProperties.properties.kind
transform: >
$['x-ms-enum']['name'] = 'kindEnum';
```