Skip to content

Commit 7ff60da

Browse files
AutorestCIlmazuel
authored andcommitted
[AutoPR] containerservices/resource-manager (#3097)
* Generated from 9efd958bbea2c84b6c5dfa98d5d598b43dcfba45 (#3096) modify the 2017-07-01 version * Generated from b8860f73880880a13c2491f965f2aa8e58a01822 (#3101) modify credentialResults keyName to kubeconfigs * Packaging
1 parent bebd997 commit 7ff60da

File tree

11 files changed

+74
-71
lines changed

11 files changed

+74
-71
lines changed

azure-mgmt-containerservice/HISTORY.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
33
Release History
44
===============
55

6+
4.2.1 (2018-08-08)
7+
++++++++++++++++++
8+
9+
**Bugfixes**
10+
11+
- Fix some invalid regexp
12+
- Fix invalid definition of CredentialResult
13+
614
4.2.0 (2018-07-30)
715
++++++++++++++++++
816

azure-mgmt-containerservice/README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ This is the Microsoft Azure Container Service Management Client Library.
66
Azure Resource Manager (ARM) is the next generation of management APIs that
77
replace the old Azure Service Management (ASM).
88

9-
This package has been tested with Python 2.7, 3.4, 3.5 and 3.6.
9+
This package has been tested with Python 2.7, 3.4, 3.5, 3.6 and 3.7.
1010

1111
For the older Azure Service Management (ASM) libraries, see
1212
`azure-servicemanagement-legacy <https://pypi.python.org/pypi/azure-servicemanagement-legacy>`__ library.

azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_linux_profile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class ContainerServiceLinuxProfile(Model):
2727
"""
2828

2929
_validation = {
30-
'admin_username': {'required': True, 'pattern': r'^[a-z][a-z0-9_-]*$'},
30+
'admin_username': {'required': True, 'pattern': r'^[A-Za-z][-A-Za-z0-9_]*$'},
3131
'ssh': {'required': True},
3232
}
3333

azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_linux_profile_py3.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class ContainerServiceLinuxProfile(Model):
2727
"""
2828

2929
_validation = {
30-
'admin_username': {'required': True, 'pattern': r'^[a-z][a-z0-9_-]*$'},
30+
'admin_username': {'required': True, 'pattern': r'^[A-Za-z][-A-Za-z0-9_]*$'},
3131
'ssh': {'required': True},
3232
}
3333

azure-mgmt-containerservice/azure/mgmt/containerservice/models/credential_results.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,19 @@ class CredentialResults(Model):
1818
Variables are only populated by the server, and will be ignored when
1919
sending a request.
2020
21-
:ivar values:
22-
:vartype values:
21+
:ivar kubeconfigs:
22+
:vartype kubeconfigs:
2323
list[~azure.mgmt.containerservice.models.CredentialResult]
2424
"""
2525

2626
_validation = {
27-
'values': {'readonly': True},
27+
'kubeconfigs': {'readonly': True},
2828
}
2929

3030
_attribute_map = {
31-
'values': {'key': 'values', 'type': '[CredentialResult]'},
31+
'kubeconfigs': {'key': 'kubeconfigs', 'type': '[CredentialResult]'},
3232
}
3333

3434
def __init__(self, **kwargs):
3535
super(CredentialResults, self).__init__(**kwargs)
36-
self.values = None
36+
self.kubeconfigs = None

azure-mgmt-containerservice/azure/mgmt/containerservice/models/credential_results_py3.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,19 @@ class CredentialResults(Model):
1818
Variables are only populated by the server, and will be ignored when
1919
sending a request.
2020
21-
:ivar values:
22-
:vartype values:
21+
:ivar kubeconfigs:
22+
:vartype kubeconfigs:
2323
list[~azure.mgmt.containerservice.models.CredentialResult]
2424
"""
2525

2626
_validation = {
27-
'values': {'readonly': True},
27+
'kubeconfigs': {'readonly': True},
2828
}
2929

3030
_attribute_map = {
31-
'values': {'key': 'values', 'type': '[CredentialResult]'},
31+
'kubeconfigs': {'key': 'kubeconfigs', 'type': '[CredentialResult]'},
3232
}
3333

3434
def __init__(self, **kwargs) -> None:
3535
super(CredentialResults, self).__init__(**kwargs)
36-
self.values = None
36+
self.kubeconfigs = None

azure-mgmt-containerservice/azure/mgmt/containerservice/operations/container_services_operations.py

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ def internal_paging(next_link=None, raw=False):
7878

7979
# Construct headers
8080
header_parameters = {}
81-
header_parameters['Content-Type'] = 'application/json; charset=utf-8'
81+
header_parameters['Accept'] = 'application/json'
8282
if self.config.generate_client_request_id:
8383
header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
8484
if custom_headers:
@@ -87,9 +87,8 @@ def internal_paging(next_link=None, raw=False):
8787
header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
8888

8989
# Construct and send request
90-
request = self._client.get(url, query_parameters)
91-
response = self._client.send(
92-
request, header_parameters, stream=False, **operation_config)
90+
request = self._client.get(url, query_parameters, header_parameters)
91+
response = self._client.send(request, stream=False, **operation_config)
9392

9493
if response.status_code not in [200]:
9594
exp = CloudError(response)
@@ -129,6 +128,7 @@ def _create_or_update_initial(
129128

130129
# Construct headers
131130
header_parameters = {}
131+
header_parameters['Accept'] = 'application/json'
132132
header_parameters['Content-Type'] = 'application/json; charset=utf-8'
133133
if self.config.generate_client_request_id:
134134
header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
@@ -141,9 +141,8 @@ def _create_or_update_initial(
141141
body_content = self._serialize.body(parameters, 'ContainerService')
142142

143143
# Construct and send request
144-
request = self._client.put(url, query_parameters)
145-
response = self._client.send(
146-
request, header_parameters, body_content, stream=False, **operation_config)
144+
request = self._client.put(url, query_parameters, header_parameters, body_content)
145+
response = self._client.send(request, stream=False, **operation_config)
147146

148147
if response.status_code not in [200, 201, 202]:
149148
exp = CloudError(response)
@@ -261,7 +260,7 @@ def get(
261260

262261
# Construct headers
263262
header_parameters = {}
264-
header_parameters['Content-Type'] = 'application/json; charset=utf-8'
263+
header_parameters['Accept'] = 'application/json'
265264
if self.config.generate_client_request_id:
266265
header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
267266
if custom_headers:
@@ -270,8 +269,8 @@ def get(
270269
header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
271270

272271
# Construct and send request
273-
request = self._client.get(url, query_parameters)
274-
response = self._client.send(request, header_parameters, stream=False, **operation_config)
272+
request = self._client.get(url, query_parameters, header_parameters)
273+
response = self._client.send(request, stream=False, **operation_config)
275274

276275
if response.status_code not in [200]:
277276
exp = CloudError(response)
@@ -310,7 +309,6 @@ def _delete_initial(
310309

311310
# Construct headers
312311
header_parameters = {}
313-
header_parameters['Content-Type'] = 'application/json; charset=utf-8'
314312
if self.config.generate_client_request_id:
315313
header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
316314
if custom_headers:
@@ -319,8 +317,8 @@ def _delete_initial(
319317
header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
320318

321319
# Construct and send request
322-
request = self._client.delete(url, query_parameters)
323-
response = self._client.send(request, header_parameters, stream=False, **operation_config)
320+
request = self._client.delete(url, query_parameters, header_parameters)
321+
response = self._client.send(request, stream=False, **operation_config)
324322

325323
if response.status_code not in [202, 204]:
326324
exp = CloudError(response)
@@ -424,7 +422,7 @@ def internal_paging(next_link=None, raw=False):
424422

425423
# Construct headers
426424
header_parameters = {}
427-
header_parameters['Content-Type'] = 'application/json; charset=utf-8'
425+
header_parameters['Accept'] = 'application/json'
428426
if self.config.generate_client_request_id:
429427
header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
430428
if custom_headers:
@@ -433,9 +431,8 @@ def internal_paging(next_link=None, raw=False):
433431
header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
434432

435433
# Construct and send request
436-
request = self._client.get(url, query_parameters)
437-
response = self._client.send(
438-
request, header_parameters, stream=False, **operation_config)
434+
request = self._client.get(url, query_parameters, header_parameters)
435+
response = self._client.send(request, stream=False, **operation_config)
439436

440437
if response.status_code not in [200]:
441438
exp = CloudError(response)
@@ -498,7 +495,7 @@ def list_orchestrators(
498495

499496
# Construct headers
500497
header_parameters = {}
501-
header_parameters['Content-Type'] = 'application/json; charset=utf-8'
498+
header_parameters['Accept'] = 'application/json'
502499
if self.config.generate_client_request_id:
503500
header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
504501
if custom_headers:
@@ -507,8 +504,8 @@ def list_orchestrators(
507504
header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
508505

509506
# Construct and send request
510-
request = self._client.get(url, query_parameters)
511-
response = self._client.send(request, header_parameters, stream=False, **operation_config)
507+
request = self._client.get(url, query_parameters, header_parameters)
508+
response = self._client.send(request, stream=False, **operation_config)
512509

513510
if response.status_code not in [200]:
514511
exp = CloudError(response)

0 commit comments

Comments
 (0)