Release 1.69.0 (#185)

Author: fa-ui-bot

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "py-pure-client"
-version = "1.68.0"
+version = "1.69.0"
 description = "Pure Storage Python clients for FlashArray, FlashBlade, and Pure1 APIs"
 authors = [
     { name = "Pure Storage", email = "[email protected]" }

pypureclient/_version.py

@@ -1,3 +1,3 @@
 __name__ = 'py-pure-client'
-__version__ = '1.68.0'
+__version__ = '1.69.0'
 __default_user_agent__ = 'pure/{}/{}'.format(__name__, __version__)

pypureclient/api_token_manager.py

@@ -12,7 +12,7 @@ class APITokenManager(object):
     A valid session token is stored in memory.
     """
 
-    def __init__(self, token_endpoint, api_token, verify_ssl=True, token_dispose_endpoint=None, user_agent=None):
+    def __init__(self, token_endpoint, api_token, verify_ssl=True, token_dispose_endpoint=None, user_agent=None, timeout=None):
         """
         Initialize a APITokenManager. Should be treated as a static object.
 
@@ -30,6 +30,7 @@ def __init__(self, token_endpoint, api_token, verify_ssl=True, token_dispose_end
         self._verify_ssl = verify_ssl
         self._session_token = None
         self._user_agent = user_agent
+        self._timeout = timeout
         self.get_session_token(refresh=True)
         # Register a function to close the session when the program exits
         atexit.register(self.close_session)
@@ -68,7 +69,7 @@ def _request_session_token(self):
             Headers.user_agent: self._user_agent,
             Headers.x_request_id: str(uuid.uuid4())
         }
-        response = requests.post(self._token_endpoint, headers=post_headers, verify=self._verify_ssl)
+        response = requests.post(self._token_endpoint, headers=post_headers, verify=self._verify_ssl, timeout=self._timeout)
         if response.status_code == requests.codes.ok:
             return str(response.headers[Headers.x_auth_token])
         else:
@@ -86,7 +87,7 @@ def close_session(self):
                 Headers.user_agent: self._user_agent,
                 Headers.x_request_id: str(uuid.uuid4())
             }
-            requests.post(self._token_dispose_endpoint, headers=delete_headers, verify=self._verify_ssl)
+            requests.post(self._token_dispose_endpoint, headers=delete_headers, verify=self._verify_ssl, timeout=self._timeout)
             self._session_token = None
         except:
             pass

pypureclient/client_settings.py

@@ -1,6 +1,7 @@
 import requests
 import uuid
 
+from typing import Union, Tuple
 from .keywords import Headers
 
 
@@ -11,11 +12,12 @@ def resolve_ssl_validation(verify_ssl):
     return verify_ssl if verify_ssl is not None else False
 
 
-def get_target_versions(target, target_type, key_to_check, verify_ssl=None):
+def get_target_versions(target, target_type, key_to_check, verify_ssl=None, timeout: Union[int, Tuple[float, float]]=None):
     from ._version import __default_user_agent__
     from . import PureError
     url = 'https://{target}/api/api_version'.format(target=target)
     response = requests.get(url,
+                            timeout=timeout,
                             verify=resolve_ssl_validation(verify_ssl),
                             headers={
                                 Headers.user_agent: __default_user_agent__,