mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
adding nested try block for tss.py to import new Delinea library (#5151)
* adding nested try block to import delinea library * whitespace * Update plugins/lookup/tss.py Co-authored-by: Felix Fontein <felix@fontein.de> * adding changelog fragment * Update changelogs/fragments/5151-add-delinea-support-tss-lookup.yml Co-authored-by: Felix Fontein <felix@fontein.de> Co-authored-by: Tom Reeb <Thomas.Reeb_e@morganlewis.com> Co-authored-by: Felix Fontein <felix@fontein.de>
This commit is contained in:
parent
be9b445392
commit
9f39294f50
2 changed files with 20 additions and 7 deletions
|
@ -0,0 +1,3 @@
|
|||
---
|
||||
bugfixes:
|
||||
- tss lookup plugin - adding support for updated Delinea library (https://github.com/DelineaXPM/python-tss-sdk/issues/9, https://github.com/ansible-collections/community.general/pull/5151).
|
|
@ -169,6 +169,11 @@ from ansible.utils.display import Display
|
|||
try:
|
||||
from thycotic.secrets.server import SecretServer, SecretServerError
|
||||
|
||||
HAS_TSS_SDK = True
|
||||
except ImportError:
|
||||
try:
|
||||
from delinea.secrets.server import SecretServer, SecretServerError
|
||||
|
||||
HAS_TSS_SDK = True
|
||||
except ImportError:
|
||||
SecretServer = None
|
||||
|
@ -178,6 +183,11 @@ except ImportError:
|
|||
try:
|
||||
from thycotic.secrets.server import PasswordGrantAuthorizer, DomainPasswordGrantAuthorizer, AccessTokenAuthorizer
|
||||
|
||||
HAS_TSS_AUTHORIZER = True
|
||||
except ImportError:
|
||||
try:
|
||||
from delinea.secrets.server import PasswordGrantAuthorizer, DomainPasswordGrantAuthorizer, AccessTokenAuthorizer
|
||||
|
||||
HAS_TSS_AUTHORIZER = True
|
||||
except ImportError:
|
||||
PasswordGrantAuthorizer = None
|
||||
|
|
Loading…
Reference in a new issue