Fixed and unified tags pattern

Release 1.2.5

Author: igor-webscale

Controller/Adminhtml/Purge/All.php

@@ -23,7 +23,7 @@ public function execute(): ResponseInterface
         try {
             if ($this->cacheConfig->getType() == CacheConfig::VARNISH && $this->config->isAvailable()) {
                 if ($this->purgeCache->sendPurgeRequest([
-                    'tagsPattern' => ['.*'],
+                    'tags' => ['.*'],
                     'event' => 'adminhtml_manual_flush_all'
                 ])) {
                     $this->messageManager->addSuccessMessage(

Cron/CacheFlushScheduled.php

@@ -46,7 +46,7 @@ public function execute() {
                 && $this->config->isAvailable()
                 && !empty($this->config->getCronExpression())
             ) {
-                $this->purgeCache->sendPurgeRequest(['tagsPattern' => ['.*'], 'event' => self::EVENT_NAME]);
+                $this->purgeCache->sendPurgeRequest(['tags' => ['.*'], 'event' => self::EVENT_NAME]);
                 $this->config->log('Executed scheduled varnish cache flush.');
             }
         } catch (\Exception $e) {

Model/PurgeCache.php

@@ -70,25 +70,25 @@ public function sendPurgeRequest(array $purge = []): bool
 
             $response = $this->api->doRequest($uri, $params, Request::HTTP_METHOD_POST);
 
-            $tagsPattern = (!empty($purge['tagsPattern']) && is_array($purge['tagsPattern']))
-                ? implode('|', $purge['tagsPattern'])
+            $tags = (!empty($purge['tags']) && is_array($purge['tags']))
+                ? implode('|', $purge['tags'])
                 : '.*';
 
             if (!in_array($response->getStatusCode(), [200, 201])) {
                 $this->logger->warning(
-                    'Error executing purge: ' . $tagsPattern . ', Error: ' . $response->getReasonPhrase(),
-                    compact('servers', 'tagsPattern')
+                    'Error executing purge: ' . $tags . ', Error: ' . $response->getReasonPhrase(),
+                    compact('servers', 'tags')
                 );
                 return false;
             }
         } catch (\Exception $e) {
             $this->logger->critical(
                 $e->getMessage(),
-                compact('servers', 'tagsPattern')
+                compact('servers', 'tags')
             );
         }
 
-        $this->logger->execute(compact('servers', 'tagsPattern'));
+        $this->logger->execute(compact('servers', 'tags'));
 
         return true;
     }

Observer/InvalidateVarnishObserver.php

@@ -78,7 +78,7 @@ public function execute(Observer $observer): void
                     }
 
                     if (!empty($tags)) {
-                        $this->purgeCache->sendPurgeRequest(['tagsPattern' => $tags, 'event' => $event->getName()]);
+                        $this->purgeCache->sendPurgeRequest(['tags' => $tags, 'event' => $event->getName()]);
                     }
                 }
             }

composer.json

@@ -5,7 +5,7 @@
     "license": [
         "MIT"
     ],
-    "version": "1.2.4",
+    "version": "1.2.5",
     "require": {
         "php": "^7.2 || ^8.1",
         "magento/magento2-base": "2.3.* || 2.4.*"

etc/module.xml

@@ -7,5 +7,5 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Webscale_Varnish" setup_version="1.2.4" />
+    <module name="Webscale_Varnish" setup_version="1.2.5" />
 </config>