Skip to content

merge 0.1.19 from dev to master #135

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
tedchamb merged 12 commits into from
Oct 23, 2018
Merged

merge 0.1.19 from dev to master #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c745399
Fix get_commits query parameters to match API
Sep 24, 2018
c370f03
adding option to enable force msa pass through header
gauravsaralMs Oct 13, 2018
be6977c
bump version to 0.1.19
tedchamb Oct 15, 2018
03207b0
Merge pull request #131 from Microsoft/users/tedchamb/dev
tedchamb Oct 15, 2018
8cc3d26
Merge pull request #130 from gauravsaralMs/users/gsaral/forceMsaPassT…
tedchamb Oct 17, 2018
c7f10d0
Add resource area id to the graph client.
tedchamb Oct 23, 2018
ee5288b
Merge remote-tracking branch 'origin/dev' into users/tedchamb/dev
tedchamb Oct 23, 2018
283b2ac
Merge pull request #133 from Microsoft/users/tedchamb/dev
tedchamb Oct 23, 2018
80681ed
Merge pull request #122 from namankanakiya/dev
tedchamb Oct 23, 2018
7e180d1
regenerate 4.1 clients after fix to query parameter names for complex…
tedchamb Oct 23, 2018
e273d14
regenerate 4.0 clients after fix to query parameter names for complex…
tedchamb Oct 23, 2018
2ffa787
Merge pull request #134 from Microsoft/users/tedchamb/dev
tedchamb Oct 23, 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
2 changes: 1 addition & 1 deletion vsts/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from setuptools import setup, find_packages

NAME = "vsts"
VERSION = "0.1.18"
VERSION = "0.1.19"

# To install the library, run the following
#
Expand Down
2 changes: 2 additions & 0 deletions vsts/vsts/git/v4_0/git_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ def get_vsts_info(self, relative_remote_url):
headers = {'Accept': 'application/json'}
if self._suppress_fedauth_redirect:
headers['X-TFS-FedAuthRedirect'] = 'Suppress'
if self._force_msa_pass_through:
headers['X-VSS-ForceMsaPassThrough'] = 'true'
response = self._send_request(request, headers)
return self._deserialize('VstsInfo', response)

Expand Down
54 changes: 27 additions & 27 deletions vsts/vsts/git/v4_0/git_client_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,11 +199,11 @@ def get_branch(self, repository_id, name, project=None, base_version_descriptor=
query_parameters['name'] = self._serialize.query('name', name, 'str')
if base_version_descriptor is not None:
if base_version_descriptor.version_type is not None:
query_parameters['baseVersionDescriptor.VersionType'] = base_version_descriptor.version_type
query_parameters['baseVersionDescriptor.versionType'] = base_version_descriptor.version_type
if base_version_descriptor.version is not None:
query_parameters['baseVersionDescriptor.Version'] = base_version_descriptor.version
query_parameters['baseVersionDescriptor.version'] = base_version_descriptor.version
if base_version_descriptor.version_options is not None:
query_parameters['baseVersionDescriptor.VersionOptions'] = base_version_descriptor.version_options
query_parameters['baseVersionDescriptor.versionOptions'] = base_version_descriptor.version_options
response = self._send(http_method='GET',
location_id='d5b216de-d8d5-4d32-ae76-51df755b16d3',
version='4.0',
Expand All @@ -227,11 +227,11 @@ def get_branches(self, repository_id, project=None, base_version_descriptor=None
query_parameters = {}
if base_version_descriptor is not None:
if base_version_descriptor.version_type is not None:
query_parameters['baseVersionDescriptor.VersionType'] = base_version_descriptor.version_type
query_parameters['baseVersionDescriptor.versionType'] = base_version_descriptor.version_type
if base_version_descriptor.version is not None:
query_parameters['baseVersionDescriptor.Version'] = base_version_descriptor.version
query_parameters['baseVersionDescriptor.version'] = base_version_descriptor.version
if base_version_descriptor.version_options is not None:
query_parameters['baseVersionDescriptor.VersionOptions'] = base_version_descriptor.version_options
query_parameters['baseVersionDescriptor.versionOptions'] = base_version_descriptor.version_options
response = self._send(http_method='GET',
location_id='d5b216de-d8d5-4d32-ae76-51df755b16d3',
version='4.0',
Expand Down Expand Up @@ -452,18 +452,18 @@ def get_commits(self, repository_id, search_criteria, project=None, skip=None, t
query_parameters['searchCriteria.toDate'] = search_criteria.to_date
if search_criteria.item_version is not None:
if search_criteria.item_version.version_type is not None:
query_parameters['search_criteria.item_version.VersionType'] = search_criteria.item_version.version_type
query_parameters['searchCriteria.itemVersion.versionType'] = search_criteria.item_version.version_type
if search_criteria.item_version.version is not None:
query_parameters['search_criteria.item_version.Version'] = search_criteria.item_version.version
query_parameters['searchCriteria.itemVersion.version'] = search_criteria.item_version.version
if search_criteria.item_version.version_options is not None:
query_parameters['search_criteria.item_version.VersionOptions'] = search_criteria.item_version.version_options
query_parameters['searchCriteria.itemVersion.versionOptions'] = search_criteria.item_version.version_options
if search_criteria.compare_version is not None:
if search_criteria.compare_version.version_type is not None:
query_parameters['search_criteria.compare_version.VersionType'] = search_criteria.compare_version.version_type
query_parameters['searchCriteria.compareVersion.versionType'] = search_criteria.compare_version.version_type
if search_criteria.compare_version.version is not None:
query_parameters['search_criteria.compare_version.Version'] = search_criteria.compare_version.version
query_parameters['searchCriteria.compareVersion.version'] = search_criteria.compare_version.version
if search_criteria.compare_version.version_options is not None:
query_parameters['search_criteria.compare_version.VersionOptions'] = search_criteria.compare_version.version_options
query_parameters['searchCriteria.compareVersion.versionOptions'] = search_criteria.compare_version.version_options
if search_criteria.from_commit_id is not None:
query_parameters['searchCriteria.fromCommitId'] = search_criteria.from_commit_id
if search_criteria.to_commit_id is not None:
Expand Down Expand Up @@ -810,11 +810,11 @@ def get_item(self, repository_id, path, project=None, scope_path=None, recursion
query_parameters['download'] = self._serialize.query('download', download, 'bool')
if version_descriptor is not None:
if version_descriptor.version_type is not None:
query_parameters['versionDescriptor.VersionType'] = version_descriptor.version_type
query_parameters['versionDescriptor.versionType'] = version_descriptor.version_type
if version_descriptor.version is not None:
query_parameters['versionDescriptor.Version'] = version_descriptor.version
query_parameters['versionDescriptor.version'] = version_descriptor.version
if version_descriptor.version_options is not None:
query_parameters['versionDescriptor.VersionOptions'] = version_descriptor.version_options
query_parameters['versionDescriptor.versionOptions'] = version_descriptor.version_options
response = self._send(http_method='GET',
location_id='fb93c0db-47ed-4a31-8c20-47552878fb44',
version='4.0',
Expand Down Expand Up @@ -856,11 +856,11 @@ def get_item_content(self, repository_id, path, project=None, scope_path=None, r
query_parameters['download'] = self._serialize.query('download', download, 'bool')
if version_descriptor is not None:
if version_descriptor.version_type is not None:
query_parameters['versionDescriptor.VersionType'] = version_descriptor.version_type
query_parameters['versionDescriptor.versionType'] = version_descriptor.version_type
if version_descriptor.version is not None:
query_parameters['versionDescriptor.Version'] = version_descriptor.version
query_parameters['versionDescriptor.version'] = version_descriptor.version
if version_descriptor.version_options is not None:
query_parameters['versionDescriptor.VersionOptions'] = version_descriptor.version_options
query_parameters['versionDescriptor.versionOptions'] = version_descriptor.version_options
response = self._send(http_method='GET',
location_id='fb93c0db-47ed-4a31-8c20-47552878fb44',
version='4.0',
Expand Down Expand Up @@ -902,11 +902,11 @@ def get_items(self, repository_id, project=None, scope_path=None, recursion_leve
query_parameters['includeLinks'] = self._serialize.query('include_links', include_links, 'bool')
if version_descriptor is not None:
if version_descriptor.version_type is not None:
query_parameters['versionDescriptor.VersionType'] = version_descriptor.version_type
query_parameters['versionDescriptor.versionType'] = version_descriptor.version_type
if version_descriptor.version is not None:
query_parameters['versionDescriptor.Version'] = version_descriptor.version
query_parameters['versionDescriptor.version'] = version_descriptor.version
if version_descriptor.version_options is not None:
query_parameters['versionDescriptor.VersionOptions'] = version_descriptor.version_options
query_parameters['versionDescriptor.versionOptions'] = version_descriptor.version_options
response = self._send(http_method='GET',
location_id='fb93c0db-47ed-4a31-8c20-47552878fb44',
version='4.0',
Expand Down Expand Up @@ -949,11 +949,11 @@ def get_item_text(self, repository_id, path, project=None, scope_path=None, recu
query_parameters['download'] = self._serialize.query('download', download, 'bool')
if version_descriptor is not None:
if version_descriptor.version_type is not None:
query_parameters['versionDescriptor.VersionType'] = version_descriptor.version_type
query_parameters['versionDescriptor.versionType'] = version_descriptor.version_type
if version_descriptor.version is not None:
query_parameters['versionDescriptor.Version'] = version_descriptor.version
query_parameters['versionDescriptor.version'] = version_descriptor.version
if version_descriptor.version_options is not None:
query_parameters['versionDescriptor.VersionOptions'] = version_descriptor.version_options
query_parameters['versionDescriptor.versionOptions'] = version_descriptor.version_options
response = self._send(http_method='GET',
location_id='fb93c0db-47ed-4a31-8c20-47552878fb44',
version='4.0',
Expand Down Expand Up @@ -995,11 +995,11 @@ def get_item_zip(self, repository_id, path, project=None, scope_path=None, recur
query_parameters['download'] = self._serialize.query('download', download, 'bool')
if version_descriptor is not None:
if version_descriptor.version_type is not None:
query_parameters['versionDescriptor.VersionType'] = version_descriptor.version_type
query_parameters['versionDescriptor.versionType'] = version_descriptor.version_type
if version_descriptor.version is not None:
query_parameters['versionDescriptor.Version'] = version_descriptor.version
query_parameters['versionDescriptor.version'] = version_descriptor.version
if version_descriptor.version_options is not None:
query_parameters['versionDescriptor.VersionOptions'] = version_descriptor.version_options
query_parameters['versionDescriptor.versionOptions'] = version_descriptor.version_options
response = self._send(http_method='GET',
location_id='fb93c0db-47ed-4a31-8c20-47552878fb44',
version='4.0',
Expand Down
2 changes: 2 additions & 0 deletions vsts/vsts/git/v4_1/git_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,7 @@ def get_vsts_info(self, relative_remote_url):
headers = {'Accept': 'application/json'}
if self._suppress_fedauth_redirect:
headers['X-TFS-FedAuthRedirect'] = 'Suppress'
if self._force_msa_pass_through:
headers['X-VSS-ForceMsaPassThrough'] = 'true'
response = self._send_request(request, headers)
return self._deserialize('VstsInfo', response)
Loading