Skip to content

[AutoPR azure-mgmt-resource] Fix swagger KPI issue on additional property "tenantId" in deployment script with api-version 2020-10-01 #4302

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

Closed
wants to merge 1 commit into from
Closed

[AutoPR azure-mgmt-resource] Fix swagger KPI issue on additional property "tenantId" in deployment script with api-version 2020-10-01 #4302

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
69 changes: 43 additions & 26 deletions ...mgmt-resource/azure/mgmt/resource/deploymentscripts/v2019_10_01_preview/models/_models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,8 @@ class AzureCliScript(DeploymentScript):
~azure.mgmt.resource.deploymentscripts.v2019_10_01_preview.models.StorageAccountConfiguration
:param cleanup_preference: The clean up preference when the script
execution gets in a terminal state. Default setting is 'Always'. Possible
values include: 'Always', 'OnSuccess', 'OnExpiration'
values include: 'Always', 'OnSuccess', 'OnExpiration'. Default value:
"Always" .
:type cleanup_preference: str or
~azure.mgmt.resource.deploymentscripts.v2019_10_01_preview.models.CleanupOptions
:ivar provisioning_state: State of the script execution. This only appears
Expand Down Expand Up @@ -184,10 +185,10 @@ class AzureCliScript(DeploymentScript):
:param retention_interval: Required. Interval for which the service
retains the script resource after it reaches a terminal state. Resource
will be deleted when this duration expires. Duration is based on ISO 8601
pattern (for example P7D means one week).
pattern (for example P1D means one day).
:type retention_interval: timedelta
:param timeout: Maximum allowed script execution time specified in ISO
8601 format. Default value is PT1H
8601 format. Default value is P1D. Default value: "P1D" .
:type timeout: timedelta
:param az_cli_version: Required. Azure CLI module version to be used.
:type az_cli_version: str
Expand Down Expand Up @@ -239,7 +240,7 @@ def __init__(self, **kwargs):
super(AzureCliScript, self).__init__(**kwargs)
self.container_settings = kwargs.get('container_settings', None)
self.storage_account_settings = kwargs.get('storage_account_settings', None)
self.cleanup_preference = kwargs.get('cleanup_preference', None)
self.cleanup_preference = kwargs.get('cleanup_preference', "Always")
self.provisioning_state = None
self.status = None
self.outputs = None
Expand All @@ -250,7 +251,7 @@ def __init__(self, **kwargs):
self.environment_variables = kwargs.get('environment_variables', None)
self.force_update_tag = kwargs.get('force_update_tag', None)
self.retention_interval = kwargs.get('retention_interval', None)
self.timeout = kwargs.get('timeout', None)
self.timeout = kwargs.get('timeout', "P1D")
self.az_cli_version = kwargs.get('az_cli_version', None)
self.kind = 'AzureCLI'

Expand Down Expand Up @@ -291,7 +292,8 @@ class AzurePowerShellScript(DeploymentScript):
~azure.mgmt.resource.deploymentscripts.v2019_10_01_preview.models.StorageAccountConfiguration
:param cleanup_preference: The clean up preference when the script
execution gets in a terminal state. Default setting is 'Always'. Possible
values include: 'Always', 'OnSuccess', 'OnExpiration'
values include: 'Always', 'OnSuccess', 'OnExpiration'. Default value:
"Always" .
:type cleanup_preference: str or
~azure.mgmt.resource.deploymentscripts.v2019_10_01_preview.models.CleanupOptions
:ivar provisioning_state: State of the script execution. This only appears
Expand Down Expand Up @@ -325,10 +327,10 @@ class AzurePowerShellScript(DeploymentScript):
:param retention_interval: Required. Interval for which the service
retains the script resource after it reaches a terminal state. Resource
will be deleted when this duration expires. Duration is based on ISO 8601
pattern (for example P7D means one week).
pattern (for example P1D means one day).
:type retention_interval: timedelta
:param timeout: Maximum allowed script execution time specified in ISO
8601 format. Default value is PT1H
8601 format. Default value is P1D. Default value: "P1D" .
:type timeout: timedelta
:param az_power_shell_version: Required. Azure PowerShell module version
to be used.
Expand Down Expand Up @@ -381,7 +383,7 @@ def __init__(self, **kwargs):
super(AzurePowerShellScript, self).__init__(**kwargs)
self.container_settings = kwargs.get('container_settings', None)
self.storage_account_settings = kwargs.get('storage_account_settings', None)
self.cleanup_preference = kwargs.get('cleanup_preference', None)
self.cleanup_preference = kwargs.get('cleanup_preference', "Always")
self.provisioning_state = None
self.status = None
self.outputs = None
Expand All @@ -392,7 +394,7 @@ def __init__(self, **kwargs):
self.environment_variables = kwargs.get('environment_variables', None)
self.force_update_tag = kwargs.get('force_update_tag', None)
self.retention_interval = kwargs.get('retention_interval', None)
self.timeout = kwargs.get('timeout', None)
self.timeout = kwargs.get('timeout', "P1D")
self.az_power_shell_version = kwargs.get('az_power_shell_version', None)
self.kind = 'AzurePowerShell'

Expand Down Expand Up @@ -450,7 +452,8 @@ class DeploymentScriptPropertiesBase(Model):
~azure.mgmt.resource.deploymentscripts.v2019_10_01_preview.models.StorageAccountConfiguration
:param cleanup_preference: The clean up preference when the script
execution gets in a terminal state. Default setting is 'Always'. Possible
values include: 'Always', 'OnSuccess', 'OnExpiration'
values include: 'Always', 'OnSuccess', 'OnExpiration'. Default value:
"Always" .
:type cleanup_preference: str or
~azure.mgmt.resource.deploymentscripts.v2019_10_01_preview.models.CleanupOptions
:ivar provisioning_state: State of the script execution. This only appears
Expand Down Expand Up @@ -484,7 +487,7 @@ def __init__(self, **kwargs):
super(DeploymentScriptPropertiesBase, self).__init__(**kwargs)
self.container_settings = kwargs.get('container_settings', None)
self.storage_account_settings = kwargs.get('storage_account_settings', None)
self.cleanup_preference = kwargs.get('cleanup_preference', None)
self.cleanup_preference = kwargs.get('cleanup_preference', "Always")
self.provisioning_state = None
self.status = None
self.outputs = None
Expand Down Expand Up @@ -663,19 +666,26 @@ def __init__(self, **kwargs):
class ManagedServiceIdentity(Model):
"""Managed identity generic object.

Variables are only populated by the server, and will be ignored when
sending a request.

:param type: Type of the managed identity. Possible values include:
'UserAssigned'
:type type: str or
~azure.mgmt.resource.deploymentscripts.v2019_10_01_preview.models.ManagedServiceIdentityType
:param tenant_id: ID of the Azure Active Directory.
:type tenant_id: str
:ivar tenant_id: ID of the Azure Active Directory.
:vartype tenant_id: str
:param user_assigned_identities: The list of user-assigned managed
identities associated with the resource. Key is the Azure resource Id of
the managed identity.
:type user_assigned_identities: dict[str,
~azure.mgmt.resource.deploymentscripts.v2019_10_01_preview.models.UserAssignedIdentity]
"""

_validation = {
'tenant_id': {'readonly': True},
}

_attribute_map = {
'type': {'key': 'type', 'type': 'str'},
'tenant_id': {'key': 'tenantId', 'type': 'str'},
Expand All @@ -685,7 +695,7 @@ class ManagedServiceIdentity(Model):
def __init__(self, **kwargs):
super(ManagedServiceIdentity, self).__init__(**kwargs)
self.type = kwargs.get('type', None)
self.tenant_id = kwargs.get('tenant_id', None)
self.tenant_id = None
self.user_assigned_identities = kwargs.get('user_assigned_identities', None)


Expand Down Expand Up @@ -716,10 +726,10 @@ class ScriptConfigurationBase(Model):
:param retention_interval: Required. Interval for which the service
retains the script resource after it reaches a terminal state. Resource
will be deleted when this duration expires. Duration is based on ISO 8601
pattern (for example P7D means one week).
pattern (for example P1D means one day).
:type retention_interval: timedelta
:param timeout: Maximum allowed script execution time specified in ISO
8601 format. Default value is PT1H
8601 format. Default value is P1D. Default value: "P1D" .
:type timeout: timedelta
"""

Expand Down Expand Up @@ -748,7 +758,7 @@ def __init__(self, **kwargs):
self.environment_variables = kwargs.get('environment_variables', None)
self.force_update_tag = kwargs.get('force_update_tag', None)
self.retention_interval = kwargs.get('retention_interval', None)
self.timeout = kwargs.get('timeout', None)
self.timeout = kwargs.get('timeout', "P1D")


class ScriptLog(AzureResourceBase):
Expand Down Expand Up @@ -890,8 +900,7 @@ class SystemData(Model):
'ManagedIdentity', 'Key'
:type last_modified_by_type: str or
~azure.mgmt.resource.deploymentscripts.v2019_10_01_preview.models.CreatedByType
:param last_modified_at: The type of identity that last modified the
resource.
:param last_modified_at: The timestamp of resource last modification (UTC)
:type last_modified_at: datetime
"""

Expand All @@ -917,19 +926,27 @@ def __init__(self, **kwargs):
class UserAssignedIdentity(Model):
"""User-assigned managed identity.

:param principal_id: Azure Active Directory principal ID associated with
Variables are only populated by the server, and will be ignored when
sending a request.

:ivar principal_id: Azure Active Directory principal ID associated with
this identity.
:type principal_id: str
:param client_id: Client App Id associated with this identity.
:type client_id: str
:vartype principal_id: str
:ivar client_id: Client App Id associated with this identity.
:vartype client_id: str
"""

_validation = {
'principal_id': {'readonly': True},
'client_id': {'readonly': True},
}

_attribute_map = {
'principal_id': {'key': 'principalId', 'type': 'str'},
'client_id': {'key': 'clientId', 'type': 'str'},
}

def __init__(self, **kwargs):
super(UserAssignedIdentity, self).__init__(**kwargs)
self.principal_id = kwargs.get('principal_id', None)
self.client_id = kwargs.get('client_id', None)
self.principal_id = None
self.client_id = None
Loading