oc-cdtapi 3.21.2__py3-none-any.whl → 3.21.6__py3-none-any.whl

oc_cdtapi/PgQAPI.py

@@ -190,7 +190,7 @@ class PgQAPI (object):
         if not queue_id:
             logging.error('queue [%s] does not exist' % queue_code)
             return None
-        ds = self.exec_select('select min(id), count(id) from queue_message where queue_type__oid = %s and status = %s', (queue_id, 'N') )
+        ds = self.exec_select('select min(id), count(id) from queue_message where creation_date < current_timestamp - interval \'1 minute\' and queue_type__oid = %s and status = %s', (queue_id, 'N') )
         if ds[0][1] == 0:
             logging.debug('currently no new messages in queue [%s]' % queue_code)
             return None

oc_cdtapi/VaultAPI.py

@@ -9,14 +9,13 @@ class VaultAPI:
                  vault_enable=False,
                  vault_url=None,
                  vault_token=None,
-                 vault_path=None,
                  vault_mount_point=None,
                  verify_ssl=True):
         self.vault_enable = vault_enable or os.getenv("VAULT_ENABLE")
         self.vault_url = vault_url or os.getenv("VAULT_URL")
         self.vault_token = vault_token or os.getenv("VAULT_TOKEN")
-        self.vault_path = vault_path or os.getenv("VAULT_PATH")
         self.mount_point = vault_mount_point or os.getenv("VAULT_MOUNT_POINT")
+        self.use_staging_secrets = os.getenv("USE_STAGING_ENVIRONMENT", "false").lower() == "true" #Check whether we have env USE_STAGING_ENVIRONMENT true or not
         self.verify_ssl = verify_ssl
         self._client = None
 
@@ -46,16 +45,31 @@ class VaultAPI:
 
         return self._client
 
+    def parse_secret_name(self, name):
+        if 'USER' in name:
+            split_name = name.split('_USER')[0]
+            return split_name, 'USER'
+
+        if 'PASSWORD' in name:
+            split_name = name.split('_PASSWORD')[0]
+            return split_name, 'PASSWORD'
+
+        return 'OTHER', name
+
     def get_secret_from_path(self, name):
         client = self.client
         if client is None:
             return None
 
+        secret_path, credentials = self.parse_secret_name(name)
+        if self.use_staging_secrets:
+            secret_path = secret_path + "_TEST"
+
         try:
-            response = client.secrets.kv.read_secret_version(path=self.vault_path, mount_point=self.mount_point)
-            return response['data']['data'].get(name)
+            response = client.secrets.kv.read_secret_version(path=secret_path, mount_point=self.mount_point)
+            return response['data']['data'].get(credentials)
         except VaultError as e:
-            logging.warning(f"Failed getting data from vault: {e}")
+            logging.warning(f"Failed getting data from vault for path {secret_path} and credentials {credentials}: {e}")
             return None
 
     def load_secret(self, name, default=None):

{oc_cdtapi-3.21.2.dist-info → oc_cdtapi-3.21.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oc-cdtapi
-Version: 3.21.2
+Version: 3.21.6
 Summary: Custom Development python API libraries
 License: Apache2.0
 Requires-Python: >=3.6

{oc_cdtapi-3.21.2.dist-info → oc_cdtapi-3.21.6.dist-info}/RECORD

@@ -7,14 +7,14 @@ oc_cdtapi/ForemanAPI.py,sha256=9r1MSOsubiSxM1sdzF2MHD7IcSwX9Y4UDJknHqQK07g,44255
 oc_cdtapi/JenkinsAPI.py,sha256=lZ8pe3a4eb_6h53JE7QLuzOSlu7Sqatc9PQwWhio9Vg,15748
 oc_cdtapi/NexusAPI.py,sha256=uU12GtHvKlWorFaPAnFcQ5AGEc94MZ5SdmfM2Pw3F7A,26122
 oc_cdtapi/PgAPI.py,sha256=URSz7qu-Ir7AOj0jI3ucTXn2PM-nC96nmPZI746OLjA,14356
-oc_cdtapi/PgQAPI.py,sha256=CUN3TSvyglglJ5EgzIt-iE7PX6atKKycoPMHyLkT6oA,8658
+oc_cdtapi/PgQAPI.py,sha256=q7FjC4HGotLXg-vZ2h6VcmlWAkBMdV_B37sicDaL7PU,8720
 oc_cdtapi/RundeckAPI.py,sha256=O3LmcFaHSz8UqeUyIHTTEMJncDD191Utd-iZaeJay2s,24243
 oc_cdtapi/TestServer.py,sha256=HV97UWg2IK4gOYAp9yaMdwFUWsw9v66MxyZdI3qQctA,2715
-oc_cdtapi/VaultAPI.py,sha256=4-fIFJ6x7BFaF6YJIRY0QKW2umGVGlGKZqx_gldI0ow,2259
+oc_cdtapi/VaultAPI.py,sha256=OgKS5GFDAzs_6YlAv412OzFy2Cd4H1z-KjBGKfb__tY,2838
 oc_cdtapi/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-oc_cdtapi-3.21.2.data/scripts/nexus.py,sha256=4teqZ_KtCSrwHDJVgA7lkreteod4Xt5XJFZNbwb7E6E,6858
-oc_cdtapi-3.21.2.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-oc_cdtapi-3.21.2.dist-info/METADATA,sha256=Ss_KnNrUfZKUqThcxOc3BmgOzgm182tXiciWvuQwlBU,504
-oc_cdtapi-3.21.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-oc_cdtapi-3.21.2.dist-info/top_level.txt,sha256=d4-5-D-0CSeSXYuLCP7-nIFCpjkfmJr-Y_muzds8iVU,10
-oc_cdtapi-3.21.2.dist-info/RECORD,,
+oc_cdtapi-3.21.6.data/scripts/nexus.py,sha256=4teqZ_KtCSrwHDJVgA7lkreteod4Xt5XJFZNbwb7E6E,6858
+oc_cdtapi-3.21.6.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+oc_cdtapi-3.21.6.dist-info/METADATA,sha256=fttjVI1dKLAQ6ssYhpEaLkEdK7b9uiMlfD-U8I-JiMA,504
+oc_cdtapi-3.21.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+oc_cdtapi-3.21.6.dist-info/top_level.txt,sha256=d4-5-D-0CSeSXYuLCP7-nIFCpjkfmJr-Y_muzds8iVU,10
+oc_cdtapi-3.21.6.dist-info/RECORD,,