From c75757bf22e9d94af55c3934b59a58eb1d1c94cc Mon Sep 17 00:00:00 2001 From: delinea-sagar <131447653+delinea-sagar@users.noreply.github.com> Date: Wed, 16 Aug 2023 16:07:35 -0400 Subject: [PATCH] Update python-tss-sdk dependency (#14207) Signed-off-by: delinea-sagar --- awx/main/credential_plugins/tss.py | 5 ++++- requirements/requirements.in | 2 +- requirements/requirements.txt | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/awx/main/credential_plugins/tss.py b/awx/main/credential_plugins/tss.py index bb3c9e054c..85cc5f5ada 100644 --- a/awx/main/credential_plugins/tss.py +++ b/awx/main/credential_plugins/tss.py @@ -1,7 +1,10 @@ from .plugin import CredentialPlugin from django.utils.translation import gettext_lazy as _ -from thycotic.secrets.server import DomainPasswordGrantAuthorizer, PasswordGrantAuthorizer, SecretServer, ServerSecret +try: + from delinea.secrets.server import DomainPasswordGrantAuthorizer, PasswordGrantAuthorizer, SecretServer, ServerSecret +except ImportError: + from thycotic.secrets.server import DomainPasswordGrantAuthorizer, PasswordGrantAuthorizer, SecretServer, ServerSecret tss_inputs = { 'fields': [ diff --git a/requirements/requirements.in b/requirements/requirements.in index 8b58a85af2..3f1e990c52 100644 --- a/requirements/requirements.in +++ b/requirements/requirements.in @@ -42,7 +42,7 @@ pygerduty pyparsing==2.4.6 # Upgrading to v3 of pyparsing introduce errors on smart host filtering: Expected 'or' term, found 'or' (at char 15), (line:1, col:16) python-daemon>3.0.0 python-dsv-sdk -python-tss-sdk==1.0.0 +python-tss-sdk==1.2.1 python-ldap pyyaml>=6.0.1 receptorctl==1.3.0 diff --git a/requirements/requirements.txt b/requirements/requirements.txt index c9dabf84cb..dd93a384fa 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -333,7 +333,7 @@ python-ldap==3.4.3 # django-auth-ldap python-string-utils==1.0.0 # via openshift -python-tss-sdk==1.0.0 +python-tss-sdk==1.2.1 # via -r /awx_devel/requirements/requirements.in python3-openid==3.2.0 # via social-auth-core