Merge pull request #144 from DevoInc/feature/PAR-13586

Feature/par 13586

Author: JuanFranDevo

CHANGELOG.md

@@ -4,13 +4,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## [3.6.2] - 2022-05-19
+## [3.6.3] - 2022-07-12
 ### Fixed
  * Dependencies updated for `click` and `PyYAML`
  * Some small fixes in documentation
+ * `urllib3` dependencies forced for [CVE-2021-33503](https://nvd.nist.gov/vuln/detail/CVE-2021-33503)
+ * Query in REST API test to be configurable by environment variable
 
 
-## [3.6.1] - 2022-05-19
+## [3.6.2] - 2022-05-30
 ### Fixed
  * Some events are not sent completely due to the use of `socket.send()` instead of `socket.sendall()` [#141]
 

environment.env.example

@@ -11,4 +11,4 @@ DEVO_SENDER_KEY=/opt/devo-python-sdk/certs/client.key
 DEVO_SENDER_CERT=/opt/devo-python-sdk/certs/client.crt
 DEVO_SENDER_CHAIN=/opt/devo-python-sdk/certs/ca.crt
 DEVO_TEST_TCP=True
-
+DEVO_API_QUERY=from web.all.access select * limit 1

requirements.txt

@@ -3,3 +3,4 @@ PyYAML==6.0
 requests==2.27.1
 pem==21.2.0
 pyopenssl==22.0.0
+urllib3>=1.26.5

setup.py

@@ -27,7 +27,7 @@
     "Topic :: Software Development :: Libraries :: Python Modules",
 ]
 INSTALL_REQUIRES = ['requests==2.27.1', 'click==8.1.3', 'PyYAML==6.0',
-                    'pem==21.2.0', 'pyopenssl==22.0.0']
+                    'pem==21.2.0', 'pyopenssl==22.0.0', 'urllib3>=1.26.5']
 CLI = ['devo-sender=devo.sender.scripts.sender_cli:cli',
        'devo-api=devo.api.scripts.client_cli:cli']
 

tests/api/query.py

@@ -11,7 +11,8 @@
 
 class TestApi(unittest.TestCase):
     def setUp(self):
-        self.query = 'from demo.ecommerce.data select * limit 1'
+        self.query = os.getenv('DEVO_API_QUERY',
+                               'from demo.ecommerce.data select * limit 1')
         self.query_no_results = \
             'from demo.ecommerce.data where method = "TEST" select * limit 1'
         self.app_name = "testing-app_name"
@@ -26,9 +27,10 @@ def setUp(self):
 
     def test_from_dict(self):
         api = Client(config=
-            {'key': self.key, 'secret': self.secret, 'address': self.uri,
-             'user': self.user, 'app_name': self.app_name}
-            )
+                     {'key': self.key, 'secret': self.secret,
+                      'address': self.uri,
+                      'user': self.user, 'app_name': self.app_name}
+                     )
 
         self.assertTrue(isinstance(api, Client))