From cf6ba01a439ce11f402b020c6782ddc015f17aa4 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Fri, 16 Nov 2018 19:59:26 +0000 Subject: [PATCH 1/3] Generated from c5e3d7fb237ee96094a2198b3515dc48c03ceded update Managed Service Identity api version to 2018-11-30, the differnt from previous api-version is the clientSecretUrl can be null if identity is user assigned --- .../msi/managed_service_identity_client.py | 2 +- .../azure/mgmt/msi/models/identity.py | 4 +- .../azure/mgmt/msi/models/identity_py3.py | 4 +- .../azure/mgmt/msi/operations/operations.py | 11 +++-- .../user_assigned_identities_operations.py | 41 +++++++++---------- azure-mgmt-msi/azure/mgmt/msi/version.py | 2 +- 6 files changed, 32 insertions(+), 32 deletions(-) diff --git a/azure-mgmt-msi/azure/mgmt/msi/managed_service_identity_client.py b/azure-mgmt-msi/azure/mgmt/msi/managed_service_identity_client.py index f1804dfe67e9..d128b05dac0d 100644 --- a/azure-mgmt-msi/azure/mgmt/msi/managed_service_identity_client.py +++ b/azure-mgmt-msi/azure/mgmt/msi/managed_service_identity_client.py @@ -78,7 +78,7 @@ def __init__( super(ManagedServiceIdentityClient, self).__init__(self.config.credentials, self.config) client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} - self.api_version = '2015-08-31-preview' + self.api_version = '2018-11-30' self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) diff --git a/azure-mgmt-msi/azure/mgmt/msi/models/identity.py b/azure-mgmt-msi/azure/mgmt/msi/models/identity.py index ab8be27563c5..8de65d21e8e7 100644 --- a/azure-mgmt-msi/azure/mgmt/msi/models/identity.py +++ b/azure-mgmt-msi/azure/mgmt/msi/models/identity.py @@ -35,7 +35,9 @@ class Identity(Model): random generated UUID by MSI. :vartype client_id: str :ivar client_secret_url: The ManagedServiceIdentity DataPlane URL that - can be queried to obtain the identity credentials. + can be queried to obtain the identity credentials. If identity is user + assigned, the clientSecretUrl is null, otherwise the clientSecretUrl is + not null :vartype client_secret_url: str :ivar type: The type of resource i.e. Microsoft.ManagedIdentity/userAssignedIdentities. Possible values include: diff --git a/azure-mgmt-msi/azure/mgmt/msi/models/identity_py3.py b/azure-mgmt-msi/azure/mgmt/msi/models/identity_py3.py index 9bdc6aeac153..88e7cbcd1b1f 100644 --- a/azure-mgmt-msi/azure/mgmt/msi/models/identity_py3.py +++ b/azure-mgmt-msi/azure/mgmt/msi/models/identity_py3.py @@ -35,7 +35,9 @@ class Identity(Model): random generated UUID by MSI. :vartype client_id: str :ivar client_secret_url: The ManagedServiceIdentity DataPlane URL that - can be queried to obtain the identity credentials. + can be queried to obtain the identity credentials. If identity is user + assigned, the clientSecretUrl is null, otherwise the clientSecretUrl is + not null :vartype client_secret_url: str :ivar type: The type of resource i.e. Microsoft.ManagedIdentity/userAssignedIdentities. Possible values include: diff --git a/azure-mgmt-msi/azure/mgmt/msi/operations/operations.py b/azure-mgmt-msi/azure/mgmt/msi/operations/operations.py index 11e7cf98f86a..495de7a8d83d 100644 --- a/azure-mgmt-msi/azure/mgmt/msi/operations/operations.py +++ b/azure-mgmt-msi/azure/mgmt/msi/operations/operations.py @@ -23,7 +23,7 @@ class Operations(object): :param config: Configuration of service client. :param serializer: An object model serializer. :param deserializer: An object model deserializer. - :ivar api_version: Version of API to invoke. Constant value: "2015-08-31-preview". + :ivar api_version: Version of API to invoke. Constant value: "2018-11-30". """ models = models @@ -33,7 +33,7 @@ def __init__(self, client, config, serializer, deserializer): self._client = client self._serialize = serializer self._deserialize = deserializer - self.api_version = "2015-08-31-preview" + self.api_version = "2018-11-30" self.config = config @@ -67,7 +67,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -76,9 +76,8 @@ def internal_paging(next_link=None, raw=False): header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send( - request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: exp = CloudError(response) diff --git a/azure-mgmt-msi/azure/mgmt/msi/operations/user_assigned_identities_operations.py b/azure-mgmt-msi/azure/mgmt/msi/operations/user_assigned_identities_operations.py index e01790fc5582..944d8cabf793 100644 --- a/azure-mgmt-msi/azure/mgmt/msi/operations/user_assigned_identities_operations.py +++ b/azure-mgmt-msi/azure/mgmt/msi/operations/user_assigned_identities_operations.py @@ -23,7 +23,7 @@ class UserAssignedIdentitiesOperations(object): :param config: Configuration of service client. :param serializer: An object model serializer. :param deserializer: An object model deserializer. - :ivar api_version: Version of API to invoke. Constant value: "2015-08-31-preview". + :ivar api_version: Version of API to invoke. Constant value: "2018-11-30". """ models = models @@ -33,7 +33,7 @@ def __init__(self, client, config, serializer, deserializer): self._client = client self._serialize = serializer self._deserialize = deserializer - self.api_version = "2015-08-31-preview" + self.api_version = "2018-11-30" self.config = config @@ -72,7 +72,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -81,9 +81,8 @@ def internal_paging(next_link=None, raw=False): header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send( - request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: exp = CloudError(response) @@ -142,7 +141,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -151,9 +150,8 @@ def internal_paging(next_link=None, raw=False): header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send( - request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: exp = CloudError(response) @@ -214,6 +212,7 @@ def create_or_update( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) @@ -226,9 +225,8 @@ def create_or_update( body_content = self._serialize.body(parameters, 'Identity') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 201]: exp = CloudError(response) @@ -289,6 +287,7 @@ def update( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) @@ -301,9 +300,8 @@ def update( body_content = self._serialize.body(parameters, 'Identity') # Construct and send request - request = self._client.patch(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.patch(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: exp = CloudError(response) @@ -356,7 +354,7 @@ def get( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -365,8 +363,8 @@ def get( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: exp = CloudError(response) @@ -418,7 +416,6 @@ def delete( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -427,8 +424,8 @@ def delete( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.delete(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 204]: exp = CloudError(response) diff --git a/azure-mgmt-msi/azure/mgmt/msi/version.py b/azure-mgmt-msi/azure/mgmt/msi/version.py index 9bd1dfac7ecb..b5ef0a024834 100644 --- a/azure-mgmt-msi/azure/mgmt/msi/version.py +++ b/azure-mgmt-msi/azure/mgmt/msi/version.py @@ -9,5 +9,5 @@ # regenerated. # -------------------------------------------------------------------------- -VERSION = "0.2.0" +VERSION = "2018-11-30" From 8a502139d460753e989651e07d060209b08fb374 Mon Sep 17 00:00:00 2001 From: azuresdkci Date: Fri, 16 Nov 2018 20:04:45 +0000 Subject: [PATCH 2/3] Packaging update of azure-mgmt-msi --- azure-mgmt-msi/MANIFEST.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/azure-mgmt-msi/MANIFEST.in b/azure-mgmt-msi/MANIFEST.in index bb37a2723dae..6ceb27f7a96e 100644 --- a/azure-mgmt-msi/MANIFEST.in +++ b/azure-mgmt-msi/MANIFEST.in @@ -1 +1,4 @@ include *.rst +include azure/__init__.py +include azure/mgmt/__init__.py + From 69519a7b5da35640f42b750327d6ec89172ec53d Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Tue, 27 Nov 2018 23:12:43 +0000 Subject: [PATCH 3/3] Generated from d191254c74aaea1bc9db348a4be70aedbfed96b1 feedback --- azure-mgmt-msi/azure/mgmt/msi/models/identity.py | 4 ++-- azure-mgmt-msi/azure/mgmt/msi/models/identity_py3.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/azure-mgmt-msi/azure/mgmt/msi/models/identity.py b/azure-mgmt-msi/azure/mgmt/msi/models/identity.py index 8de65d21e8e7..d3e39d6d9bab 100644 --- a/azure-mgmt-msi/azure/mgmt/msi/models/identity.py +++ b/azure-mgmt-msi/azure/mgmt/msi/models/identity.py @@ -36,8 +36,8 @@ class Identity(Model): :vartype client_id: str :ivar client_secret_url: The ManagedServiceIdentity DataPlane URL that can be queried to obtain the identity credentials. If identity is user - assigned, the clientSecretUrl is null, otherwise the clientSecretUrl is - not null + assigned, then the clientSecretUrl will not be present in the response, + otherwise it will be present. :vartype client_secret_url: str :ivar type: The type of resource i.e. Microsoft.ManagedIdentity/userAssignedIdentities. Possible values include: diff --git a/azure-mgmt-msi/azure/mgmt/msi/models/identity_py3.py b/azure-mgmt-msi/azure/mgmt/msi/models/identity_py3.py index 88e7cbcd1b1f..a24c023ab4d7 100644 --- a/azure-mgmt-msi/azure/mgmt/msi/models/identity_py3.py +++ b/azure-mgmt-msi/azure/mgmt/msi/models/identity_py3.py @@ -36,8 +36,8 @@ class Identity(Model): :vartype client_id: str :ivar client_secret_url: The ManagedServiceIdentity DataPlane URL that can be queried to obtain the identity credentials. If identity is user - assigned, the clientSecretUrl is null, otherwise the clientSecretUrl is - not null + assigned, then the clientSecretUrl will not be present in the response, + otherwise it will be present. :vartype client_secret_url: str :ivar type: The type of resource i.e. Microsoft.ManagedIdentity/userAssignedIdentities. Possible values include: