Merge pull request #166 from dataiku/perso/dss95-CH-67160-view-code-env-usage

Revert "[ch58209] Add personal API keys APIs"

Author: qcastel

dataikuapi/dss/admin.py

@@ -798,39 +798,6 @@ def set_definition(self, definition):
             "PUT", "/admin/globalAPIKeys/%s" % self.key,
             body = definition)
 
-class DSSPersonalApiKey(object):
-    """
-    A personal API key on the DSS instance
-    """
-    def __init__(self, client, key):
-        self.client = client
-        self.key = key
-
-    ########################################################
-    # Key deletion
-    ########################################################
-
-    def delete(self):
-        """
-        Delete the api key
-        """
-        return self.client._perform_empty(
-            "DELETE", "/personal-api-keys/%s" % self.key)
-
-    ########################################################
-    # Key description
-    ########################################################
-
-    def get_definition(self):
-        """
-        Get the API key's definition
-
-        Returns:
-            the personal API key definition, as a JSON object
-        """
-        return self.client._perform_json(
-            "GET", "/personal-api-keys/%s" % (self.key))
-
 
 class DSSCluster(object):
     """

dataikuapi/dssclient.py

@@ -10,7 +10,7 @@
 from .dss.project import DSSProject
 from .dss.app import DSSApp
 from .dss.plugin import DSSPlugin
-from .dss.admin import DSSUser, DSSOwnUser, DSSGroup, DSSConnection, DSSGeneralSettings, DSSCodeEnv, DSSGlobalApiKey, DSSCluster, DSSPersonalApiKey
+from .dss.admin import DSSUser, DSSOwnUser, DSSGroup, DSSConnection, DSSGeneralSettings, DSSCodeEnv, DSSGlobalApiKey, DSSCluster
 from .dss.meaning import DSSMeaning
 from .dss.sqlquery import DSSSQLQuery
 from .dss.discussion import DSSObjectDiscussions
@@ -629,48 +629,6 @@ def create_global_api_key(self, label=None, description=None, admin=False):
         key = resp.get('key', '')
         return DSSGlobalApiKey(self, key)
 
-    ########################################################
-    # Personal API Keys
-    ########################################################
-
-    def list_personal_api_keys(self):
-        """
-        List all personal API keys:
-            - not admin: only the keys belonging to the owner of the key
-            - admin: All the personal keys
-
-        :returns: All personal API keys, as a list of dicts
-        """
-        return self._perform_json(
-            "GET", "/personal-api-keys/")
-
-    def get_personal_api_key(self, key):
-        """
-        Get a specific API key from the user doing the request
-
-        :param str key: the secret key of the desired API key
-        :returns: A :class:`dataikuapi.dss.admin.DSSPersonalApiKey` API key handle
-        """
-        return DSSPersonalApiKey(self, key)
-
-    def create_personal_api_key(self, label=""):
-        """
-        Create a Personal API key corresponding to the user doing the request, and return a handle to interact with it
-
-        :param: label string (optional): Label for the new API key
-        :returns: A :class:`dataikuapi.dss.admin.DSSPersonalApiKey` API key handle
-        """
-        resp = self._perform_json(
-            "POST", "/personal-api-keys/", body={"label": label})
-        if resp is None:
-            raise Exception('API key creation returned no data')
-        if resp.get('messages', {}).get('error', False):
-            raise Exception('API key creation failed : %s' % (json.dumps(resp.get('messages', {}).get('messages', {}))))
-        if not resp.get('id', False):
-            raise Exception('API key creation returned no key')
-        key = resp.get('key', '')
-        return DSSPersonalApiKey(self, key)
-
     ########################################################
     # Meanings
     ########################################################
@@ -1003,6 +961,19 @@ def get_ticket_from_browser_headers(self, headers_dict):
          """
          return self._perform_json("POST", "/auth/ticket-from-browser-headers", body=headers_dict)
 
+    def create_personal_api_key(self, label):
+        """
+        Creates a personal API key corresponding to the user doing the request.
+        This can be called if the DSSClient was initialized with an internal
+        ticket or with a personal API key
+
+        :param: label string: Label for the new API key
+        :returns: a dict of the new API key, containing at least "secret", i.e. the actual secret API key
+        :rtype: dict
+        """
+        return self._perform_json("POST", "/auth/personal-api-keys",
+                params={"label": label})
+
     ########################################################
     # Container execution
     ########################################################