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).
|
|
@ -171,19 +171,29 @@ try:
|
||||||
|
|
||||||
HAS_TSS_SDK = True
|
HAS_TSS_SDK = True
|
||||||
except ImportError:
|
except ImportError:
|
||||||
SecretServer = None
|
try:
|
||||||
SecretServerError = None
|
from delinea.secrets.server import SecretServer, SecretServerError
|
||||||
HAS_TSS_SDK = False
|
|
||||||
|
HAS_TSS_SDK = True
|
||||||
|
except ImportError:
|
||||||
|
SecretServer = None
|
||||||
|
SecretServerError = None
|
||||||
|
HAS_TSS_SDK = False
|
||||||
|
|
||||||
try:
|
try:
|
||||||
from thycotic.secrets.server import PasswordGrantAuthorizer, DomainPasswordGrantAuthorizer, AccessTokenAuthorizer
|
from thycotic.secrets.server import PasswordGrantAuthorizer, DomainPasswordGrantAuthorizer, AccessTokenAuthorizer
|
||||||
|
|
||||||
HAS_TSS_AUTHORIZER = True
|
HAS_TSS_AUTHORIZER = True
|
||||||
except ImportError:
|
except ImportError:
|
||||||
PasswordGrantAuthorizer = None
|
try:
|
||||||
DomainPasswordGrantAuthorizer = None
|
from delinea.secrets.server import PasswordGrantAuthorizer, DomainPasswordGrantAuthorizer, AccessTokenAuthorizer
|
||||||
AccessTokenAuthorizer = None
|
|
||||||
HAS_TSS_AUTHORIZER = False
|
HAS_TSS_AUTHORIZER = True
|
||||||
|
except ImportError:
|
||||||
|
PasswordGrantAuthorizer = None
|
||||||
|
DomainPasswordGrantAuthorizer = None
|
||||||
|
AccessTokenAuthorizer = None
|
||||||
|
HAS_TSS_AUTHORIZER = False
|
||||||
|
|
||||||
|
|
||||||
display = Display()
|
display = Display()
|
||||||
|
|
Loading…
Reference in a new issue