ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

adding nested try block for tss.py to import new Delinea library (#5151)

Browse source 
* 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:
Tom Reeb 2022-08-23 15:53:06 -04:00 committed by GitHub
parent be9b445392
commit 9f39294f50
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
changelogs/fragments/5151-add-delinea-support-tss-lookup.yml Normal file
View file

@ -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).

10
plugins/lookup/tss.py
View file

@ -169,6 +169,11 @@ from ansible.utils.display import Display
try: try:
from thycotic.secrets.server import SecretServer, SecretServerError 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 HAS_TSS_SDK = True
except ImportError: except ImportError:
SecretServer = None SecretServer = None
@ -178,6 +183,11 @@ except ImportError:
try: try:
from thycotic.secrets.server import PasswordGrantAuthorizer, DomainPasswordGrantAuthorizer, AccessTokenAuthorizer 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 HAS_TSS_AUTHORIZER = True
except ImportError: except ImportError:
PasswordGrantAuthorizer = None PasswordGrantAuthorizer = None