ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-23 13:20:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Bump dependency versions to avoid conflicts (#54443)

Browse source 
* Bump dependency versions to avoid conflicts

* Fix module code to support newer SDK packages

* Fix keyvault module are upgrading deps
This commit is contained in:
Jordan Borean 2019-04-03 05:40:52 +10:00 • committed by GitHub
commit 8b1b22ddc7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 78 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/modules/cloud/azure/azure_rm_webapp_facts.py
View file

@ -149,7 +149,7 @@ webapps:
'''
try:
from msrestazure.azure_exceptions import CloudError
from msrestazure.azure_operation import AzureOperationPoller
from msrest.polling import LROPoller
from azure.common import AzureMissingResourceHttpError, AzureHttpError
except Exception:
# This is handled in azure_rm_common
@ -277,7 +277,7 @@ class AzureRMWebAppFacts(AzureRMModuleBase):
self.log('Get web app {0} publish credentials'.format(name))
try:
poller = self.web_client.web_apps.list_publishing_credentials(resource_group, name)
if isinstance(poller, AzureOperationPoller):
if isinstance(poller, LROPoller):
response = self.get_poller_result(poller)
except CloudError as ex:
request_id = ex.request_id if ex.request_id else ''