From 61c8b3777265c793f54b0656e4ef4b3ce71fd156 Mon Sep 17 00:00:00 2001
From: Matthieu Huin <mhuin@redhat.com>
Date: Fri, 12 Feb 2021 12:43:17 +0100
Subject: [PATCH] Fix API issues with zuul 3.19.1

---
 zuulclient/api/__init__.py | 11 +++++++----
 zuulclient/cmd/__init__.py | 14 ++++++++++----
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/zuulclient/api/__init__.py b/zuulclient/api/__init__.py
index 9125d55..ad17fa7 100644
--- a/zuulclient/api/__init__.py
+++ b/zuulclient/api/__init__.py
@@ -144,11 +144,12 @@ class ZuulRESTClient(object):
         resp = req.json()
         return resp

-    def enqueue(self, tenant, pipeline, project, change):
+    def enqueue(self, tenant, pipeline, project, change, trigger):
         if not self.auth_token:
             raise Exception('Auth Token required')
         args = {"change": change,
-                "pipeline": pipeline}
+                "pipeline": pipeline,
+                "trigger": trigger}
         if self.info.get('tenant'):
             suffix = 'project/%s/enqueue' % project
         else:
@@ -160,13 +161,15 @@ class ZuulRESTClient(object):
         self._check_request_status(req)
         return req.json()

-    def enqueue_ref(self, tenant, pipeline, project, ref, oldrev, newrev):
+    def enqueue_ref(self, tenant, pipeline, project, ref,
+                    oldrev, newrev, trigger):
         if not self.auth_token:
             raise Exception('Auth Token required')
         args = {"ref": ref,
                 "oldrev": oldrev,
                 "newrev": newrev,
-                "pipeline": pipeline}
+                "pipeline": pipeline,
+                "trigger": trigger}
         if self.info.get('tenant'):
             suffix = 'project/%s/enqueue' % project
         else:
diff --git a/zuulclient/cmd/__init__.py b/zuulclient/cmd/__init__.py
index 65b1b05..dcea502 100644
--- a/zuulclient/cmd/__init__.py
+++ b/zuulclient/cmd/__init__.py
@@ -284,7 +284,7 @@ class ZuulClient():
         table = prettytable.PrettyTable(
             field_names=[
                 'ID', 'Tenant', 'Project', 'Job', 'Ref Filter',
-                'Max Count', 'Reason'
+                'Count', 'Reason'
             ])

         for request in autohold_requests:
@@ -294,7 +294,7 @@ class ZuulClient():
                 request['project'],
                 request['job'],
                 request['ref_filter'],
-                request['max_count'],
+                request['count'],
                 request['reason'],
             ])

@@ -311,6 +311,8 @@ class ZuulClient():
                                  required=True)
         cmd_enqueue.add_argument('--change', help='change id',
                                  required=True)
+        cmd_enqueue.add_argument('--trigger', help='trigger name',
+                                 required=True)
         cmd_enqueue.set_defaults(func=self.enqueue)

     def enqueue(self):
@@ -320,7 +322,8 @@ class ZuulClient():
             tenant=self.args.tenant,
             pipeline=self.args.pipeline,
             project=self.args.project,
-            change=self.args.change)
+            change=self.args.change,
+            trigger=self.args.trigger)
         return r

     def add_enqueue_ref_subparser(self, subparsers):
@@ -345,6 +348,8 @@ class ZuulClient():
             '--oldrev', help='old revision', default=None)
         cmd_enqueue.add_argument(
             '--newrev', help='new revision', default=None)
+        cmd_enqueue.add_argument('--trigger', help='trigger name',
+                                 required=True)
         cmd_enqueue.set_defaults(func=self.enqueue_ref)

     def enqueue_ref(self):
@@ -356,7 +361,8 @@ class ZuulClient():
             project=self.args.project,
             ref=self.args.ref,
             oldrev=self.args.oldrev,
-            newrev=self.args.newrev)
+            newrev=self.args.newrev,
+            trigger=self.args.trigger)
         return r

     def add_dequeue_subparser(self, subparsers):
--
2.26.2