diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-11-01/managedClusters.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-11-01/managedClusters.json index 0be553652cb2..b44df8600c26 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-11-01/managedClusters.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-11-01/managedClusters.json @@ -1953,6 +1953,7 @@ "identityProfile": { "additionalProperties": { "readOnly": true, + "x-ms-client-name": "managedClusterPropertiesIdentityProfileValue", "allOf": [ { "$ref": "#/definitions/UserAssignedIdentity" diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-01-01/managedClusters.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-01-01/managedClusters.json index 9052f5a6c66f..1c6015442cd7 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-01-01/managedClusters.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-01-01/managedClusters.json @@ -1957,6 +1957,7 @@ "identityProfile": { "additionalProperties": { "readOnly": true, + "x-ms-client-name": "managedClusterPropertiesIdentityProfileValue", "allOf": [ { "$ref": "#/definitions/UserAssignedIdentity" diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-02-01/managedClusters.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-02-01/managedClusters.json index 4572d2dec90e..7db9c1f6ae29 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-02-01/managedClusters.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-02-01/managedClusters.json @@ -2006,6 +2006,7 @@ "identityProfile": { "additionalProperties": { "readOnly": true, + "x-ms-client-name": "managedClusterPropertiesIdentityProfileValue", "allOf": [ { "$ref": "#/definitions/UserAssignedIdentity" diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-03-01/managedClusters.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-03-01/managedClusters.json index 772ab033df01..1a5e30ed6674 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-03-01/managedClusters.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-03-01/managedClusters.json @@ -1896,6 +1896,7 @@ "$ref": "#/definitions/Resource" }, { + "x-ms-client-name": "BaseManagedCluster", "properties": { "properties": { "description": "Properties of a managed cluster.", @@ -2031,6 +2032,7 @@ "identityProfile": { "additionalProperties": { "readOnly": true, + "x-ms-client-name": "managedClusterPropertiesIdentityProfileValue", "allOf": [ { "$ref": "#/definitions/UserAssignedIdentity" diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-04-01/managedClusters.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-04-01/managedClusters.json index 3a813866b029..5949af0c20ca 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-04-01/managedClusters.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-04-01/managedClusters.json @@ -1914,6 +1914,7 @@ "$ref": "#/definitions/Resource" }, { + "x-ms-client-name": "BaseManagedCluster", "properties": { "properties": { "description": "Properties of a managed cluster.", @@ -2049,6 +2050,7 @@ "identityProfile": { "additionalProperties": { "readOnly": true, + "x-ms-client-name": "managedClusterPropertiesIdentityProfileValue", "allOf": [ { "$ref": "#/definitions/UserAssignedIdentity" diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-06-01/managedClusters.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-06-01/managedClusters.json index b953c50c7963..3c38950a3bf6 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-06-01/managedClusters.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-06-01/managedClusters.json @@ -2126,6 +2126,7 @@ "$ref": "#/definitions/Resource" }, { + "x-ms-client-name": "BaseManagedCluster", "properties": { "properties": { "description": "Properties of a managed cluster.", @@ -2261,6 +2262,7 @@ "identityProfile": { "additionalProperties": { "readOnly": true, + "x-ms-client-name": "managedClusterPropertiesIdentityProfileValue", "allOf": [ { "$ref": "#/definitions/UserAssignedIdentity" @@ -2317,6 +2319,7 @@ "type": "object", "additionalProperties": { "type": "object", + "x-ms-client-name": "ManagedClusterIdentityUserAssignedIdentitiesValue", "properties": { "principalId": { "readOnly": true, diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-07-01/managedClusters.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-07-01/managedClusters.json index d1c2f34c1d52..256425b5f329 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-07-01/managedClusters.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-07-01/managedClusters.json @@ -2196,6 +2196,7 @@ "$ref": "#/definitions/Resource" }, { + "x-ms-client-name": "BaseManagedCluster", "properties": { "properties": { "description": "Properties of a managed cluster.", @@ -2331,9 +2332,11 @@ "identityProfile": { "additionalProperties": { "readOnly": true, + "x-ms-client-name": "managedClusterPropertiesIdentityProfileValue", "allOf": [ { - "$ref": "#/definitions/UserAssignedIdentity" + "$ref": "#/definitions/UserAssignedIdentity", + "x-ms-client-name": "managedClusterPropertiesIdentityProfileValue" } ] }, @@ -2387,6 +2390,7 @@ "type": "object", "additionalProperties": { "type": "object", + "x-ms-client-name": "ManagedClusterIdentityUserAssignedIdentitiesValue", "properties": { "principalId": { "readOnly": true, diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-09-01/managedClusters.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-09-01/managedClusters.json index aa5a00d3e6c5..9efdbb35b3b7 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-09-01/managedClusters.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-09-01/managedClusters.json @@ -2391,6 +2391,7 @@ "$ref": "#/definitions/Resource" }, { + "x-ms-client-name": "BaseManagedCluster", "properties": { "properties": { "description": "Properties of a managed cluster.", @@ -2561,6 +2562,7 @@ "identityProfile": { "additionalProperties": { "readOnly": true, + "x-ms-client-name": "managedClusterPropertiesIdentityProfileValue", "allOf": [ { "$ref": "#/definitions/UserAssignedIdentity" @@ -2634,6 +2636,7 @@ "type": "object", "additionalProperties": { "type": "object", + "x-ms-client-name": "ManagedClusterIdentityUserAssignedIdentitiesValue", "properties": { "principalId": { "readOnly": true, diff --git a/specification/containerservice/resource-manager/readme.md b/specification/containerservice/resource-manager/readme.md index b24570f6bfd1..678212247201 100644 --- a/specification/containerservice/resource-manager/readme.md +++ b/specification/containerservice/resource-manager/readme.md @@ -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 diff --git a/specification/containerservice/resource-manager/readme.python.md b/specification/containerservice/resource-manager/readme.python.md index 7a02ff59401b..fac4cac743a5 100644 --- a/specification/containerservice/resource-manager/readme.python.md +++ b/specification/containerservice/resource-manager/readme.python.md @@ -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 @@ -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 @@ -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. @@ -49,6 +88,8 @@ Please also specify `--python-sdks-folder=`. ``` 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 @@ -79,6 +124,8 @@ These settings apply only when `--tag=package-2020-04-01-only --python` is speci Please also specify `--python-sdks-folder=`. ``` 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 @@ -90,6 +137,8 @@ These settings apply only when `--tag=package-2020-03-01-only --python` is speci Please also specify `--python-sdks-folder=`. ``` 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 @@ -101,6 +150,8 @@ These settings apply only when `--tag=package-2020-02-01-only --python` is speci Please also specify `--python-sdks-folder=`. ``` 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 @@ -112,6 +163,8 @@ These settings apply only when `--tag=package-2020-01-01-only --python` is speci Please also specify `--python-sdks-folder=`. ``` 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 @@ -123,6 +176,8 @@ These settings apply only when `--tag=package-2019-11-01-only --python` is speci Please also specify `--python-sdks-folder=`. ``` 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 @@ -134,6 +189,8 @@ These settings apply only when `--tag=package-2019-10-27-preview-only --python` Please also specify `--python-sdks-folder=`. ``` 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 @@ -145,6 +202,8 @@ These settings apply only when `--tag=package-2019-10-01-only --python` is speci Please also specify `--python-sdks-folder=`. ``` 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 @@ -156,6 +215,8 @@ These settings apply only when `--tag=package-2019-08-01-only --python` is speci Please also specify `--python-sdks-folder=`. ``` 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 @@ -167,6 +228,8 @@ These settings apply only when `--tag=package-2019-06-01-only --python` is speci Please also specify `--python-sdks-folder=`. ``` 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 @@ -178,6 +241,8 @@ These settings apply only when `--tag=package-2019-04-30-only --python` is speci Please also specify `--python-sdks-folder=`. ``` 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 @@ -189,6 +254,8 @@ These settings apply only when `--tag=package-2019-04-01-only --python` is speci Please also specify `--python-sdks-folder=`. ``` 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 @@ -200,6 +267,8 @@ These settings apply only when `--tag=package-2019-02-only --python` is specifie Please also specify `--python-sdks-folder=`. ``` 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 @@ -211,6 +280,8 @@ These settings apply only when `--tag=package-2018-09-preview-only --python` is Please also specify `--python-sdks-folder=`. ``` 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 @@ -222,6 +293,8 @@ These settings apply only when `--tag=package-2018-08-preview-only --python` is Please also specify `--python-sdks-folder=`. ``` 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 @@ -233,6 +306,8 @@ These settings apply only when `--tag=package-2018-03-only --python` is specifie Please also specify `--python-sdks-folder=`. ``` 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 @@ -244,6 +319,8 @@ These settings apply only when `--tag=package-2017-07-only-extended --python` is Please also specify `--python-sdks-folder=`. ``` 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 @@ -255,6 +332,8 @@ These settings apply only when `--tag=package-2019-09-preview-only --python` is Please also specify `--python-sdks-folder=`. ``` 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