Skip to content

Commit ff9e234

Browse files
authored
Merge pull request #223 from microsoft/dev
Regen 5.1 clients for M152
2 parents 143ccaf + 4b0bc9f commit ff9e234

File tree

14 files changed

+338
-24
lines changed

14 files changed

+338
-24
lines changed

azure-devops/azure/devops/v5_1/feed_token/__init__.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@
66
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
77
# --------------------------------------------------------------------------------------------
88

9+
from .models import *
910
from .feed_token_client import FeedTokenClient
1011

1112
__all__ = [
13+
'FeedSessionToken',
1214
'FeedTokenClient'
1315
]

azure-devops/azure/devops/v5_1/feed_token/feed_token_client.py

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
from msrest import Serializer, Deserializer
1010
from ...client import Client
11+
from . import models
1112

1213

1314
class FeedTokenClient(Client):
@@ -18,28 +19,24 @@ class FeedTokenClient(Client):
1819

1920
def __init__(self, base_url=None, creds=None):
2021
super(FeedTokenClient, self).__init__(base_url, creds)
21-
self._serialize = Serializer()
22-
self._deserialize = Deserializer()
22+
client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
23+
self._serialize = Serializer(client_models)
24+
self._deserialize = Deserializer(client_models)
2325

2426
resource_area_identifier = 'cdeb6c7d-6b25-4d6f-b664-c2e3ede202e8'
2527

26-
def get_personal_access_token(self, feed_name=None, token_type=None):
28+
def get_personal_access_token(self, feed_name=None):
2729
"""GetPersonalAccessToken.
2830
[Preview API] Get a time-limited session token representing the current user, with permissions scoped to the read/write of Artifacts.
2931
:param str feed_name:
30-
:param str token_type: Type of token to retrieve (e.g. 'SelfDescribing', 'Compact').
31-
:rtype: object
32+
:rtype: :class:`<FeedSessionToken> <azure.devops.v5_1.feed_token.models.FeedSessionToken>`
3233
"""
3334
route_values = {}
3435
if feed_name is not None:
3536
route_values['feedName'] = self._serialize.url('feed_name', feed_name, 'str')
36-
query_parameters = {}
37-
if token_type is not None:
38-
query_parameters['tokenType'] = self._serialize.query('token_type', token_type, 'str')
3937
response = self._send(http_method='GET',
4038
location_id='dfdb7ad7-3d8e-4907-911e-19b4a8330550',
4139
version='5.1-preview.1',
42-
route_values=route_values,
43-
query_parameters=query_parameters)
44-
return self._deserialize('object', response)
40+
route_values=route_values)
41+
return self._deserialize('FeedSessionToken', response)
4542

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
# --------------------------------------------------------------------------------------------
2+
# Copyright (c) Microsoft Corporation. All rights reserved.
3+
# Licensed under the MIT License. See License.txt in the project root for license information.
4+
# --------------------------------------------------------------------------------------------
5+
# Generated file, DO NOT EDIT
6+
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
7+
# --------------------------------------------------------------------------------------------
8+
9+
from msrest.serialization import Model
10+
11+
12+
class FeedSessionToken(Model):
13+
"""FeedSessionToken.
14+
15+
:param token:
16+
:type token: str
17+
:param valid_to:
18+
:type valid_to: datetime
19+
"""
20+
21+
_attribute_map = {
22+
'token': {'key': 'token', 'type': 'str'},
23+
'valid_to': {'key': 'validTo', 'type': 'iso-8601'}
24+
}
25+
26+
def __init__(self, token=None, valid_to=None):
27+
super(FeedSessionToken, self).__init__()
28+
self.token = token
29+
self.valid_to = valid_to
30+
31+
32+
__all__ = [
33+
'FeedSessionToken',
34+
]

azure-devops/azure/devops/v5_1/pipelines/__init__.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,14 @@
1717
'PipelineConfiguration',
1818
'PipelineReference',
1919
'ReferenceLinks',
20+
'Repository',
21+
'RepositoryResource',
22+
'RepositoryResourceParameters',
2023
'Run',
2124
'RunPipelineParameters',
2225
'RunReference',
26+
'RunResources',
27+
'RunResourcesParameters',
2328
'Variable',
2429
'PipelinesClient'
2530
]

azure-devops/azure/devops/v5_1/pipelines/models.py

Lines changed: 107 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,23 +137,87 @@ def __init__(self, links=None):
137137
self.links = links
138138

139139

140+
class Repository(Model):
141+
"""Repository.
142+
143+
:param type:
144+
:type type: object
145+
"""
146+
147+
_attribute_map = {
148+
'type': {'key': 'type', 'type': 'object'}
149+
}
150+
151+
def __init__(self, type=None):
152+
super(Repository, self).__init__()
153+
self.type = type
154+
155+
156+
class RepositoryResource(Model):
157+
"""RepositoryResource.
158+
159+
:param ref_name:
160+
:type ref_name: str
161+
:param repository:
162+
:type repository: :class:`Repository <azure.devops.v5_1.pipelines.models.Repository>`
163+
:param version:
164+
:type version: str
165+
"""
166+
167+
_attribute_map = {
168+
'ref_name': {'key': 'refName', 'type': 'str'},
169+
'repository': {'key': 'repository', 'type': 'Repository'},
170+
'version': {'key': 'version', 'type': 'str'}
171+
}
172+
173+
def __init__(self, ref_name=None, repository=None, version=None):
174+
super(RepositoryResource, self).__init__()
175+
self.ref_name = ref_name
176+
self.repository = repository
177+
self.version = version
178+
179+
180+
class RepositoryResourceParameters(Model):
181+
"""RepositoryResourceParameters.
182+
183+
:param ref_name:
184+
:type ref_name: str
185+
:param version:
186+
:type version: str
187+
"""
188+
189+
_attribute_map = {
190+
'ref_name': {'key': 'refName', 'type': 'str'},
191+
'version': {'key': 'version', 'type': 'str'}
192+
}
193+
194+
def __init__(self, ref_name=None, version=None):
195+
super(RepositoryResourceParameters, self).__init__()
196+
self.ref_name = ref_name
197+
self.version = version
198+
199+
140200
class RunPipelineParameters(Model):
141201
"""RunPipelineParameters.
142202
143203
:param configuration:
144204
:type configuration: JustInTimeConfiguration
205+
:param resources:
206+
:type resources: :class:`RunResourcesParameters <azure.devops.v5_1.pipelines.models.RunResourcesParameters>`
145207
:param variables:
146208
:type variables: dict
147209
"""
148210

149211
_attribute_map = {
150212
'configuration': {'key': 'configuration', 'type': 'JustInTimeConfiguration'},
213+
'resources': {'key': 'resources', 'type': 'RunResourcesParameters'},
151214
'variables': {'key': 'variables', 'type': '{Variable}'}
152215
}
153216

154-
def __init__(self, configuration=None, variables=None):
217+
def __init__(self, configuration=None, resources=None, variables=None):
155218
super(RunPipelineParameters, self).__init__()
156219
self.configuration = configuration
220+
self.resources = resources
157221
self.variables = variables
158222

159223

@@ -177,6 +241,38 @@ def __init__(self, id=None, name=None):
177241
self.name = name
178242

179243

244+
class RunResources(Model):
245+
"""RunResources.
246+
247+
:param repositories:
248+
:type repositories: dict
249+
"""
250+
251+
_attribute_map = {
252+
'repositories': {'key': 'repositories', 'type': '{RepositoryResource}'}
253+
}
254+
255+
def __init__(self, repositories=None):
256+
super(RunResources, self).__init__()
257+
self.repositories = repositories
258+
259+
260+
class RunResourcesParameters(Model):
261+
"""RunResourcesParameters.
262+
263+
:param repositories:
264+
:type repositories: dict
265+
"""
266+
267+
_attribute_map = {
268+
'repositories': {'key': 'repositories', 'type': '{RepositoryResourceParameters}'}
269+
}
270+
271+
def __init__(self, repositories=None):
272+
super(RunResourcesParameters, self).__init__()
273+
self.repositories = repositories
274+
275+
180276
class Variable(Model):
181277
"""Variable.
182278
@@ -248,6 +344,8 @@ class Run(RunReference):
248344
:type finished_date: datetime
249345
:param pipeline:
250346
:type pipeline: :class:`PipelineReference <azure.devops.v5_1.pipelines.models.PipelineReference>`
347+
:param resources:
348+
:type resources: :class:`RunResources <azure.devops.v5_1.pipelines.models.RunResources>`
251349
:param result:
252350
:type result: object
253351
:param state:
@@ -265,18 +363,20 @@ class Run(RunReference):
265363
'created_date': {'key': 'createdDate', 'type': 'iso-8601'},
266364
'finished_date': {'key': 'finishedDate', 'type': 'iso-8601'},
267365
'pipeline': {'key': 'pipeline', 'type': 'PipelineReference'},
366+
'resources': {'key': 'resources', 'type': 'RunResources'},
268367
'result': {'key': 'result', 'type': 'object'},
269368
'state': {'key': 'state', 'type': 'object'},
270369
'url': {'key': 'url', 'type': 'str'},
271370
'variables': {'key': 'variables', 'type': '{Variable}'}
272371
}
273372

274-
def __init__(self, id=None, name=None, _links=None, created_date=None, finished_date=None, pipeline=None, result=None, state=None, url=None, variables=None):
373+
def __init__(self, id=None, name=None, _links=None, created_date=None, finished_date=None, pipeline=None, resources=None, result=None, state=None, url=None, variables=None):
275374
super(Run, self).__init__(id=id, name=name)
276375
self._links = _links
277376
self.created_date = created_date
278377
self.finished_date = finished_date
279378
self.pipeline = pipeline
379+
self.resources = resources
280380
self.result = result
281381
self.state = state
282382
self.url = url
@@ -290,8 +390,13 @@ def __init__(self, id=None, name=None, _links=None, created_date=None, finished_
290390
'PipelineConfiguration',
291391
'PipelineReference',
292392
'ReferenceLinks',
393+
'Repository',
394+
'RepositoryResource',
395+
'RepositoryResourceParameters',
293396
'RunPipelineParameters',
294397
'RunReference',
398+
'RunResources',
399+
'RunResourcesParameters',
295400
'Variable',
296401
'Pipeline',
297402
'Run',

azure-devops/azure/devops/v5_1/task_agent/models.py

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2826,6 +2826,8 @@ class TaskDefinition(Model):
28262826
:type groups: list of :class:`TaskGroupDefinition <azure.devops.v5_1.task_agent.models.TaskGroupDefinition>`
28272827
:param help_mark_down:
28282828
:type help_mark_down: str
2829+
:param help_url:
2830+
:type help_url: str
28292831
:param host_type:
28302832
:type host_type: str
28312833
:param icon_url:
@@ -2890,6 +2892,7 @@ class TaskDefinition(Model):
28902892
'friendly_name': {'key': 'friendlyName', 'type': 'str'},
28912893
'groups': {'key': 'groups', 'type': '[TaskGroupDefinition]'},
28922894
'help_mark_down': {'key': 'helpMarkDown', 'type': 'str'},
2895+
'help_url': {'key': 'helpUrl', 'type': 'str'},
28932896
'host_type': {'key': 'hostType', 'type': 'str'},
28942897
'icon_url': {'key': 'iconUrl', 'type': 'str'},
28952898
'id': {'key': 'id', 'type': 'str'},
@@ -2914,7 +2917,7 @@ class TaskDefinition(Model):
29142917
'visibility': {'key': 'visibility', 'type': '[str]'}
29152918
}
29162919

2917-
def __init__(self, agent_execution=None, author=None, category=None, contents_uploaded=None, contribution_identifier=None, contribution_version=None, data_source_bindings=None, definition_type=None, demands=None, deprecated=None, description=None, disabled=None, ecosystem=None, execution=None, friendly_name=None, groups=None, help_mark_down=None, host_type=None, icon_url=None, id=None, inputs=None, instance_name_format=None, minimum_agent_version=None, name=None, output_variables=None, package_location=None, package_type=None, post_job_execution=None, pre_job_execution=None, preview=None, release_notes=None, runs_on=None, satisfies=None, server_owned=None, show_environment_variables=None, source_definitions=None, source_location=None, version=None, visibility=None):
2920+
def __init__(self, agent_execution=None, author=None, category=None, contents_uploaded=None, contribution_identifier=None, contribution_version=None, data_source_bindings=None, definition_type=None, demands=None, deprecated=None, description=None, disabled=None, ecosystem=None, execution=None, friendly_name=None, groups=None, help_mark_down=None, help_url=None, host_type=None, icon_url=None, id=None, inputs=None, instance_name_format=None, minimum_agent_version=None, name=None, output_variables=None, package_location=None, package_type=None, post_job_execution=None, pre_job_execution=None, preview=None, release_notes=None, runs_on=None, satisfies=None, server_owned=None, show_environment_variables=None, source_definitions=None, source_location=None, version=None, visibility=None):
29182921
super(TaskDefinition, self).__init__()
29192922
self.agent_execution = agent_execution
29202923
self.author = author
@@ -2933,6 +2936,7 @@ def __init__(self, agent_execution=None, author=None, category=None, contents_up
29332936
self.friendly_name = friendly_name
29342937
self.groups = groups
29352938
self.help_mark_down = help_mark_down
2939+
self.help_url = help_url
29362940
self.host_type = host_type
29372941
self.icon_url = icon_url
29382942
self.id = id
@@ -3074,6 +3078,8 @@ class TaskGroup(TaskDefinition):
30743078
:type groups: list of :class:`TaskGroupDefinition <azure.devops.v5_1.task_agent.models.TaskGroupDefinition>`
30753079
:param help_mark_down:
30763080
:type help_mark_down: str
3081+
:param help_url:
3082+
:type help_url: str
30773083
:param host_type:
30783084
:type host_type: str
30793085
:param icon_url:
@@ -3158,6 +3164,7 @@ class TaskGroup(TaskDefinition):
31583164
'friendly_name': {'key': 'friendlyName', 'type': 'str'},
31593165
'groups': {'key': 'groups', 'type': '[TaskGroupDefinition]'},
31603166
'help_mark_down': {'key': 'helpMarkDown', 'type': 'str'},
3167+
'help_url': {'key': 'helpUrl', 'type': 'str'},
31613168
'host_type': {'key': 'hostType', 'type': 'str'},
31623169
'icon_url': {'key': 'iconUrl', 'type': 'str'},
31633170
'id': {'key': 'id', 'type': 'str'},
@@ -3192,8 +3199,8 @@ class TaskGroup(TaskDefinition):
31923199
'tasks': {'key': 'tasks', 'type': '[TaskGroupStep]'}
31933200
}
31943201

3195-
def __init__(self, agent_execution=None, author=None, category=None, contents_uploaded=None, contribution_identifier=None, contribution_version=None, data_source_bindings=None, definition_type=None, demands=None, deprecated=None, description=None, disabled=None, ecosystem=None, execution=None, friendly_name=None, groups=None, help_mark_down=None, host_type=None, icon_url=None, id=None, inputs=None, instance_name_format=None, minimum_agent_version=None, name=None, output_variables=None, package_location=None, package_type=None, post_job_execution=None, pre_job_execution=None, preview=None, release_notes=None, runs_on=None, satisfies=None, server_owned=None, show_environment_variables=None, source_definitions=None, source_location=None, version=None, visibility=None, comment=None, created_by=None, created_on=None, deleted=None, modified_by=None, modified_on=None, owner=None, parent_definition_id=None, revision=None, tasks=None):
3196-
super(TaskGroup, self).__init__(agent_execution=agent_execution, author=author, category=category, contents_uploaded=contents_uploaded, contribution_identifier=contribution_identifier, contribution_version=contribution_version, data_source_bindings=data_source_bindings, definition_type=definition_type, demands=demands, deprecated=deprecated, description=description, disabled=disabled, ecosystem=ecosystem, execution=execution, friendly_name=friendly_name, groups=groups, help_mark_down=help_mark_down, host_type=host_type, icon_url=icon_url, id=id, inputs=inputs, instance_name_format=instance_name_format, minimum_agent_version=minimum_agent_version, name=name, output_variables=output_variables, package_location=package_location, package_type=package_type, post_job_execution=post_job_execution, pre_job_execution=pre_job_execution, preview=preview, release_notes=release_notes, runs_on=runs_on, satisfies=satisfies, server_owned=server_owned, show_environment_variables=show_environment_variables, source_definitions=source_definitions, source_location=source_location, version=version, visibility=visibility)
3202+
def __init__(self, agent_execution=None, author=None, category=None, contents_uploaded=None, contribution_identifier=None, contribution_version=None, data_source_bindings=None, definition_type=None, demands=None, deprecated=None, description=None, disabled=None, ecosystem=None, execution=None, friendly_name=None, groups=None, help_mark_down=None, help_url=None, host_type=None, icon_url=None, id=None, inputs=None, instance_name_format=None, minimum_agent_version=None, name=None, output_variables=None, package_location=None, package_type=None, post_job_execution=None, pre_job_execution=None, preview=None, release_notes=None, runs_on=None, satisfies=None, server_owned=None, show_environment_variables=None, source_definitions=None, source_location=None, version=None, visibility=None, comment=None, created_by=None, created_on=None, deleted=None, modified_by=None, modified_on=None, owner=None, parent_definition_id=None, revision=None, tasks=None):
3203+
super(TaskGroup, self).__init__(agent_execution=agent_execution, author=author, category=category, contents_uploaded=contents_uploaded, contribution_identifier=contribution_identifier, contribution_version=contribution_version, data_source_bindings=data_source_bindings, definition_type=definition_type, demands=demands, deprecated=deprecated, description=description, disabled=disabled, ecosystem=ecosystem, execution=execution, friendly_name=friendly_name, groups=groups, help_mark_down=help_mark_down, help_url=help_url, host_type=host_type, icon_url=icon_url, id=id, inputs=inputs, instance_name_format=instance_name_format, minimum_agent_version=minimum_agent_version, name=name, output_variables=output_variables, package_location=package_location, package_type=package_type, post_job_execution=post_job_execution, pre_job_execution=pre_job_execution, preview=preview, release_notes=release_notes, runs_on=runs_on, satisfies=satisfies, server_owned=server_owned, show_environment_variables=show_environment_variables, source_definitions=source_definitions, source_location=source_location, version=version, visibility=visibility)
31973204
self.comment = comment
31983205
self.created_by = created_by
31993206
self.created_on = created_on
@@ -3311,6 +3318,8 @@ class TaskGroupRevision(Model):
33113318
:type comment: str
33123319
:param file_id:
33133320
:type file_id: int
3321+
:param major_version:
3322+
:type major_version: int
33143323
:param revision:
33153324
:type revision: int
33163325
:param task_group_id:
@@ -3323,17 +3332,19 @@ class TaskGroupRevision(Model):
33233332
'change_type': {'key': 'changeType', 'type': 'object'},
33243333
'comment': {'key': 'comment', 'type': 'str'},
33253334
'file_id': {'key': 'fileId', 'type': 'int'},
3335+
'major_version': {'key': 'majorVersion', 'type': 'int'},
33263336
'revision': {'key': 'revision', 'type': 'int'},
33273337
'task_group_id': {'key': 'taskGroupId', 'type': 'str'}
33283338
}
33293339

3330-
def __init__(self, changed_by=None, changed_date=None, change_type=None, comment=None, file_id=None, revision=None, task_group_id=None):
3340+
def __init__(self, changed_by=None, changed_date=None, change_type=None, comment=None, file_id=None, major_version=None, revision=None, task_group_id=None):
33313341
super(TaskGroupRevision, self).__init__()
33323342
self.changed_by = changed_by
33333343
self.changed_date = changed_date
33343344
self.change_type = change_type
33353345
self.comment = comment
33363346
self.file_id = file_id
3347+
self.major_version = major_version
33373348
self.revision = revision
33383349
self.task_group_id = task_group_id
33393350

0 commit comments

Comments
 (0)