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.

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

[ReleasePR azure-mgmt-resource] [Resources] Fix deployment validate response (urgent) #10821

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
from ._models_py3 import AzureResourceBase
from ._models_py3 import ContainerConfiguration
from ._models_py3 import DeploymentScript
from ._models_py3 import DeploymentScriptUpdateParameter
from ._models_py3 import DeploymentScriptsError, DeploymentScriptsErrorException
from ._models_py3 import DeploymentScriptUpdateParameter
from ._models_py3 import EnvironmentVariable
from ._models_py3 import ErrorAdditionalInfo
from ._models_py3 import ErrorResponse
Expand All @@ -32,8 +32,8 @@
from ._models import AzureResourceBase
from ._models import ContainerConfiguration
from ._models import DeploymentScript
from ._models import DeploymentScriptUpdateParameter
from ._models import DeploymentScriptsError, DeploymentScriptsErrorException
from ._models import DeploymentScriptUpdateParameter
from ._models import EnvironmentVariable
from ._models import ErrorAdditionalInfo
from ._models import ErrorResponse
Expand All @@ -57,8 +57,8 @@
'AzureResourceBase',
'ContainerConfiguration',
'DeploymentScript',
'DeploymentScriptUpdateParameter',
'DeploymentScriptsError', 'DeploymentScriptsErrorException',
'DeploymentScriptUpdateParameter',
'EnvironmentVariable',
'ErrorAdditionalInfo',
'ErrorResponse',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -475,6 +475,35 @@ def __init__(self, **kwargs):
self.outputs = None


class DeploymentScriptsError(Model):
"""Deployment scripts error response.

:param error:
:type error:
~azure.mgmt.resource.deploymentscripts.v2019_10_preview.models.ErrorResponse
"""

_attribute_map = {
'error': {'key': 'error', 'type': 'ErrorResponse'},
}

def __init__(self, **kwargs):
super(DeploymentScriptsError, self).__init__(**kwargs)
self.error = kwargs.get('error', None)


class DeploymentScriptsErrorException(HttpOperationError):
"""Server responsed with exception of type: 'DeploymentScriptsError'.

:param deserialize: A deserializer
:param response: Server response to be deserialized.
"""

def __init__(self, deserialize, response, *args):

super(DeploymentScriptsErrorException, self).__init__(deserialize, response, 'DeploymentScriptsError', *args)


class DeploymentScriptUpdateParameter(AzureResourceBase):
"""Deployment script parameters to be updated. .

Expand Down Expand Up @@ -509,35 +538,6 @@ def __init__(self, **kwargs):
self.tags = kwargs.get('tags', None)


class DeploymentScriptsError(Model):
"""Deployment scripts error response.

:param error:
:type error:
~azure.mgmt.resource.deploymentscripts.v2019_10_preview.models.ErrorResponse
"""

_attribute_map = {
'error': {'key': 'error', 'type': 'ErrorResponse'},
}

def __init__(self, **kwargs):
super(DeploymentScriptsError, self).__init__(**kwargs)
self.error = kwargs.get('error', None)


class DeploymentScriptsErrorException(HttpOperationError):
"""Server responsed with exception of type: 'DeploymentScriptsError'.

:param deserialize: A deserializer
:param response: Server response to be deserialized.
"""

def __init__(self, deserialize, response, *args):

super(DeploymentScriptsErrorException, self).__init__(deserialize, response, 'DeploymentScriptsError', *args)


class EnvironmentVariable(Model):
"""The environment variable to pass to the script in the container instance.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -475,6 +475,35 @@ def __init__(self, *, container_settings=None, cleanup_preference=None, **kwargs
self.outputs = None


class DeploymentScriptsError(Model):
"""Deployment scripts error response.

:param error:
:type error:
~azure.mgmt.resource.deploymentscripts.v2019_10_preview.models.ErrorResponse
"""

_attribute_map = {
'error': {'key': 'error', 'type': 'ErrorResponse'},
}

def __init__(self, *, error=None, **kwargs) -> None:
super(DeploymentScriptsError, self).__init__(**kwargs)
self.error = error


class DeploymentScriptsErrorException(HttpOperationError):
"""Server responsed with exception of type: 'DeploymentScriptsError'.

:param deserialize: A deserializer
:param response: Server response to be deserialized.
"""

def __init__(self, deserialize, response, *args):

super(DeploymentScriptsErrorException, self).__init__(deserialize, response, 'DeploymentScriptsError', *args)


class DeploymentScriptUpdateParameter(AzureResourceBase):
"""Deployment script parameters to be updated. .

Expand Down Expand Up @@ -509,35 +538,6 @@ def __init__(self, *, tags=None, **kwargs) -> None:
self.tags = tags


class DeploymentScriptsError(Model):
"""Deployment scripts error response.

:param error:
:type error:
~azure.mgmt.resource.deploymentscripts.v2019_10_preview.models.ErrorResponse
"""

_attribute_map = {
'error': {'key': 'error', 'type': 'ErrorResponse'},
}

def __init__(self, *, error=None, **kwargs) -> None:
super(DeploymentScriptsError, self).__init__(**kwargs)
self.error = error


class DeploymentScriptsErrorException(HttpOperationError):
"""Server responsed with exception of type: 'DeploymentScriptsError'.

:param deserialize: A deserializer
:param response: Server response to be deserialized.
"""

def __init__(self, deserialize, response, *args):

super(DeploymentScriptsErrorException, self).__init__(deserialize, response, 'DeploymentScriptsError', *args)


class EnvironmentVariable(Model):
"""The environment variable to pass to the script in the container instance.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,20 @@ class ResourceManagementClientConfiguration(AzureConfiguration):
object<msrestazure.azure_active_directory>`
:param subscription_id: The ID of the target subscription.
:type subscription_id: str
:param subscription_id1: The ID of the source subscription.
:type subscription_id1: str
:param str base_url: Service URL
"""

def __init__(
self, credentials, subscription_id, base_url=None):
self, credentials, subscription_id, subscription_id1, base_url=None):

if credentials is None:
raise ValueError("Parameter 'credentials' must not be None.")
if subscription_id is None:
raise ValueError("Parameter 'subscription_id' must not be None.")
if subscription_id1 is None:
raise ValueError("Parameter 'subscription_id1' must not be None.")
if not base_url:
base_url = 'https://management.azure.com'

Expand All @@ -46,3 +50,4 @@ def __init__(

self.credentials = credentials
self.subscription_id = subscription_id
self.subscription_id1 = subscription_id1
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,20 @@ class ResourceManagementClientConfiguration(AzureConfiguration):
object<msrestazure.azure_active_directory>`
:param subscription_id: The ID of the target subscription.
:type subscription_id: str
:param subscription_id1: The ID of the source subscription.
:type subscription_id1: str
:param str base_url: Service URL
"""

def __init__(
self, credentials, subscription_id, base_url=None):
self, credentials, subscription_id, subscription_id1, base_url=None):

if credentials is None:
raise ValueError("Parameter 'credentials' must not be None.")
if subscription_id is None:
raise ValueError("Parameter 'subscription_id' must not be None.")
if subscription_id1 is None:
raise ValueError("Parameter 'subscription_id1' must not be None.")
if not base_url:
base_url = 'https://management.azure.com'

Expand All @@ -46,3 +50,4 @@ def __init__(

self.credentials = credentials
self.subscription_id = subscription_id
self.subscription_id1 = subscription_id1
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,15 @@ class ResourceManagementClient(SDKClient):
object<msrestazure.azure_active_directory>`
:param subscription_id: The ID of the target subscription.
:type subscription_id: str
:param subscription_id1: The ID of the source subscription.
:type subscription_id1: str
:param str base_url: Service URL
"""

def __init__(
self, credentials, subscription_id, base_url=None):
self, credentials, subscription_id, subscription_id1, base_url=None):

self.config = ResourceManagementClientConfiguration(credentials, subscription_id, base_url)
self.config = ResourceManagementClientConfiguration(credentials, subscription_id, subscription_id1, base_url)
super(ResourceManagementClient, self).__init__(self.config.credentials, self.config)

client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,10 @@
from ._models_py3 import SubResource
from ._models_py3 import TagCount
from ._models_py3 import TagDetails
from ._models_py3 import TagValue
from ._models_py3 import Tags
from ._models_py3 import TagsPatchResource
from ._models_py3 import TagsResource
from ._models_py3 import TagValue
from ._models_py3 import TargetResource
from ._models_py3 import TemplateHashResult
from ._models_py3 import TemplateLink
Expand Down Expand Up @@ -119,10 +119,10 @@
from ._models import SubResource
from ._models import TagCount
from ._models import TagDetails
from ._models import TagValue
from ._models import Tags
from ._models import TagsPatchResource
from ._models import TagsResource
from ._models import TagValue
from ._models import TargetResource
from ._models import TemplateHashResult
from ._models import TemplateLink
Expand All @@ -143,6 +143,7 @@
AliasPatternType,
AliasType,
ResourceIdentityType,
ProvisioningOperation,
PropertyChangeType,
ChangeType,
)
Expand Down Expand Up @@ -197,10 +198,10 @@
'SubResource',
'TagCount',
'TagDetails',
'TagValue',
'Tags',
'TagsPatchResource',
'TagsResource',
'TagValue',
'TargetResource',
'TemplateHashResult',
'TemplateLink',
Expand All @@ -220,6 +221,7 @@
'AliasPatternType',
'AliasType',
'ResourceIdentityType',
'ProvisioningOperation',
'PropertyChangeType',
'ChangeType',
]
Loading