Added some more options to http lib (#54)

* Added some more options to http lib

Author: Werner Dijkerman

.pre-commit-config.yaml

@@ -5,17 +5,9 @@ repos:
   - id: shellcheck
   - id: markdown-toc
   - id: verify-yaml
-  - id: no-commit-on-branch
-    args: ['-b master,main']
-
-# - repo: https://gitlab.com/pycqa/flake8
-#   rev: 3.8.4
-#   hooks:
-#   - id: flake8
-#     additional_dependencies: [flake8-typing-imports==1.7.0]
 
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v3.4.0
+  rev: v4.6.0
   hooks:
   - id: end-of-file-fixer
   - id: trailing-whitespace

CONTRIBUTORS

@@ -1,2 +1,3 @@
  Werner Dijkerman
  Werner Dijkerman [GH bot]
+ dependabot[bot]

lib/djWasabi/http.py

@@ -1,12 +1,12 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
-import sys
 import requests
-from . import generic
+import urllib3
 from requests.adapters import HTTPAdapter
 from requests.packages.urllib3.util.retry import Retry
 from http.client import HTTPConnection
 
+urllib3.disable_warnings()
 
 class request():
     """."""
@@ -83,6 +83,8 @@ def _get(self, url: str = None, headers: dict = {}, username: str = None, passwo
 
         try:
             return (True, self.http.get(url, **kwargs))
+        except requests.exceptions.SSLError as e:
+            return (False, {'error': e})
         except requests.exceptions.RequestException as e:
             return (False, {'error': e})
 
@@ -117,7 +119,7 @@ def _patch(self, url: str = None, headers: dict = {}, data: dict = {}, username:
         except requests.exceptions.RequestException as e:
             return (False, {'error': e})
 
-    def _post(self, url: str = None, headers: dict = {}, data: dict = {}, username: str = None, password: str = None) -> tuple:
+    def _post(self, url: str = None, headers: dict = {}, data: dict = {}, username: str = None, password: str = None, files: str = None) -> tuple:
         """POST the information from provided url.
 
         :param url: The URL we want to POST.
@@ -130,31 +132,38 @@ def _post(self, url: str = None, headers: dict = {}, data: dict = {}, username:
         :type username: str
         :param password: The password for the provided username.
         :type password: str
+        :param files: The contents of the file to be posted.
+        :type files: obj
         :rtype: tuple
         :return: Succes (or not) with the request object
         """
         if not url:
             raise ValueError('Please provide the URL.')
-
         kwargs = {
-            "headers": headers,
-            "data": data
+            "headers": headers
         }
+
+        if len(data) > 0:
+            kwargs['data'] = data
         if username is not None and password is not None:
             kwargs['auth'] = (username, password)
+        if files is not None:
+            kwargs['files'] = files
 
         try:
             return (True, self.http.post(url, **kwargs))
         except requests.exceptions.RequestException as e:
             return (False, {'error': e})
 
-    def _put(self, url: str = None, headers: dict = {}, username: str = None, password: str = None) -> tuple:
+    def _put(self, url: str = None, headers: dict = {}, data: dict = {}, username: str = None, password: str = None) -> tuple:
         """PUT the information from provided url.
 
         :param url: The URL we want to PUT.
         :type url: str
         :param headers: The headers.
         :type headers: dict
+        :param data: The data we want to PUT.
+        :type data: dict
         :param username: The username that needs to be used when authentication is needed.
         :type username: str
         :param password: The password for the provided username.
@@ -168,6 +177,8 @@ def _put(self, url: str = None, headers: dict = {}, username: str = None, passwo
         kwargs = {
             "headers": headers
         }
+        if len(data) > 0:
+            kwargs['data'] = data
         if username is not None and password is not None:
             kwargs['auth'] = (username, password)
 
@@ -215,14 +226,18 @@ def verifyResponse(self, success: bool = False, data: dict = {}) -> dict:
         :return: The combination of the default and overriden config.
         """
         if success and data.ok:
-            generic.debugLog(debug=self.debug, message="We have successful request, returning json data.")
-            return data.json()
+            try:
+                return data.json()
+            except:
+                return data.content
         else:
-            error = {
-                "status": data.status_code,
-                "headers": data.headers,
-                "url": data.url,
-                "text": data.text
-            }
-            print(error)
-            sys.exit(1)
+            error = {"error": True}
+            if 'headers' in data:
+                error['headers'] = data.headers
+            if 'url' in data:
+                error['url'] = data.url
+            if 'text' in data:
+                error['text'] = data.text
+            if 'status_code' in data:
+                error["status"] = data.status_code
+            return(error)

requirements-djwasabi.txt

@@ -1,3 +1,3 @@
-pytest-cov==2.11.1
-responses==0.12.1
-PyYAML==5.4.1
+pytest-cov==5.0.0
+responses==0.25.3
+PyYAML==6.0.1

requirements.txt

@@ -1,14 +1,14 @@
-ansible-compat==2.2.1
-ansible-core==2.14.5
-ansible-lint==6.15.0
-ansible==7.5.0
+ansible-compat==24.7.0
+ansible-core==2.17.1
+ansible-lint==24.7.0
+ansible==10.1.0
 dependencies==7.7.0
-docker==6.0.1
-dockerfile-parse==2.0.0
+docker==7.1.0
+dockerfile-parse==2.0.1
 ipaddr==2.2.0
 ipaddress==1.0.23
 molecule-docker==2.1.0
 molecule-vagrant==2.0.0
-molecule==5.0.0
-netaddr==0.8.0
-pytest-testinfra==7.0.0
+molecule==24.7.0
+netaddr==1.3.0
+pytest-testinfra==10.1.1