Fix the CLI for objects without ID (API v4)

Gauvain Pocentek · Gauvain Pocentek · commit 9dd410feec4f · 2017-11-01T16:01:40.000+01:00
Fixes python-gitlab#319
diff --git a/gitlab/mixins.py b/gitlab/mixins.py
@@ -51,7 +51,7 @@ def get(self, id, lazy=False, **kwargs):
 
 class GetWithoutIdMixin(object):
     @exc.on_http_error(exc.GitlabGetError)
-    def get(self, **kwargs):
+    def get(self, id=None, **kwargs):
         """Retrieve a single object.
 
         Args:
diff --git a/gitlab/v4/cli.py b/gitlab/v4/cli.py
@@ -83,7 +83,7 @@ def do_list(self):
 
     def do_get(self):
         id = None
-        if gitlab.mixins.GetWithoutIdMixin not in inspect.getmro(self.cls):
+        if gitlab.mixins.GetWithoutIdMixin not in inspect.getmro(self.mgr_cls):
             id = self.args.pop(self.cls._id_attr)
 
         try:
@@ -99,7 +99,9 @@ def do_delete(self):
             cli.die("Impossible to destroy object", e)
 
     def do_update(self):
-        id = self.args.pop(self.cls._id_attr)
+        id = None
+        if gitlab.mixins.GetWithoutIdMixin not in inspect.getmro(self.mgr_cls):
+            id = self.args.pop(self.cls._id_attr)
         try:
             return self.mgr.update(id, self.args)
         except Exception as e:
@@ -282,15 +284,18 @@ def display_dict(d, padding):
                 return
 
             # not a dict, we assume it's a RESTObject
-            id = getattr(obj, obj._id_attr, None)
-            print('%s: %s' % (obj._id_attr, id))
+            if obj._id_attr:
+                id = getattr(obj, obj._id_attr, None)
+                print('%s: %s' % (obj._id_attr, id))
             attrs = obj.attributes
-            attrs.pop(obj._id_attr)
+            if obj._id_attr:
+                attrs.pop(obj._id_attr)
             display_dict(attrs, padding)
 
         else:
-            id = getattr(obj, obj._id_attr)
-            print('%s: %s' % (obj._id_attr.replace('_', '-'), id))
+            if obj._id_attr:
+                id = getattr(obj, obj._id_attr)
+                print('%s: %s' % (obj._id_attr.replace('_', '-'), id))
             if hasattr(obj, '_short_print_attr'):
                 value = getattr(obj, obj._short_print_attr)
                 print('%s: %s' % (obj._short_print_attr, value))
diff --git a/tools/cli_test_v4.sh b/tools/cli_test_v4.sh
@@ -95,9 +95,18 @@ testcase "branch deletion" '
 '
 
 testcase "project upload" '
-    GITLAB project upload --id "$PROJECT_ID" --filename '$(basename $0)' --filepath '$0'
+    GITLAB project upload --id "$PROJECT_ID" \
+        --filename '$(basename $0)' --filepath '$0' >/dev/null 2>&1
 '
 
 testcase "project deletion" '
     GITLAB project delete --id "$PROJECT_ID"
 '
+
+testcase "application settings get" '
+    GITLAB application-settings get >/dev/null 2>&1
+'
+
+testcase "application settings update" '
+    GITLAB application-settings update --signup-enabled false
+'

Original file line number	Diff line number	Diff line change
`@@ -95,9 +95,18 @@ testcase "branch deletion" '`
`95`	`95`	`'`
`96`	`96`
`97`	`97`	`testcase "project upload" '`
`98`		`- GITLAB project upload --id "$PROJECT_ID" --filename '$(basename $0)' --filepath '$0'`
	`98`	`+ GITLAB project upload --id "$PROJECT_ID" \`
	`99`	`+ --filename '$(basename $0)' --filepath '$0' >/dev/null 2>&1`
`99`	`100`	`'`
`100`	`101`
`101`	`102`	`testcase "project deletion" '`
`102`	`103`	`GITLAB project delete --id "$PROJECT_ID"`
`103`	`104`	`'`
	`105`	`+`
	`106`	`+testcase "application settings get" '`
	`107`	`+ GITLAB application-settings get >/dev/null 2>&1`
	`108`	`+'`
	`109`	`+`
	`110`	`+testcase "application settings update" '`
	`111`	`+ GITLAB application-settings update --signup-enabled false`
	`112`	`+'`