Skip to content

[AutoPR graphrbac/data-plane] add customKeyIdentifier to password credential #3833

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

Merged
merged 3 commits into from
Nov 27, 2018
Merged

[AutoPR graphrbac/data-plane] add customKeyIdentifier to password credential #3833

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b0e701d
Generated from 2d1a131d6bc24477750e780c70ad4384e6e5927d
AutorestCI Nov 20, 2018
d5a23a2
Generated from 1c42b12d70502f95d2f42f1d421ce53f425e7ef6
AutorestCI Nov 25, 2018
43672b2
Generated from 74a0ba38241f5574f515beb159638e286b44bd6f
AutorestCI Nov 25, 2018
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
9 changes: 9 additions & 0 deletions azure-graphrbac/azure/graphrbac/models/application.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,11 @@ class Application(DirectoryObject):
of required resource access drives the consent experience.
:type required_resource_access:
list[~azure.graphrbac.models.RequiredResourceAccess]
:param key_credentials: A collection of KeyCredential objects.
:type key_credentials: list[~azure.graphrbac.models.KeyCredential]
:param password_credentials: A collection of PasswordCredential objects
:type password_credentials:
list[~azure.graphrbac.models.PasswordCredential]
"""

_validation = {
Expand All @@ -81,6 +86,8 @@ class Application(DirectoryObject):
'homepage': {'key': 'homepage', 'type': 'str'},
'oauth2_allow_implicit_flow': {'key': 'oauth2AllowImplicitFlow', 'type': 'bool'},
'required_resource_access': {'key': 'requiredResourceAccess', 'type': '[RequiredResourceAccess]'},
'key_credentials': {'key': 'keyCredentials', 'type': '[KeyCredential]'},
'password_credentials': {'key': 'passwordCredentials', 'type': '[PasswordCredential]'},
}

def __init__(self, **kwargs):
Expand All @@ -95,4 +102,6 @@ def __init__(self, **kwargs):
self.homepage = kwargs.get('homepage', None)
self.oauth2_allow_implicit_flow = kwargs.get('oauth2_allow_implicit_flow', None)
self.required_resource_access = kwargs.get('required_resource_access', None)
self.key_credentials = kwargs.get('key_credentials', None)
self.password_credentials = kwargs.get('password_credentials', None)
self.object_type = 'Application'
11 changes: 10 additions & 1 deletion azure-graphrbac/azure/graphrbac/models/application_py3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,11 @@ class Application(DirectoryObject):
of required resource access drives the consent experience.
:type required_resource_access:
list[~azure.graphrbac.models.RequiredResourceAccess]
:param key_credentials: A collection of KeyCredential objects.
:type key_credentials: list[~azure.graphrbac.models.KeyCredential]
:param password_credentials: A collection of PasswordCredential objects
:type password_credentials:
list[~azure.graphrbac.models.PasswordCredential]
"""

_validation = {
Expand All @@ -81,9 +86,11 @@ class Application(DirectoryObject):
'homepage': {'key': 'homepage', 'type': 'str'},
'oauth2_allow_implicit_flow': {'key': 'oauth2AllowImplicitFlow', 'type': 'bool'},
'required_resource_access': {'key': 'requiredResourceAccess', 'type': '[RequiredResourceAccess]'},
'key_credentials': {'key': 'keyCredentials', 'type': '[KeyCredential]'},
'password_credentials': {'key': 'passwordCredentials', 'type': '[PasswordCredential]'},
}

def __init__(self, *, additional_properties=None, app_id: str=None, app_roles=None, app_permissions=None, available_to_other_tenants: bool=None, display_name: str=None, identifier_uris=None, reply_urls=None, homepage: str=None, oauth2_allow_implicit_flow: bool=None, required_resource_access=None, **kwargs) -> None:
def __init__(self, *, additional_properties=None, app_id: str=None, app_roles=None, app_permissions=None, available_to_other_tenants: bool=None, display_name: str=None, identifier_uris=None, reply_urls=None, homepage: str=None, oauth2_allow_implicit_flow: bool=None, required_resource_access=None, key_credentials=None, password_credentials=None, **kwargs) -> None:
super(Application, self).__init__(additional_properties=additional_properties, **kwargs)
self.app_id = app_id
self.app_roles = app_roles
Expand All @@ -95,4 +102,6 @@ def __init__(self, *, additional_properties=None, app_id: str=None, app_roles=No
self.homepage = homepage
self.oauth2_allow_implicit_flow = oauth2_allow_implicit_flow
self.required_resource_access = required_resource_access
self.key_credentials = key_credentials
self.password_credentials = password_credentials
self.object_type = 'Application'
4 changes: 2 additions & 2 deletions 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 @@ -32,7 +32,7 @@ class KeyCredential(Model):
'Symmetric'.
:type type: str
:param custom_key_identifier: Custom Key Identifier
:type custom_key_identifier: bytearray
:type custom_key_identifier: str
"""

_attribute_map = {
Expand All @@ -43,7 +43,7 @@ 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'},
'custom_key_identifier': {'key': 'customKeyIdentifier', 'type': 'str'},
}

def __init__(self, **kwargs):
Expand Down
6 changes: 3 additions & 3 deletions azure-graphrbac/azure/graphrbac/models/key_credential_py3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class KeyCredential(Model):
'Symmetric'.
:type type: str
:param custom_key_identifier: Custom Key Identifier
:type custom_key_identifier: bytearray
:type custom_key_identifier: str
"""

_attribute_map = {
Expand All @@ -43,10 +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'},
'custom_key_identifier': {'key': 'customKeyIdentifier', 'type': 'str'},
}

def __init__(self, *, additional_properties=None, start_date=None, end_date=None, value: str=None, key_id: str=None, usage: str=None, type: str=None, custom_key_identifier: bytearray=None, **kwargs) -> None:
def __init__(self, *, additional_properties=None, start_date=None, end_date=None, value: str=None, key_id: str=None, usage: str=None, type: str=None, custom_key_identifier: str=None, **kwargs) -> None:
super(KeyCredential, self).__init__(**kwargs)
self.additional_properties = additional_properties
self.start_date = start_date
Expand Down
4 changes: 4 additions & 0 deletions azure-graphrbac/azure/graphrbac/models/password_credential.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ class PasswordCredential(Model):
:type key_id: str
:param value: Key value.
:type value: str
:param custom_key_identifier: Custom Key Identifier
:type custom_key_identifier: bytearray
"""

_attribute_map = {
Expand All @@ -34,6 +36,7 @@ class PasswordCredential(Model):
'end_date': {'key': 'endDate', 'type': 'iso-8601'},
'key_id': {'key': 'keyId', 'type': 'str'},
'value': {'key': 'value', 'type': 'str'},
'custom_key_identifier': {'key': 'customKeyIdentifier', 'type': 'bytearray'},
}

def __init__(self, **kwargs):
Expand All @@ -43,3 +46,4 @@ def __init__(self, **kwargs):
self.end_date = kwargs.get('end_date', None)
self.key_id = kwargs.get('key_id', None)
self.value = kwargs.get('value', None)
self.custom_key_identifier = kwargs.get('custom_key_identifier', None)
6 changes: 5 additions & 1 deletion azure-graphrbac/azure/graphrbac/models/password_credential_py3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ class PasswordCredential(Model):
:type key_id: str
:param value: Key value.
:type value: str
:param custom_key_identifier: Custom Key Identifier
:type custom_key_identifier: bytearray
"""

_attribute_map = {
Expand All @@ -34,12 +36,14 @@ class PasswordCredential(Model):
'end_date': {'key': 'endDate', 'type': 'iso-8601'},
'key_id': {'key': 'keyId', 'type': 'str'},
'value': {'key': 'value', 'type': 'str'},
'custom_key_identifier': {'key': 'customKeyIdentifier', 'type': 'bytearray'},
}

def __init__(self, *, additional_properties=None, start_date=None, end_date=None, key_id: str=None, value: str=None, **kwargs) -> None:
def __init__(self, *, additional_properties=None, start_date=None, end_date=None, key_id: str=None, value: str=None, custom_key_identifier: bytearray=None, **kwargs) -> None:
super(PasswordCredential, self).__init__(**kwargs)
self.additional_properties = additional_properties
self.start_date = start_date
self.end_date = end_date
self.key_id = key_id
self.value = value
self.custom_key_identifier = custom_key_identifier