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.

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

Jump to bottom

[T2]containerservice for track2 python sdk #11275

Merged
merged 4 commits into from
Nov 11, 2020
Merged

[T2]containerservice for track2 python sdk #11275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c53101a
for track2 python sdk
msyyc Oct 19, 2020
a3766b3
x-ms-client-name
changlong-liu Oct 20, 2020
2f06766
BaseManagedCluster
changlong-liu Oct 20, 2020
9b33d7c
for python track2
msyyc Oct 21, 2020
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
1 change: 1 addition & 0 deletions ...ervice/resource-manager/Microsoft.ContainerService/stable/2019-11-01/managedClusters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1955,6 +1955,7 @@
"identityProfile": {
"additionalProperties": {
"readOnly": true,
"x-ms-client-name": "managedClusterPropertiesIdentityProfileValue",
"allOf": [
{
"$ref": "#/definitions/UserAssignedIdentity"
Expand Down
1 change: 1 addition & 0 deletions ...ervice/resource-manager/Microsoft.ContainerService/stable/2020-01-01/managedClusters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1959,6 +1959,7 @@
"identityProfile": {
"additionalProperties": {
"readOnly": true,
"x-ms-client-name": "managedClusterPropertiesIdentityProfileValue",
"allOf": [
{
"$ref": "#/definitions/UserAssignedIdentity"
Expand Down
1 change: 1 addition & 0 deletions ...ervice/resource-manager/Microsoft.ContainerService/stable/2020-02-01/managedClusters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2008,6 +2008,7 @@
"identityProfile": {
"additionalProperties": {
"readOnly": true,
"x-ms-client-name": "managedClusterPropertiesIdentityProfileValue",
"allOf": [
{
"$ref": "#/definitions/UserAssignedIdentity"
Expand Down
2 changes: 2 additions & 0 deletions ...ervice/resource-manager/Microsoft.ContainerService/stable/2020-03-01/managedClusters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1898,6 +1898,7 @@
"$ref": "#/definitions/Resource"
},
{
"x-ms-client-name": "BaseManagedCluster",
"properties": {
"properties": {
"description": "Properties of a managed cluster.",
Expand Down Expand Up @@ -2033,6 +2034,7 @@
"identityProfile": {
"additionalProperties": {
"readOnly": true,
"x-ms-client-name": "managedClusterPropertiesIdentityProfileValue",
"allOf": [
{
"$ref": "#/definitions/UserAssignedIdentity"
Expand Down
2 changes: 2 additions & 0 deletions ...ervice/resource-manager/Microsoft.ContainerService/stable/2020-04-01/managedClusters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1916,6 +1916,7 @@
"$ref": "#/definitions/Resource"
},
{
"x-ms-client-name": "BaseManagedCluster",
"properties": {
"properties": {
"description": "Properties of a managed cluster.",
Expand Down Expand Up @@ -2051,6 +2052,7 @@
"identityProfile": {
"additionalProperties": {
"readOnly": true,
"x-ms-client-name": "managedClusterPropertiesIdentityProfileValue",
"allOf": [
{
"$ref": "#/definitions/UserAssignedIdentity"
Expand Down
3 changes: 3 additions & 0 deletions ...ervice/resource-manager/Microsoft.ContainerService/stable/2020-06-01/managedClusters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2128,6 +2128,7 @@
"$ref": "#/definitions/Resource"
},
{
"x-ms-client-name": "BaseManagedCluster",
"properties": {
"properties": {
"description": "Properties of a managed cluster.",
Expand Down Expand Up @@ -2263,6 +2264,7 @@
"identityProfile": {
"additionalProperties": {
"readOnly": true,
"x-ms-client-name": "managedClusterPropertiesIdentityProfileValue",
"allOf": [
{
"$ref": "#/definitions/UserAssignedIdentity"
Expand Down Expand Up @@ -2319,6 +2321,7 @@
"type": "object",
"additionalProperties": {
"type": "object",
"x-ms-client-name": "ManagedClusterIdentityUserAssignedIdentitiesValue",
"properties": {
"principalId": {
"readOnly": true,
Expand Down
6 changes: 5 additions & 1 deletion ...ervice/resource-manager/Microsoft.ContainerService/stable/2020-07-01/managedClusters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2198,6 +2198,7 @@
"$ref": "#/definitions/Resource"
},
{
"x-ms-client-name": "BaseManagedCluster",
"properties": {
"properties": {
"description": "Properties of a managed cluster.",
Expand Down Expand Up @@ -2333,9 +2334,11 @@
"identityProfile": {
"additionalProperties": {
"readOnly": true,
"x-ms-client-name": "managedClusterPropertiesIdentityProfileValue",
"allOf": [
{
"$ref": "#/definitions/UserAssignedIdentity"
"$ref": "#/definitions/UserAssignedIdentity",
"x-ms-client-name": "managedClusterPropertiesIdentityProfileValue"
}
]
},
Expand Down Expand Up @@ -2389,6 +2392,7 @@
"type": "object",
"additionalProperties": {
"type": "object",
"x-ms-client-name": "ManagedClusterIdentityUserAssignedIdentitiesValue",
"properties": {
"principalId": {
"readOnly": true,
Expand Down
3 changes: 3 additions & 0 deletions ...ervice/resource-manager/Microsoft.ContainerService/stable/2020-09-01/managedClusters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2393,6 +2393,7 @@
"$ref": "#/definitions/Resource"
},
{
"x-ms-client-name": "BaseManagedCluster",
"properties": {
"properties": {
"description": "Properties of a managed cluster.",
Expand Down Expand Up @@ -2563,6 +2564,7 @@
"identityProfile": {
"additionalProperties": {
"readOnly": true,
"x-ms-client-name": "managedClusterPropertiesIdentityProfileValue",
"allOf": [
{
"$ref": "#/definitions/UserAssignedIdentity"
Expand Down Expand Up @@ -2636,6 +2638,7 @@
"type": "object",
"additionalProperties": {
"type": "object",
"x-ms-client-name": "ManagedClusterIdentityUserAssignedIdentitiesValue",
"properties": {
"principalId": {
"readOnly": true,
Expand Down
2 changes: 2 additions & 0 deletions specification/containerservice/resource-manager/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -547,9 +547,11 @@ This is not used by Autorest itself.

``` yaml $(swagger-to-sdk)
swagger-to-sdk:

- repo: azure-sdk-for-python
after_scripts:
- python ./scripts/multiapi_init_gen.py azure-mgmt-containerservice
- repo: azure-sdk-for-python-track2
- repo: azure-sdk-for-java
- repo: azure-sdk-for-go
- repo: azure-sdk-for-js
Expand Down
83 changes: 81 additions & 2 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 @@ -2,7 +2,7 @@

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

```yaml $(python)
```yaml $(python) && !$(track2)
python:
azure-arm: true
license-header: MICROSOFT_MIT_NO_VERSION
Expand All @@ -12,11 +12,43 @@ python:
no-namespace-folders: true
```

```yaml $(python) && $(track2)
azure-arm: true
license-header: MICROSOFT_MIT_NO_VERSION
package-name: azure-mgmt-containerservice
clear-output-folder: true
no-namespace-folders: true
```

### Python multi-api

Generate all API versions currently shipped for this package

```yaml $(python) && $(multiapi)
```yaml $(python) && $(multiapi) && !$(track2)
batch:
- tag: package-2020-09-01-only
- tag: package-2020-07-01-only
- tag: package-2020-06-01-only
- tag: package-2020-04-01-only
- tag: package-2020-03-01-only
- tag: package-2020-02-01-only
- tag: package-2020-01-01-only
- tag: package-2019-11-01-only
- tag: package-2019-10-27-preview-only
- tag: package-2019-10-01-only
- tag: package-2019-08-01-only
- tag: package-2019-06-01-only
- tag: package-2019-04-30-only
- tag: package-2019-04-01-only
- tag: package-2019-02-only
- tag: package-2018-09-preview-only
- tag: package-2019-09-preview-only
- tag: package-2018-08-preview-only
- tag: package-2018-03-only
- tag: package-2017-07-only-extended
```

```yaml $(python) && $(multiapi) && $(track2)
batch:
- tag: package-2020-09-01-only
- tag: package-2020-07-01-only
Expand All @@ -38,8 +70,15 @@ batch:
- tag: package-2018-08-preview-only
- tag: package-2018-03-only
- tag: package-2017-07-only-extended
- multiapiscript: true
```

``` yaml $(multiapiscript)
output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/
clear-output-folder: false
perform-load: false
```

### Tag: package-2020-09-01-only and python

These settings apply only when `--tag=package-2020-09-01-only --python` is specified on the command line.
Expand All @@ -49,6 +88,8 @@ Please also specify `--python-sdks-folder=<path to the root directory of your az
python:
namespace: azure.mgmt.containerservice.v2020_09_01
output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2020_09_01
namespace: azure.mgmt.containerservice.v2020_09_01
output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2020_09_01
```

### Tag: package-2020-07-01-only and python
Expand All @@ -60,6 +101,8 @@ Please also specify `--python-sdks-folder=<path to the root directory of your az
python:
namespace: azure.mgmt.containerservice.v2020_07_01
output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2020_07_01
namespace: azure.mgmt.containerservice.v2020_07_01
output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2020_07_01
```

### Tag: package-2020-06-01-only and python
Expand All @@ -68,6 +111,8 @@ These settings apply only when `--tag=package-2020-06-01-only --python` is speci
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' && $(python)
namespace: azure.mgmt.containerservice.v2020_06_01
output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2020_06_01
python:
namespace: azure.mgmt.containerservice.v2020_06_01
output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2020_06_01
Expand All @@ -79,6 +124,8 @@ These settings apply only when `--tag=package-2020-04-01-only --python` is speci
Please also specify `--python-sdks-folder=<path to the root directory of your azure-sdk-for-python clone>`.

``` yaml $(tag) == 'package-2020-04-01-only' && $(python)
namespace: azure.mgmt.containerservice.v2020_04_01
output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2020_04_01
python:
namespace: azure.mgmt.containerservice.v2020_04_01
output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2020_04_01
Expand All @@ -90,6 +137,8 @@ These settings apply only when `--tag=package-2020-03-01-only --python` is speci
Please also specify `--python-sdks-folder=<path to the root directory of your azure-sdk-for-python clone>`.

``` yaml $(tag) == 'package-2020-03-01-only' && $(python)
namespace: azure.mgmt.containerservice.v2020_03_01
output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2020_03_01
python:
namespace: azure.mgmt.containerservice.v2020_03_01
output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2020_03_01
Expand All @@ -101,6 +150,8 @@ These settings apply only when `--tag=package-2020-02-01-only --python` is speci
Please also specify `--python-sdks-folder=<path to the root directory of your azure-sdk-for-python clone>`.

``` yaml $(tag) == 'package-2020-02-01-only' && $(python)
namespace: azure.mgmt.containerservice.v2020_02_01
output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2020_02_01
python:
namespace: azure.mgmt.containerservice.v2020_02_01
output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2020_02_01
Expand All @@ -112,6 +163,8 @@ These settings apply only when `--tag=package-2020-01-01-only --python` is speci
Please also specify `--python-sdks-folder=<path to the root directory of your azure-sdk-for-python clone>`.

``` yaml $(tag) == 'package-2020-01-01-only' && $(python)
namespace: azure.mgmt.containerservice.v2020_01_01
output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2020_01_01
python:
namespace: azure.mgmt.containerservice.v2020_01_01
output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2020_01_01
Expand All @@ -123,6 +176,8 @@ These settings apply only when `--tag=package-2019-11-01-only --python` is speci
Please also specify `--python-sdks-folder=<path to the root directory of your azure-sdk-for-python clone>`.

``` yaml $(tag) == 'package-2019-11-01-only' && $(python)
namespace: azure.mgmt.containerservice.v2019_11_01
output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2019_11_01
python:
namespace: azure.mgmt.containerservice.v2019_11_01
output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2019_11_01
Expand All @@ -134,6 +189,8 @@ These settings apply only when `--tag=package-2019-10-27-preview-only --python`
Please also specify `--python-sdks-folder=<path to the root directory of your azure-sdk-for-python clone>`.

``` yaml $(tag) == 'package-2019-10-27-preview-only' && $(python)
namespace: azure.mgmt.containerservice.v2019_10_27_preview
output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2019_10_27_preview
python:
namespace: azure.mgmt.containerservice.v2019_10_27_preview
output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2019_10_27_preview
Expand All @@ -145,6 +202,8 @@ These settings apply only when `--tag=package-2019-10-01-only --python` is speci
Please also specify `--python-sdks-folder=<path to the root directory of your azure-sdk-for-python clone>`.

``` yaml $(tag) == 'package-2019-10-01-only' && $(python)
namespace: azure.mgmt.containerservice.v2019_10_01
output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2019_10_01
python:
namespace: azure.mgmt.containerservice.v2019_10_01
output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2019_10_01
Expand All @@ -156,6 +215,8 @@ These settings apply only when `--tag=package-2019-08-01-only --python` is speci
Please also specify `--python-sdks-folder=<path to the root directory of your azure-sdk-for-python clone>`.

``` yaml $(tag) == 'package-2019-08-01-only' && $(python)
namespace: azure.mgmt.containerservice.v2019_08_01
output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2019_08_01
python:
namespace: azure.mgmt.containerservice.v2019_08_01
output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2019_08_01
Expand All @@ -167,6 +228,8 @@ These settings apply only when `--tag=package-2019-06-01-only --python` is speci
Please also specify `--python-sdks-folder=<path to the root directory of your azure-sdk-for-python clone>`.

``` yaml $(tag) == 'package-2019-06-01-only' && $(python)
namespace: azure.mgmt.containerservice.v2019_06_01
output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2019_06_01
python:
namespace: azure.mgmt.containerservice.v2019_06_01
output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2019_06_01
Expand All @@ -178,6 +241,8 @@ These settings apply only when `--tag=package-2019-04-30-only --python` is speci
Please also specify `--python-sdks-folder=<path to the root directory of your azure-sdk-for-python clone>`.

``` yaml $(tag) == 'package-2019-04-30-only' && $(python)
namespace: azure.mgmt.containerservice.v2019_04_30
output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2019_04_30
python:
namespace: azure.mgmt.containerservice.v2019_04_30
output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2019_04_30
Expand All @@ -189,6 +254,8 @@ These settings apply only when `--tag=package-2019-04-01-only --python` is speci
Please also specify `--python-sdks-folder=<path to the root directory of your azure-sdk-for-python clone>`.

``` yaml $(tag) == 'package-2019-04-01-only' && $(python)
namespace: azure.mgmt.containerservice.v2019_04_01
output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2019_04_01
python:
namespace: azure.mgmt.containerservice.v2019_04_01
output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2019_04_01
Expand All @@ -200,6 +267,8 @@ These settings apply only when `--tag=package-2019-02-only --python` is specifie
Please also specify `--python-sdks-folder=<path to the root directory of your azure-sdk-for-python clone>`.

``` yaml $(tag) == 'package-2019-02-only' && $(python)
namespace: azure.mgmt.containerservice.v2019_02_01
output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2019_02_01
python:
namespace: azure.mgmt.containerservice.v2019_02_01
output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2019_02_01
Expand All @@ -211,6 +280,8 @@ These settings apply only when `--tag=package-2018-09-preview-only --python` is
Please also specify `--python-sdks-folder=<path to the root directory of your azure-sdk-for-python clone>`.

``` yaml $(tag) == 'package-2018-09-preview-only' && $(python)
namespace: azure.mgmt.containerservice.v2018_09_30_preview
output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2018_09_30_preview
python:
namespace: azure.mgmt.containerservice.v2018_09_30_preview
output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2018_09_30_preview
Expand All @@ -222,6 +293,8 @@ These settings apply only when `--tag=package-2018-08-preview-only --python` is
Please also specify `--python-sdks-folder=<path to the root directory of your azure-sdk-for-python clone>`.

``` yaml $(tag) == 'package-2018-08-preview-only' && $(python)
namespace: azure.mgmt.containerservice.v2018_08_01_preview
output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2018_08_01_preview
python:
namespace: azure.mgmt.containerservice.v2018_08_01_preview
output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2018_08_01_preview
Expand All @@ -233,6 +306,8 @@ These settings apply only when `--tag=package-2018-03-only --python` is specifie
Please also specify `--python-sdks-folder=<path to the root directory of your azure-sdk-for-python clone>`.

``` yaml $(tag) == 'package-2018-03-only' && $(python)
namespace: azure.mgmt.containerservice.v2018_03_31
output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2018_03_31
python:
namespace: azure.mgmt.containerservice.v2018_03_31
output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2018_03_31
Expand All @@ -244,6 +319,8 @@ These settings apply only when `--tag=package-2017-07-only-extended --python` is
Please also specify `--python-sdks-folder=<path to the root directory of your azure-sdk-for-python clone>`.

``` yaml $(tag) == 'package-2017-07-only-extended' && $(python)
namespace: azure.mgmt.containerservice.v2017_07_01
output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2017_07_01
python:
namespace: azure.mgmt.containerservice.v2017_07_01
output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2017_07_01
Expand All @@ -255,6 +332,8 @@ These settings apply only when `--tag=package-2019-09-preview-only --python` is
Please also specify `--python-sdks-folder=<path to the root directory of your azure-sdk-for-python clone>`.

``` yaml $(tag) == 'package-2019-09-preview-only' && $(python)
namespace: azure.mgmt.containerservice.v2019_09_30_preview
output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2019_09_30_preview
python:
namespace: azure.mgmt.containerservice.v2019_09_30_preview
output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2019_09_30_preview
Expand Down