Merge pull request #141 from ARGOeu/devel

release 0.5.7
ARGOeu · Jul 26, 2022 · cced055 · cced055
2 parents 7be4d7c + e34ca09
commit cced055
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## [0.5.7] - 2022-06-22
+
+### Fixed
+
+AM-249 ams-library: bug fix regarding sub and topic acl methods #137
+
 ## [0.5.6] - 2022-06-21
 
 ### Added 

diff --git a/argo-ams-library.spec b/argo-ams-library.spec
@@ -6,7 +6,7 @@
 
 Name:           argo-ams-library
 Summary:        %{sum}
-Version:        0.5.6
+Version:        0.5.7
 Release:        1%{?dist}
 
 Group:          Development/Libraries
@@ -95,6 +95,8 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Jun 22 2022 agelostsal <[email protected]> - 0.5.7-1%{?dist}
+- AM-249 ams-library: bug fix regarding sub and topic acl methods
 * Tue Jun 21 2022 agelostsal <[email protected]> - 0.5.6-1%{?dist}
 - AM-233 ams-library: support for project_member_get api call
 - AM-230 ams-library: support for project_member_add api call

diff --git a/pymod/ams.py b/pymod/ams.py
@@ -482,7 +482,7 @@ def getacl_topic(self, topic, **reqkwargs):
                           python-requests library call.
         """
 
-        topicobj = self.get_topic(topic, retobj=True)
+        topicobj = self.get_topic(topic, retobj=True, **reqkwargs)
 
         route = self.routes["topic_getacl"]
         # Compose url
@@ -511,7 +511,7 @@ def modifyacl_topic(self, topic, users, **reqkwargs):
                           python-requests library call.
         """
 
-        topicobj = self.get_topic(topic, retobj=True)
+        topicobj = self.get_topic(topic, retobj=True, **reqkwargs)
 
         route = self.routes["topic_modifyacl"]
         # Compose url
@@ -542,7 +542,7 @@ def getacl_sub(self, sub, **reqkwargs):
                           python-requests library call.
         """
 
-        subobj = self.get_sub(sub, retobj=True)
+        subobj = self.get_sub(sub, retobj=True, **reqkwargs)
 
         route = self.routes["sub_getacl"]
         # Compose url
@@ -654,7 +654,7 @@ def modifyacl_sub(self, sub, users, **reqkwargs):
                           python-requests library call.
         """
 
-        subobj = self.get_sub(sub, retobj=True)
+        subobj = self.get_sub(sub, retobj=True, **reqkwargs)
 
         route = self.routes["sub_modifyacl"]
         # Compose url
@@ -1115,7 +1115,6 @@ def add_project_member(self, username, project=None, roles=None, **reqkwargs):
             project = self.project
 
         body = {
-                "project": project,
                 "roles": roles
         }
 

diff --git a/setup.py b/setup.py
@@ -46,5 +46,5 @@ def get_ver():
     url='https://github.com/ARGOeu/argo-ams-library',
     package_dir={'argo_ams_library': 'pymod/'},
     packages=['argo_ams_library'],
-    install_requires=['requests']
+    install_requires=['requests==2.20']
 )
diff --git a/tests/test_project.py b/tests/test_project.py
@@ -38,7 +38,6 @@ def testAddMember(self):
         def add_member_mock(url, request):
             self.assertEqual("/v1/projects/test-proj/members/test-member:add", url.path)
             self.assertEqual("POST", request.method)
-            self.assertTrue('"project": "test-proj"' in request.body)
             self.assertTrue('"roles": ["consumer"]' in request.body)
             return response(200, self.member_json, None, None, 5, request)
 

diff --git a/tox.ini b/tox.ini
@@ -6,7 +6,7 @@ deps = coverage==4.5.4
        pytest
        httmock
        mock
-       requests0: requests
+       requests0: requests==2.20   
        requests2123: requests==2.12.3
        requests260: requests==2.6.0
        requests2125: requests==2.12.5