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

[AutoPR graphrbac/data-plane] Added custom key identifier #2013

Merged
merged 1 commit into from
Feb 21, 2018
Merged

[AutoPR graphrbac/data-plane] Added custom key identifier #2013

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion azure-graphrbac/azure/graphrbac/models/key_credential.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ class KeyCredential(Model):
:param type: Type. Acceptable values are 'AsymmetricX509Cert' and
'Symmetric'.
:type type: str
:param custom_key_identifier: Custom Key Identifier
:type custom_key_identifier: bytearray
"""

_attribute_map = {
Expand All @@ -41,9 +43,10 @@ class KeyCredential(Model):
'key_id': {'key': 'keyId', 'type': 'str'},
'usage': {'key': 'usage', 'type': 'str'},
'type': {'key': 'type', 'type': 'str'},
'custom_key_identifier': {'key': 'customKeyIdentifier', 'type': 'bytearray'},
}

def __init__(self, additional_properties=None, start_date=None, end_date=None, value=None, key_id=None, usage=None, type=None):
def __init__(self, additional_properties=None, start_date=None, end_date=None, value=None, key_id=None, usage=None, type=None, custom_key_identifier=None):
super(KeyCredential, self).__init__()
self.additional_properties = additional_properties
self.start_date = start_date
Expand All @@ -52,3 +55,4 @@ def __init__(self, additional_properties=None, start_date=None, end_date=None, v
self.key_id = key_id
self.usage = usage
self.type = type
self.custom_key_identifier = custom_key_identifier
35 changes: 23 additions & 12 deletions azure-graphrbac/azure/graphrbac/operations/applications_operations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class ApplicationsOperations(object):
:param client: Client for service requests.
:param config: Configuration of service client.
:param serializer: An object model serializer.
:param deserializer: An objec model deserializer.
:param deserializer: An object model deserializer.
:ivar api_version: Client API version. Constant value: "1.6".
"""

Expand Down Expand Up @@ -54,7 +54,7 @@ def create(
:class:`GraphErrorException<azure.graphrbac.models.GraphErrorException>`
"""
# Construct URL
url = '/{tenantID}/applications'
url = self.create.metadata['url']
path_format_arguments = {
'tenantID': self._serialize.url("self.config.tenant_id", self.config.tenant_id, 'str')
}
Expand Down Expand Up @@ -95,6 +95,7 @@ def create(
return client_raw_response

return deserialized
create.metadata = {'url': '/{tenantID}/applications'}

def list(
self, filter=None, custom_headers=None, raw=False, **operation_config):
Expand All @@ -117,7 +118,7 @@ def internal_paging(next_link=None, raw=False):

if not next_link:
# Construct URL
url = '/{tenantID}/applications'
url = self.list.metadata['url']
path_format_arguments = {
'tenantID': self._serialize.url("self.config.tenant_id", self.config.tenant_id, 'str')
}
Expand Down Expand Up @@ -168,6 +169,7 @@ def internal_paging(next_link=None, raw=False):
return client_raw_response

return deserialized
list.metadata = {'url': '/{tenantID}/applications'}

def delete(
self, application_object_id, custom_headers=None, raw=False, **operation_config):
Expand All @@ -186,7 +188,7 @@ def delete(
:class:`GraphErrorException<azure.graphrbac.models.GraphErrorException>`
"""
# Construct URL
url = '/{tenantID}/applications/{applicationObjectId}'
url = self.delete.metadata['url']
path_format_arguments = {
'applicationObjectId': self._serialize.url("application_object_id", application_object_id, 'str'),
'tenantID': self._serialize.url("self.config.tenant_id", self.config.tenant_id, 'str')
Expand Down Expand Up @@ -217,6 +219,7 @@ def delete(
if raw:
client_raw_response = ClientRawResponse(None, response)
return client_raw_response
delete.metadata = {'url': '/{tenantID}/applications/{applicationObjectId}'}

def get(
self, application_object_id, custom_headers=None, raw=False, **operation_config):
Expand All @@ -236,7 +239,7 @@ def get(
:class:`GraphErrorException<azure.graphrbac.models.GraphErrorException>`
"""
# Construct URL
url = '/{tenantID}/applications/{applicationObjectId}'
url = self.get.metadata['url']
path_format_arguments = {
'applicationObjectId': self._serialize.url("application_object_id", application_object_id, 'str'),
'tenantID': self._serialize.url("self.config.tenant_id", self.config.tenant_id, 'str')
Expand Down Expand Up @@ -274,6 +277,7 @@ def get(
return client_raw_response

return deserialized
get.metadata = {'url': '/{tenantID}/applications/{applicationObjectId}'}

def patch(
self, application_object_id, parameters, custom_headers=None, raw=False, **operation_config):
Expand All @@ -294,7 +298,7 @@ def patch(
:class:`GraphErrorException<azure.graphrbac.models.GraphErrorException>`
"""
# Construct URL
url = '/{tenantID}/applications/{applicationObjectId}'
url = self.patch.metadata['url']
path_format_arguments = {
'applicationObjectId': self._serialize.url("application_object_id", application_object_id, 'str'),
'tenantID': self._serialize.url("self.config.tenant_id", self.config.tenant_id, 'str')
Expand Down Expand Up @@ -329,6 +333,7 @@ def patch(
if raw:
client_raw_response = ClientRawResponse(None, response)
return client_raw_response
patch.metadata = {'url': '/{tenantID}/applications/{applicationObjectId}'}

def list_owners(
self, application_object_id, custom_headers=None, raw=False, **operation_config):
Expand All @@ -355,7 +360,7 @@ def internal_paging(next_link=None, raw=False):

if not next_link:
# Construct URL
url = '/{tenantID}/applications/{applicationObjectId}/owners'
url = self.list_owners.metadata['url']
path_format_arguments = {
'applicationObjectId': self._serialize.url("application_object_id", application_object_id, 'str'),
'tenantID': self._serialize.url("self.config.tenant_id", self.config.tenant_id, 'str')
Expand Down Expand Up @@ -399,6 +404,7 @@ def internal_paging(next_link=None, raw=False):
return client_raw_response

return deserialized
list_owners.metadata = {'url': '/{tenantID}/applications/{applicationObjectId}/owners'}

def add_owner(
self, application_object_id, url, additional_properties=None, custom_headers=None, raw=False, **operation_config):
Expand Down Expand Up @@ -429,7 +435,7 @@ def add_owner(
parameters = models.ApplicationAddOwnerParameters(additional_properties=additional_properties, url=url)

# Construct URL
url = '/{tenantID}/applications/{applicationObjectId}/$links/owners'
url = self.add_owner.metadata['url']
path_format_arguments = {
'applicationObjectId': self._serialize.url("application_object_id", application_object_id, 'str'),
'tenantID': self._serialize.url("self.config.tenant_id", self.config.tenant_id, 'str')
Expand Down Expand Up @@ -464,6 +470,7 @@ def add_owner(
if raw:
client_raw_response = ClientRawResponse(None, response)
return client_raw_response
add_owner.metadata = {'url': '/{tenantID}/applications/{applicationObjectId}/$links/owners'}

def list_key_credentials(
self, application_object_id, custom_headers=None, raw=False, **operation_config):
Expand All @@ -486,7 +493,7 @@ def internal_paging(next_link=None, raw=False):

if not next_link:
# Construct URL
url = '/{tenantID}/applications/{applicationObjectId}/keyCredentials'
url = self.list_key_credentials.metadata['url']
path_format_arguments = {
'applicationObjectId': self._serialize.url("application_object_id", application_object_id, 'str'),
'tenantID': self._serialize.url("self.config.tenant_id", self.config.tenant_id, 'str')
Expand Down Expand Up @@ -530,6 +537,7 @@ def internal_paging(next_link=None, raw=False):
return client_raw_response

return deserialized
list_key_credentials.metadata = {'url': '/{tenantID}/applications/{applicationObjectId}/keyCredentials'}

def update_key_credentials(
self, application_object_id, value, custom_headers=None, raw=False, **operation_config):
Expand All @@ -552,7 +560,7 @@ def update_key_credentials(
parameters = models.KeyCredentialsUpdateParameters(value=value)

# Construct URL
url = '/{tenantID}/applications/{applicationObjectId}/keyCredentials'
url = self.update_key_credentials.metadata['url']
path_format_arguments = {
'applicationObjectId': self._serialize.url("application_object_id", application_object_id, 'str'),
'tenantID': self._serialize.url("self.config.tenant_id", self.config.tenant_id, 'str')
Expand Down Expand Up @@ -587,6 +595,7 @@ def update_key_credentials(
if raw:
client_raw_response = ClientRawResponse(None, response)
return client_raw_response
update_key_credentials.metadata = {'url': '/{tenantID}/applications/{applicationObjectId}/keyCredentials'}

def list_password_credentials(
self, application_object_id, custom_headers=None, raw=False, **operation_config):
Expand All @@ -609,7 +618,7 @@ def internal_paging(next_link=None, raw=False):

if not next_link:
# Construct URL
url = '/{tenantID}/applications/{applicationObjectId}/passwordCredentials'
url = self.list_password_credentials.metadata['url']
path_format_arguments = {
'applicationObjectId': self._serialize.url("application_object_id", application_object_id, 'str'),
'tenantID': self._serialize.url("self.config.tenant_id", self.config.tenant_id, 'str')
Expand Down Expand Up @@ -653,6 +662,7 @@ def internal_paging(next_link=None, raw=False):
return client_raw_response

return deserialized
list_password_credentials.metadata = {'url': '/{tenantID}/applications/{applicationObjectId}/passwordCredentials'}

def update_password_credentials(
self, application_object_id, value, custom_headers=None, raw=False, **operation_config):
Expand All @@ -675,7 +685,7 @@ def update_password_credentials(
parameters = models.PasswordCredentialsUpdateParameters(value=value)

# Construct URL
url = '/{tenantID}/applications/{applicationObjectId}/passwordCredentials'
url = self.update_password_credentials.metadata['url']
path_format_arguments = {
'applicationObjectId': self._serialize.url("application_object_id", application_object_id, 'str'),
'tenantID': self._serialize.url("self.config.tenant_id", self.config.tenant_id, 'str')
Expand Down Expand Up @@ -710,3 +720,4 @@ def update_password_credentials(
if raw:
client_raw_response = ClientRawResponse(None, response)
return client_raw_response
update_password_credentials.metadata = {'url': '/{tenantID}/applications/{applicationObjectId}/passwordCredentials'}
8 changes: 5 additions & 3 deletions azure-graphrbac/azure/graphrbac/operations/domains_operations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class DomainsOperations(object):
:param client: Client for service requests.
:param config: Configuration of service client.
:param serializer: An object model serializer.
:param deserializer: An objec model deserializer.
:param deserializer: An object model deserializer.
:ivar api_version: Client API version. Constant value: "1.6".
"""

Expand Down Expand Up @@ -57,7 +57,7 @@ def internal_paging(next_link=None, raw=False):

if not next_link:
# Construct URL
url = '/{tenantID}/domains'
url = self.list.metadata['url']
path_format_arguments = {
'tenantID': self._serialize.url("self.config.tenant_id", self.config.tenant_id, 'str')
}
Expand Down Expand Up @@ -104,6 +104,7 @@ def internal_paging(next_link=None, raw=False):
return client_raw_response

return deserialized
list.metadata = {'url': '/{tenantID}/domains'}

def get(
self, domain_name, custom_headers=None, raw=False, **operation_config):
Expand All @@ -122,7 +123,7 @@ def get(
:raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
"""
# Construct URL
url = '/{tenantID}/domains/{domainName}'
url = self.get.metadata['url']
path_format_arguments = {
'domainName': self._serialize.url("domain_name", domain_name, 'str'),
'tenantID': self._serialize.url("self.config.tenant_id", self.config.tenant_id, 'str')
Expand Down Expand Up @@ -162,3 +163,4 @@ def get(
return client_raw_response

return deserialized
get.metadata = {'url': '/{tenantID}/domains/{domainName}'}
Loading