Remove use of Python requests for jbossnetworkapi

Signed-off-by: Andrew Block <andy.block@gmail.com>

Author: sabre1041

README.md

@@ -51,7 +51,8 @@ Clone the repository, checkout the tag you want to build, or pick the main branc
 
 #### Python:
 
-* [requests](https://requests.readthedocs.io/en/latest/)
+* [jmespath](https://jmespath.org/)
+* [lxml](https://lxml.de/)
 
 To install all the dependencies via galaxy:
 

bindep.txt

@@ -1 +0,0 @@
-python3-requests [platform:rpm]

plugins/module_utils/jbossnetwork.py

@@ -16,12 +16,6 @@
 
 __metaclass__ = type
 
-try:
-    import requests
-    HAS_REQUESTS = True
-except ImportError:
-    HAS_REQUESTS = False
-
 from ansible_collections.middleware_automation.common.plugins.module_utils.constants import (
     QUERY_PAGE_SIZE,
     NEXT_CURSOR_FIELD,
@@ -36,7 +30,10 @@
     SEARCH_PARAM_NAME
 )
 
+import json
 from ansible.module_utils._text import to_native
+from ansible.module_utils.urls import Request
+from ansible.module_utils.six.moves.urllib.parse import urlencode
 
 
 def get_authenticated_session(module, sso_url, validate_certs, client_id, client_secret):
@@ -48,26 +45,22 @@ def get_authenticated_session(module, sso_url, validate_certs, client_id, client
         "grant_type": "client_credentials",
     }
 
-    # Obtain Access Token
-    if HAS_REQUESTS:
-        token_request = requests.post(
-            f"{sso_url}/auth/realms/redhat-external/protocol/openid-connect/token",
-            data=token_request_data, verify=validate_certs)
+    # Initialize Session
+    session = Request(validate_certs=validate_certs, headers={})
 
     try:
-        token_request.raise_for_status()
+        token_request = session.post(f"{sso_url}/auth/realms/redhat-external/protocol/openid-connect/token", data=urlencode(token_request_data))
+
     except Exception as err:
         module.fail_json(msg="Error Retrieving SSO Access Token: %s" % (to_native(err)))
 
-    access_token = token_request.json()["access_token"]
+    access_token = json.loads(token_request.read())["access_token"]
 
     # Setup Session
-    if HAS_REQUESTS:
-        session = requests.Session()
-        session.headers = {
-            "Authorization": f"Bearer {access_token}",
-            "Content-Type": "application/json",
-        }
+    session.headers = {
+        "Authorization": f"Bearer {access_token}",
+        "Content-Type": "application/json",
+    }
 
     return session
 
@@ -107,10 +100,22 @@ def perform_search(session, url, validate_certs, params=None):
 
         params.update(pagination_params)
 
-        query_request = session.get(url, params=params, verify=validate_certs)
-        query_request.raise_for_status()
+        full_url = []
+        full_url.append(url)
+
+        if len(params) > 0:
+
+            # Remove None Keys
+            none_keys = [k for (k, v) in params.items() if v is None]
+            for key in none_keys:
+                del params[key]
+
+            full_url.append("?")
+            full_url.append(urlencode(params))
+
+        query_request = session.get("".join(full_url))
 
-        query_result_json = query_request.json()
+        query_result_json = json.loads(query_request.read())
 
         results.extend(
             query_result_json[RESULTS_FIELD])

plugins/modules/product_download.py

@@ -43,8 +43,6 @@
 short_description: Downloads products from the JBoss Network API.
 description:
     - Downloads products from the JBoss Network API.
-requirements:
-    - requests
 extends_documentation_fragment:
     - files
     - middleware_automation.common.jbossnetwork_connection_options
@@ -131,11 +129,9 @@
     sample: 100
 """
 
-import traceback
 import os
 import copy
 from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.basic import missing_required_lib
 from ansible.module_utils._text import to_native
 
 from ansible_collections.middleware_automation.common.plugins.module_utils.jbossnetwork import (
@@ -157,16 +153,6 @@
     LIST_PRODUCT_CATEGORIES_ENDPOINT
 )
 
-try:
-    import requests
-    requests_version = requests.__version__
-    HAS_REQUESTS = True
-except ImportError:
-    HAS_REQUESTS = False
-    REQUESTS_IMP_ERR = traceback.format_exc()
-else:
-    REQUESTS_IMP_ERR = None
-
 
 def argspec():
     argument_spec = copy.deepcopy(JBOSS_NETWORK_COMMON_ARGS_SPEC)
@@ -183,9 +169,6 @@ def main():
         add_file_common_args=True
     )
 
-    if not HAS_REQUESTS:
-        module.fail_json(msg=missing_required_lib("requests"), exception=REQUESTS_IMP_ERR)
-
     client_id = module.params.get('client_id')
     client_secret = module.params.get('client_secret')
     api_url = module.params.get('api_url')
@@ -289,11 +272,13 @@ def main():
             module.fail_json(msg="Destination %s is not writable" % (os.path.dirname(dest)), **result)
 
     try:
-        with session.get(search_results[0]["download_path"], verify=validate_certs,
-                         stream=True, allow_redirects=True, headers={"User-Agent": "product_download"}) as r:
-            r.raise_for_status()
+        with session.get(search_results[0]["download_path"], follow_redirects=True, headers={"User-Agent": "product_download"}) as r:
+            chunk_size = 8192
             with open(dest, 'wb') as f:
-                for chunk in r.iter_content(chunk_size=8192):
+                while True:
+                    chunk = r.read(chunk_size)
+                    if not chunk:
+                        break
                     f.write(chunk)
 
         result['changed'] = True

plugins/modules/product_search.py

@@ -43,8 +43,6 @@
 short_description: Searches products from the JBoss Network API.
 description:
     - Searches products from the JBoss Network API.
-requirements:
-    - requests
 extends_documentation_fragment:
     - middleware_automation.common.jbossnetwork_connection_options
 """
@@ -116,11 +114,9 @@
       type: str
 """
 
-import traceback
 import os
 import copy
 from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.basic import missing_required_lib
 from ansible.module_utils._text import to_native
 
 from ansible_collections.middleware_automation.common.plugins.module_utils.jbossnetwork import (
@@ -143,17 +139,6 @@
 )
 
 
-try:
-    import requests
-    requests_version = requests.__version__
-    HAS_REQUESTS = True
-except ImportError:
-    HAS_REQUESTS = False
-    REQUESTS_IMP_ERR = traceback.format_exc()
-else:
-    REQUESTS_IMP_ERR = None
-
-
 def argspec():
     argument_spec = copy.deepcopy(JBOSS_NETWORK_COMMON_ARGS_SPEC)
     argument_spec.update(copy.deepcopy(JBOSS_NETWORK_SEARCH_ARGS_SPEC))
@@ -167,9 +152,6 @@ def main():
         add_file_common_args=False
     )
 
-    if not HAS_REQUESTS:
-        module.fail_json(msg=missing_required_lib("requests"), exception=REQUESTS_IMP_ERR)
-
     client_id = module.params.get('client_id')
     client_secret = module.params.get('client_secret')
     api_url = module.params.get('api_url')

requirements.txt

@@ -1,3 +1,2 @@
-requests
 lxml
 jmespath