Add revoke_admin_privileges to the client.

geodimm · geodimm · commit a4072b10706e · 2015-05-04T19:02:35.000+01:00
diff --git a/influxdb/client.py b/influxdb/client.py
@@ -630,6 +630,18 @@ def grant_admin_privileges(self, username):
         text = "GRANT ALL PRIVILEGES TO {}".format(username)
         self.query(text)
 
+    def revoke_admin_privileges(self, username):
+        """Revoke cluster administration privileges from an user.
+
+        :param username: the username to revoke privileges from
+        :type username: str
+
+        .. note:: Only a cluster administrator can create/ drop databases
+            and manage users.
+        """
+        text = "REVOKE ALL PRIVILEGES FROM {}".format(username)
+        self.query(text)
+
     def send_packet(self, packet):
         """Send an UDP packet.
 
diff --git a/tests/influxdb/client_test.py b/tests/influxdb/client_test.py
@@ -646,6 +646,28 @@ def test_grant_admin_privileges_invalid(self):
         with _mocked_session(cli, 'get', 400):
             self.cli.grant_admin_privileges('')
 
+    def test_revoke_admin_privileges(self):
+        example_response = '{"results":[{}]}'
+
+        with requests_mock.Mocker() as m:
+            m.register_uri(
+                requests_mock.GET,
+                "http://localhost:8086/query",
+                text=example_response
+            )
+            self.cli.revoke_admin_privileges('test')
+
+            self.assertEqual(
+                m.last_request.qs['q'][0],
+                'revoke all privileges from test'
+            )
+
+    @raises(Exception)
+    def test_revoke_admin_privileges_invalid(self):
+        cli = InfluxDBClient('host', 8086, 'username', 'password')
+        with _mocked_session(cli, 'get', 400):
+            self.cli.revoke_admin_privileges('')
+
 
 class FakeClient(InfluxDBClient):
     fail = False
diff --git a/tests/influxdb/client_test_with_server.py b/tests/influxdb/client_test_with_server.py
@@ -391,6 +391,22 @@ def test_grant_admin_privileges_invalid(self):
         self.assertIn('{"error":"error parsing query: ',
                       ctx.exception.content)
 
+    def test_revoke_admin_privileges(self):
+        self.cli.create_user('test', 'test')
+        self.cli.grant_admin_privileges('test')
+        self.assertEqual([{'user': 'test', 'admin': True}],
+                         self.cli.get_list_users())
+        self.cli.revoke_admin_privileges('test')
+        self.assertEqual([{'user': 'test', 'admin': False}],
+                         self.cli.get_list_users())
+
+    def test_revoke_admin_privileges_invalid(self):
+        with self.assertRaises(InfluxDBClientError) as ctx:
+            self.cli.revoke_admin_privileges('')
+        self.assertEqual(400, ctx.exception.code)
+        self.assertIn('{"error":"error parsing query: ',
+                      ctx.exception.content)
+
 
 ############################################################################
 
