Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Modify Swagger to fix the problem of automatically generating ugly names in track 2 #14758

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.

Sign up for GitHub

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

Merged
merged 6 commits into from
Jun 25, 2021
Merged

Modify Swagger to fix the problem of automatically generating ugly names in track 2 #14758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
586ca06
update swagger to fix track 2 autogenerated naming issue
FumingZhang Jun 10, 2021
e76de33
fix
FumingZhang Jun 10, 2021
b85f84b
update readme for sdk generation
FumingZhang Jun 10, 2021
b107294
fix lint error
FumingZhang Jun 18, 2021
87d0a28
Trigger Build
FumingZhang Jun 18, 2021
299b6b8
update readme
FumingZhang Jun 22, 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
29 changes: 11 additions & 18 deletions ...ervice/resource-manager/Microsoft.ContainerService/stable/2021-07-01/managedClusters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3129,24 +3129,20 @@
"extendedLocation": {
"$ref": "#/definitions/ExtendedLocation",
"description": "The extended location of the Virtual Machine."
},
"identity": {
"$ref": "#/definitions/ManagedClusterIdentity",
"description": "The identity of the managed cluster, if configured."
},
"properties": {
"description": "Properties of a managed cluster.",
"$ref": "#/definitions/ManagedClusterProperties",
"x-ms-client-flatten": true
}
},
"allOf": [
{
"$ref": "#/definitions/Resource"
},
{
"properties": {
"properties": {
"description": "Properties of a managed cluster.",
"$ref": "#/definitions/ManagedClusterProperties",
"x-ms-client-flatten": true
},
"identity": {
"$ref": "#/definitions/ManagedClusterIdentity",
"description": "The identity of the managed cluster, if configured."
}
}
}
],
"description": "Managed cluster."
Expand Down Expand Up @@ -3326,11 +3322,7 @@
},
"identityProfile": {
"additionalProperties": {
"allOf": [
{
"$ref": "#/definitions/UserAssignedIdentity"
}
]
"$ref": "#/definitions/UserAssignedIdentity"
},
"description": "Identities associated with the cluster."
},
Expand Down Expand Up @@ -3422,6 +3414,7 @@
"type": "object",
"additionalProperties": {
"type": "object",
"x-ms-client-name": "ManagedServiceIdentityUserAssignedIdentitiesValue",
"properties": {
"principalId": {
"readOnly": true,
Expand Down
10 changes: 10 additions & 0 deletions specification/containerservice/resource-manager/readme.go.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ azure-arm: true

``` yaml $(go) && $(multiapi)
batch:
- tag: package-2021-07
- tag: package-2021-05
- tag: package-2021-03
- tag: package-2021-02
Expand Down Expand Up @@ -48,6 +49,15 @@ batch:
- tag: package-2017-07
```

### Tag: package-2021-07 and go

These settings apply only when `--package-2021-07 --go` is specified on the command line.
Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.

``` yaml $(tag)=='package-2021-07' && $(go)
namespace: containerservice
output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2021-07-01/$(namespace)
```
### Tag: package-2021-05 and go

These settings apply only when `--package-2021-05 --go` is specified on the command line.
Expand Down
14 changes: 14 additions & 0 deletions specification/containerservice/resource-manager/readme.java.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,20 @@ batch:
- tag: package-2021-02
- tag: package-2021-03
- tag: package-2021-05
- tag: package-2021-07
```

### Tag: package-2021-07 and java

These settings apply only when `--tag=package-2021-07` is specified on the command line.
Please also specify `--azure-libraries-for-java-folder=<path to the root directory of your azure-sdk-for-java clone>`.

``` yaml $(tag) == 'package-2021-05' && $(java) && $(multiapi)
java:
namespace: com.microsoft.azure.management.containerservice.v2021_07_01
output-folder: $(azure-libraries-for-java-folder)/sdk/containerservice/mgmt-v2021_07_01
regenerate-manager: true
generate-interface: true
```

### Tag: package-2021-05 and java
Expand Down
16 changes: 15 additions & 1 deletion specification/containerservice/resource-manager/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,11 @@ tag: package-2021-07

These settings apply only when `--tag=package-2021-07` is specified on the command line.

```yaml $(tag) == 'package-2021-07'
``` yaml $(tag) == 'package-2021-07'
input-file:
- Microsoft.ContainerService/stable/2021-07-01/managedClusters.json
```

### Tag: package-2021-05

These settings apply only when `--tag=package-2021-05` is specified on the command line.
Expand Down Expand Up @@ -337,6 +338,19 @@ input-file:

```

### Tag: package-2021-07-01-only

These settings apply only when `--tag=package-2021-07-01-only` is specified on the command line.

``` yaml $(tag) == 'package-2021-07-01-only'
input-file:
- Microsoft.ContainerService/stable/2021-07-01/managedClusters.json
directive:
- suppress: DefinitionsPropertiesNamesCamelCase
where: $.definitions.ManagedClusterProperties.properties.autoScalerProfile
reason: Cluster-autoscaler settings are not camel-cased
```

### Tag: package-2021-05-01-only

These settings apply only when `--tag=package-2021-05-01-only` is specified on the command line.
Expand Down
15 changes: 15 additions & 0 deletions specification/containerservice/resource-manager/readme.python.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ Generate all API versions currently shipped for this package

```yaml $(python) && $(multiapi) && !$(track2)
batch:
- tag: package-2021-07-01-only
- tag: package-2021-05-01-only
- tag: package-2021-03-01-only
- tag: package-2021-02-01-only
Expand Down Expand Up @@ -55,6 +56,7 @@ batch:

```yaml $(python) && $(multiapi) && $(track2)
batch:
- tag: package-2021-07-01-only
- tag: package-2021-05-01-only
- tag: package-2021-03-01-only
- tag: package-2021-02-01-only
Expand Down Expand Up @@ -89,6 +91,19 @@ clear-output-folder: false
perform-load: false
```

### Tag: package-2021-07-01-only and python

These settings apply only when `--tag=package-2021-07-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-2021-05-01-only' && $(python)
python:
namespace: azure.mgmt.containerservice.v2021_07_01
output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2021_07_01
namespace: azure.mgmt.containerservice.v2021_07_01
output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2021_07_01
```

### Tag: package-2021-05-01-only and python

These settings apply only when `--tag=package-2021-05-01-only --python` is specified on the command line.
Expand Down