Merge pull request #741 from favicode/feature/bulk-update-for-acl-items

Bulk update for ACL items in CLI

Author: harmony7

Diff for: Console/Command/SuperUserCommand.php

@@ -232,6 +232,7 @@ private function updateSuIps()
 
         $this->deleteIps($aclItems, $aclId);
 
+        $updatedIpList = [];
         foreach ($ipList as $ip) {
             if ($ip[0] == '!') {
                 $ip = ltrim($ip, '!');
@@ -254,9 +255,22 @@ private function updateSuIps()
                 throw new \Exception(__($msg));
             }
 
-            $this->api->upsertAclItem($aclId, $ipParts[0], 0, $comment, $subnet);
+            $ipInformation = [
+                'op' => 'create',
+                'ip' => $ipParts[0],
+                'negated' => 0,
+                'comment' => $comment
+            ];
+
+            if ($subnet) {
+                $ipInformation['subnet'] = $subnet;
+            }
+
+            $updatedIpList[] = $ipInformation;
         }
 
+        $this->api->bulkAclItems($aclId, $updatedIpList);
+
         $this->sendWebHook('*Admin IPs list has been updated*');
 
         $msg = 'Admin IPs list has been updated';
@@ -307,9 +321,14 @@ private function hasIps($acl)
      */
     private function deleteIps($aclItems, $aclId)
     {
-        foreach ($aclItems as $key => $value) {
-            $this->api->deleteAclItem($aclId, $value->id);
+        $items = [];
+        foreach ($aclItems as $item) {
+            $items[] = [
+                'op' => 'delete',
+                'id' => $item->id
+            ];
         }
+        $this->api->bulkAclItems($aclId, $items);
     }
 
     /**

Diff for: Model/Api.php

@@ -1444,6 +1444,20 @@ public function deleteAclItem($aclId, $aclItemId)
         return $result;
     }
 
+    public function bulkAclItems($aclId, $aclItems)
+    {
+        $url = $this->_getApiServiceUri() . 'acl/' . rawurlencode($aclId ?? '') . '/entries' ;
+
+        // per documentation, maximum payload for bulk API is 1000
+        $chunkedItems = array_chunk($aclItems, 1000);
+
+        foreach ($chunkedItems as $items) {
+            $payload['entries'] = $items;
+
+            $this->_fetch($url, Request::METHOD_PATCH, json_encode($payload));
+        }
+    }
+
     /**
      * Update single ACL entry
      *