Skip to content

Commit bf5cff3

Browse files
author
SDK Automation
committed
Generated from 82f41bfec5e412e204b165af541d35a5c672d74f
Fix model validation and prettier check
1 parent 0009740 commit bf5cff3

File tree

6 files changed

+282
-114
lines changed

6 files changed

+282
-114
lines changed

sdk/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2019_06_01_preview/models/_models.py

Lines changed: 54 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -571,6 +571,9 @@ class RunRequest(Model):
571571
:type is_archive_enabled: bool
572572
:param agent_pool_name: The dedicated agent pool for the run.
573573
:type agent_pool_name: str
574+
:param log_template: The template that describes the repository and tag
575+
information for run log artifact.
576+
:type log_template: str
574577
:param type: Required. Constant filled by server.
575578
:type type: str
576579
"""
@@ -582,6 +585,7 @@ class RunRequest(Model):
582585
_attribute_map = {
583586
'is_archive_enabled': {'key': 'isArchiveEnabled', 'type': 'bool'},
584587
'agent_pool_name': {'key': 'agentPoolName', 'type': 'str'},
588+
'log_template': {'key': 'logTemplate', 'type': 'str'},
585589
'type': {'key': 'type', 'type': 'str'},
586590
}
587591

@@ -593,6 +597,7 @@ def __init__(self, **kwargs):
593597
super(RunRequest, self).__init__(**kwargs)
594598
self.is_archive_enabled = kwargs.get('is_archive_enabled', False)
595599
self.agent_pool_name = kwargs.get('agent_pool_name', None)
600+
self.log_template = kwargs.get('log_template', None)
596601
self.type = None
597602

598603

@@ -606,6 +611,9 @@ class DockerBuildRequest(RunRequest):
606611
:type is_archive_enabled: bool
607612
:param agent_pool_name: The dedicated agent pool for the run.
608613
:type agent_pool_name: str
614+
:param log_template: The template that describes the repository and tag
615+
information for run log artifact.
616+
:type log_template: str
609617
:param type: Required. Constant filled by server.
610618
:type type: str
611619
:param image_names: The fully qualified image names including the
@@ -656,6 +664,7 @@ class DockerBuildRequest(RunRequest):
656664
_attribute_map = {
657665
'is_archive_enabled': {'key': 'isArchiveEnabled', 'type': 'bool'},
658666
'agent_pool_name': {'key': 'agentPoolName', 'type': 'str'},
667+
'log_template': {'key': 'logTemplate', 'type': 'str'},
659668
'type': {'key': 'type', 'type': 'str'},
660669
'image_names': {'key': 'imageNames', 'type': '[str]'},
661670
'is_push_enabled': {'key': 'isPushEnabled', 'type': 'bool'},
@@ -913,6 +922,9 @@ class EncodedTaskRunRequest(RunRequest):
913922
:type is_archive_enabled: bool
914923
:param agent_pool_name: The dedicated agent pool for the run.
915924
:type agent_pool_name: str
925+
:param log_template: The template that describes the repository and tag
926+
information for run log artifact.
927+
:type log_template: str
916928
:param type: Required. Constant filled by server.
917929
:type type: str
918930
:param encoded_task_content: Required. Base64 encoded value of the
@@ -955,6 +967,7 @@ class EncodedTaskRunRequest(RunRequest):
955967
_attribute_map = {
956968
'is_archive_enabled': {'key': 'isArchiveEnabled', 'type': 'bool'},
957969
'agent_pool_name': {'key': 'agentPoolName', 'type': 'str'},
970+
'log_template': {'key': 'logTemplate', 'type': 'str'},
958971
'type': {'key': 'type', 'type': 'str'},
959972
'encoded_task_content': {'key': 'encodedTaskContent', 'type': 'str'},
960973
'encoded_values_content': {'key': 'encodedValuesContent', 'type': 'str'},
@@ -1310,6 +1323,9 @@ class FileTaskRunRequest(RunRequest):
13101323
:type is_archive_enabled: bool
13111324
:param agent_pool_name: The dedicated agent pool for the run.
13121325
:type agent_pool_name: str
1326+
:param log_template: The template that describes the repository and tag
1327+
information for run log artifact.
1328+
:type log_template: str
13131329
:param type: Required. Constant filled by server.
13141330
:type type: str
13151331
:param task_file_path: Required. The template/definition file path
@@ -1352,6 +1368,7 @@ class FileTaskRunRequest(RunRequest):
13521368
_attribute_map = {
13531369
'is_archive_enabled': {'key': 'isArchiveEnabled', 'type': 'bool'},
13541370
'agent_pool_name': {'key': 'agentPoolName', 'type': 'str'},
1371+
'log_template': {'key': 'logTemplate', 'type': 'str'},
13551372
'type': {'key': 'type', 'type': 'str'},
13561373
'task_file_path': {'key': 'taskFilePath', 'type': 'str'},
13571374
'values_file_path': {'key': 'valuesFilePath', 'type': 'str'},
@@ -2635,6 +2652,9 @@ class Run(ProxyResource):
26352652
:vartype run_error_message: str
26362653
:param update_trigger_token: The update trigger token passed for the Run.
26372654
:type update_trigger_token: str
2655+
:ivar log_artifact: The image description for the log artifact.
2656+
:vartype log_artifact:
2657+
~azure.mgmt.containerregistry.v2019_06_01_preview.models.ImageDescriptor
26382658
:param provisioning_state: The provisioning state of a run. Possible
26392659
values include: 'Creating', 'Updating', 'Deleting', 'Succeeded', 'Failed',
26402660
'Canceled'
@@ -2650,6 +2670,7 @@ class Run(ProxyResource):
26502670
'name': {'readonly': True},
26512671
'type': {'readonly': True},
26522672
'run_error_message': {'readonly': True},
2673+
'log_artifact': {'readonly': True},
26532674
}
26542675

26552676
_attribute_map = {
@@ -2675,6 +2696,7 @@ class Run(ProxyResource):
26752696
'custom_registries': {'key': 'properties.customRegistries', 'type': '[str]'},
26762697
'run_error_message': {'key': 'properties.runErrorMessage', 'type': 'str'},
26772698
'update_trigger_token': {'key': 'properties.updateTriggerToken', 'type': 'str'},
2699+
'log_artifact': {'key': 'properties.logArtifact', 'type': 'ImageDescriptor'},
26782700
'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
26792701
'is_archive_enabled': {'key': 'properties.isArchiveEnabled', 'type': 'bool'},
26802702
}
@@ -2700,6 +2722,7 @@ def __init__(self, **kwargs):
27002722
self.custom_registries = kwargs.get('custom_registries', None)
27012723
self.run_error_message = None
27022724
self.update_trigger_token = kwargs.get('update_trigger_token', None)
2725+
self.log_artifact = None
27032726
self.provisioning_state = kwargs.get('provisioning_state', None)
27042727
self.is_archive_enabled = kwargs.get('is_archive_enabled', False)
27052728

@@ -3382,8 +3405,8 @@ class Task(Resource):
33823405
'Disabled', 'Enabled'
33833406
:type status: str or
33843407
~azure.mgmt.containerregistry.v2019_06_01_preview.models.TaskStatus
3385-
:param platform: Required. The platform properties against which the run
3386-
has to happen.
3408+
:param platform: The platform properties against which the run has to
3409+
happen.
33873410
:type platform:
33883411
~azure.mgmt.containerregistry.v2019_06_01_preview.models.PlatformProperties
33893412
:param agent_configuration: The machine configuration of the run agent.
@@ -3393,7 +3416,7 @@ class Task(Resource):
33933416
:type agent_pool_name: str
33943417
:param timeout: Run timeout in seconds. Default value: 3600 .
33953418
:type timeout: int
3396-
:param step: Required. The properties of a task step.
3419+
:param step: The properties of a task step.
33973420
:type step:
33983421
~azure.mgmt.containerregistry.v2019_06_01_preview.models.TaskStepProperties
33993422
:param trigger: The properties that describe all triggers for the task.
@@ -3403,6 +3426,12 @@ class Task(Resource):
34033426
that will be used when this run is invoked.
34043427
:type credentials:
34053428
~azure.mgmt.containerregistry.v2019_06_01_preview.models.Credentials
3429+
:param log_template: The template that describes the repository and tag
3430+
information for run log artifact.
3431+
:type log_template: str
3432+
:param is_system_task: The value of this property indicates whether the
3433+
task resource is system task or not. Default value: False .
3434+
:type is_system_task: bool
34063435
"""
34073436

34083437
_validation = {
@@ -3412,9 +3441,7 @@ class Task(Resource):
34123441
'location': {'required': True},
34133442
'provisioning_state': {'readonly': True},
34143443
'creation_date': {'readonly': True},
3415-
'platform': {'required': True},
34163444
'timeout': {'maximum': 28800, 'minimum': 300},
3417-
'step': {'required': True},
34183445
}
34193446

34203447
_attribute_map = {
@@ -3434,6 +3461,8 @@ class Task(Resource):
34343461
'step': {'key': 'properties.step', 'type': 'TaskStepProperties'},
34353462
'trigger': {'key': 'properties.trigger', 'type': 'TriggerProperties'},
34363463
'credentials': {'key': 'properties.credentials', 'type': 'Credentials'},
3464+
'log_template': {'key': 'properties.logTemplate', 'type': 'str'},
3465+
'is_system_task': {'key': 'properties.isSystemTask', 'type': 'bool'},
34373466
}
34383467

34393468
def __init__(self, **kwargs):
@@ -3449,28 +3478,23 @@ def __init__(self, **kwargs):
34493478
self.step = kwargs.get('step', None)
34503479
self.trigger = kwargs.get('trigger', None)
34513480
self.credentials = kwargs.get('credentials', None)
3481+
self.log_template = kwargs.get('log_template', None)
3482+
self.is_system_task = kwargs.get('is_system_task', False)
34523483

34533484

3454-
class TaskRun(Resource):
3485+
class TaskRun(ProxyResource):
34553486
"""The task run that has the ARM resource and properties.
34563487
The task run will have the information of request and result of a run.
34573488
34583489
Variables are only populated by the server, and will be ignored when
34593490
sending a request.
34603491
3461-
All required parameters must be populated in order to send to Azure.
3462-
34633492
:ivar id: The resource ID.
34643493
:vartype id: str
34653494
:ivar name: The name of the resource.
34663495
:vartype name: str
34673496
:ivar type: The type of the resource.
34683497
:vartype type: str
3469-
:param location: Required. The location of the resource. This cannot be
3470-
changed after the resource is created.
3471-
:type location: str
3472-
:param tags: The tags of the resource.
3473-
:type tags: dict[str, str]
34743498
:param identity: Identity for the resource.
34753499
:type identity:
34763500
~azure.mgmt.containerregistry.v2019_06_01_preview.models.IdentityProperties
@@ -3488,13 +3512,14 @@ class TaskRun(Resource):
34883512
:param force_update_tag: How the run should be forced to rerun even if the
34893513
run request configuration has not changed
34903514
:type force_update_tag: str
3515+
:param location: The location of the resource
3516+
:type location: str
34913517
"""
34923518

34933519
_validation = {
34943520
'id': {'readonly': True},
34953521
'name': {'readonly': True},
34963522
'type': {'readonly': True},
3497-
'location': {'required': True},
34983523
'provisioning_state': {'readonly': True},
34993524
'run_result': {'readonly': True},
35003525
}
@@ -3503,13 +3528,12 @@ class TaskRun(Resource):
35033528
'id': {'key': 'id', 'type': 'str'},
35043529
'name': {'key': 'name', 'type': 'str'},
35053530
'type': {'key': 'type', 'type': 'str'},
3506-
'location': {'key': 'location', 'type': 'str'},
3507-
'tags': {'key': 'tags', 'type': '{str}'},
35083531
'identity': {'key': 'identity', 'type': 'IdentityProperties'},
35093532
'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
35103533
'run_request': {'key': 'properties.runRequest', 'type': 'RunRequest'},
35113534
'run_result': {'key': 'properties.runResult', 'type': 'Run'},
35123535
'force_update_tag': {'key': 'properties.forceUpdateTag', 'type': 'str'},
3536+
'location': {'key': 'location', 'type': 'str'},
35133537
}
35143538

35153539
def __init__(self, **kwargs):
@@ -3519,6 +3543,7 @@ def __init__(self, **kwargs):
35193543
self.run_request = kwargs.get('run_request', None)
35203544
self.run_result = None
35213545
self.force_update_tag = kwargs.get('force_update_tag', None)
3546+
self.location = kwargs.get('location', None)
35223547

35233548

35243549
class TaskRunRequest(RunRequest):
@@ -3531,6 +3556,9 @@ class TaskRunRequest(RunRequest):
35313556
:type is_archive_enabled: bool
35323557
:param agent_pool_name: The dedicated agent pool for the run.
35333558
:type agent_pool_name: str
3559+
:param log_template: The template that describes the repository and tag
3560+
information for run log artifact.
3561+
:type log_template: str
35343562
:param type: Required. Constant filled by server.
35353563
:type type: str
35363564
:param task_id: Required. The resource ID of task against which run has to
@@ -3550,6 +3578,7 @@ class TaskRunRequest(RunRequest):
35503578
_attribute_map = {
35513579
'is_archive_enabled': {'key': 'isArchiveEnabled', 'type': 'bool'},
35523580
'agent_pool_name': {'key': 'agentPoolName', 'type': 'str'},
3581+
'log_template': {'key': 'logTemplate', 'type': 'str'},
35533582
'type': {'key': 'type', 'type': 'str'},
35543583
'task_id': {'key': 'taskId', 'type': 'str'},
35553584
'override_task_step_properties': {'key': 'overrideTaskStepProperties', 'type': 'OverrideTaskStepProperties'},
@@ -3574,6 +3603,8 @@ class TaskRunUpdateParameters(Model):
35743603
:param force_update_tag: How the run should be forced to rerun even if the
35753604
run request configuration has not changed
35763605
:type force_update_tag: str
3606+
:param location: The location of the resource
3607+
:type location: str
35773608
:param tags: The ARM resource tags.
35783609
:type tags: dict[str, str]
35793610
"""
@@ -3582,6 +3613,7 @@ class TaskRunUpdateParameters(Model):
35823613
'identity': {'key': 'identity', 'type': 'IdentityProperties'},
35833614
'run_request': {'key': 'properties.runRequest', 'type': 'RunRequest'},
35843615
'force_update_tag': {'key': 'properties.forceUpdateTag', 'type': 'str'},
3616+
'location': {'key': 'location', 'type': 'str'},
35853617
'tags': {'key': 'tags', 'type': '{str}'},
35863618
}
35873619

@@ -3590,6 +3622,7 @@ def __init__(self, **kwargs):
35903622
self.identity = kwargs.get('identity', None)
35913623
self.run_request = kwargs.get('run_request', None)
35923624
self.force_update_tag = kwargs.get('force_update_tag', None)
3625+
self.location = kwargs.get('location', None)
35933626
self.tags = kwargs.get('tags', None)
35943627

35953628

@@ -3624,6 +3657,9 @@ class TaskUpdateParameters(Model):
36243657
that will be used when this run is invoked.
36253658
:type credentials:
36263659
~azure.mgmt.containerregistry.v2019_06_01_preview.models.Credentials
3660+
:param log_template: The template that describes the repository and tag
3661+
information for run log artifact.
3662+
:type log_template: str
36273663
:param tags: The ARM resource tags.
36283664
:type tags: dict[str, str]
36293665
"""
@@ -3638,6 +3674,7 @@ class TaskUpdateParameters(Model):
36383674
'step': {'key': 'properties.step', 'type': 'TaskStepUpdateParameters'},
36393675
'trigger': {'key': 'properties.trigger', 'type': 'TriggerUpdateParameters'},
36403676
'credentials': {'key': 'properties.credentials', 'type': 'Credentials'},
3677+
'log_template': {'key': 'properties.logTemplate', 'type': 'str'},
36413678
'tags': {'key': 'tags', 'type': '{str}'},
36423679
}
36433680

@@ -3652,6 +3689,7 @@ def __init__(self, **kwargs):
36523689
self.step = kwargs.get('step', None)
36533690
self.trigger = kwargs.get('trigger', None)
36543691
self.credentials = kwargs.get('credentials', None)
3692+
self.log_template = kwargs.get('log_template', None)
36553693
self.tags = kwargs.get('tags', None)
36563694

36573695

0 commit comments

Comments
 (0)